Merge branch 'merlin' into staging

Leonardo Merlin
2 parents 6e7a39df 9d0280c6
Showing 2 changed files with 7 additions and 4 deletions Show diff stats
script-staging.sh
src/app/layout.scss
@@ -2,4 +2,5 @@
  
 gulp clean && gulp build --staging
 git add --all -f dist/
+git commit -m "Update dist"
 git push upstream staging && wget -qO- --no-check-certificate 'ci.serpro/view/Noosfero/job/DialogaApp-Deploy-Homologa%C3%A7%C3%A3o/build?token=DIALOGA_TOKEN' &> /dev/null
@@ -229,10 +229,12 @@ ul.list-color li:before {
 }
  
 .page--program {
-    ul li {
-      padding-left: 2em;
-      padding-bottom: 15px;
-      text-indent: -0.7em;
+    .program-content {
+        ul li {
+          padding-left: 2em;
+          padding-bottom: 15px;
+          text-indent: -0.7em;
+        }
     }
 }
...	...	@@ -2,4 +2,5 @@
2	2
3	3	gulp clean && gulp build --staging
4	4	git add --all -f dist/
	5	+git commit -m "Update dist"
5	6	git push upstream staging && wget -qO- --no-check-certificate 'ci.serpro/view/Noosfero/job/DialogaApp-Deploy-Homologa%C3%A7%C3%A3o/build?token=DIALOGA_TOKEN' &> /dev/null
...	...
...	...	@@ -229,10 +229,12 @@ ul.list-color li:before {
229	229	}
230	230
231	231	.page--program {
232		- ul li {
233		- padding-left: 2em;
234		- padding-bottom: 15px;
235		- text-indent: -0.7em;
	232	+ .program-content {
	233	+ ul li {
	234	+ padding-left: 2em;
	235	+ padding-bottom: 15px;
	236	+ text-indent: -0.7em;
	237	+ }
236	238	}
237	239	}
238	240
...	...