Merge branch 'master' into staging

Leandro Santos
2 parents 8992fb70 330a3db6
Showing 1 changed file with 4 additions and 1 deletions Show diff stats
src/app/pages/programas/programas.scss
@@ -144,9 +144,12 @@
         }
  
         p {
-            font-size: 14px;
+            font-size: inherit;
             line-height: 18px;
         }
+        p.larger {
+            font-size: larger;
+        }
  
         .container > .row {
             margin-bottom: 40px;
...	...	@@ -144,9 +144,12 @@
144	144	}
145	145
146	146	p {
147		- font-size: 14px;
	147	+ font-size: inherit;
148	148	line-height: 18px;
149	149	}
	150	+ p.larger {
	151	+ font-size: larger;
	152	+ }
150	153
151	154	.container > .row {
152	155	margin-bottom: 40px;
...	...