Merge branch 'merlin' into staging

Leonardo Merlin
2 parents 72a22270 9dc838c6
Showing 2 changed files with 6 additions and 1 deletions Show diff stats
script-staging.sh
src/app/index.scss
@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+
+gulp clean && gulp build --staging
+git add --all -f 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
@@ -222,7 +222,7 @@ body {
         .icon {
             position: relative;
             top: -8px;
-            left: 2px;
+            left: -8px;
         }
     }
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+#!/usr/bin/bash
	2	+
	3	+gulp clean && gulp build --staging
	4	+git add --all -f dist/
	5	+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
	@@ -222,7 +222,7 @@ body {		@@ -222,7 +222,7 @@ body {
222	.icon {	222	.icon {
223	position: relative;	223	position: relative;
224	top: -8px;	224	top: -8px;
225	- left: 2px;	225	+ left: -8px;
226	}	226	}
227	}	227	}
228		228