Merge branch 'master' into staging

Leandro Santos
2 parents fd6b6dfc aa82dfeb
Showing 2 changed files with 30 additions and 12 deletions Show diff stats
DEVELOPMENT.md
src/app/index.scss
@@ -0,0 +1,27 @@
+## Development
+
+npm install 
+bower install
+npm install -g gulp
+
+```bash
+# dev with staging data
+gulp serve --staging
+
+# dev with production data
+gulp serve --production
+```
+
+##### Tools
+
+- [generator-gulp-angular](https://github.com/Swiip/generator-gulp-angular)
+- Angular
+  - angular-animate
+  - angular-cookies
+  - angular-touch
+  - angular-sanitize
+  - angular-ui-router
+- gulp
+- JS old style (no CoffeeScript or ES6 or etc.)
+- HTML pure (no JADE or HBS or etc.)
+- Bootstrap 3
@@ -120,26 +120,17 @@ body {
         border-right: 0;
         border-top: 0;
         border-radius: 6px;
+        background-color: #5e739d;
+        border-bottom: 3px solid #45506e;
  
         -webkit-transition: all $time ease-in-out;
         -moz-transition: all $time ease-in-out;
         -o-transition: all $time ease-in-out;
         transition: all $time ease-in-out;
  
-        @each $category, $color in $categories {
-            .#{$category} & {
-                background-color: $color;
-                border-bottom: 3px solid map-get($categories-complementary-2, $category);
-            }
-        }
-
         &:hover,
         &:focus {
-            @each $category, $color in $categories {
-                .#{$category} & {
-                    background-color: map-get($categories-complementary-2, $category);
-                }
-            }
+          background-color: #45506e;
         }
  
         .contraste & {
...	...	@@ -0,0 +1,27 @@
	1	+## Development
	2	+
	3	+npm install
	4	+bower install
	5	+npm install -g gulp
	6	+
	7	+```bash
	8	+# dev with staging data
	9	+gulp serve --staging
	10	+
	11	+# dev with production data
	12	+gulp serve --production
	13	+```
	14	+
	15	+##### Tools
	16	+
	17	+- [generator-gulp-angular](https://github.com/Swiip/generator-gulp-angular)
	18	+- Angular
	19	+ - angular-animate
	20	+ - angular-cookies
	21	+ - angular-touch
	22	+ - angular-sanitize
	23	+ - angular-ui-router
	24	+- gulp
	25	+- JS old style (no CoffeeScript or ES6 or etc.)
	26	+- HTML pure (no JADE or HBS or etc.)
	27	+- Bootstrap 3
...	...
...	...	@@ -120,26 +120,17 @@ body {
120	120	border-right: 0;
121	121	border-top: 0;
122	122	border-radius: 6px;
	123	+ background-color: #5e739d;
	124	+ border-bottom: 3px solid #45506e;
123	125
124	126	-webkit-transition: all $time ease-in-out;
125	127	-moz-transition: all $time ease-in-out;
126	128	-o-transition: all $time ease-in-out;
127	129	transition: all $time ease-in-out;
128	130
129		- @each $category, $color in $categories {
130		- .#{$category} & {
131		- background-color: $color;
132		- border-bottom: 3px solid map-get($categories-complementary-2, $category);
133		- }
134		- }
135		-
136	131	&:hover,
137	132	&:focus {
138		- @each $category, $color in $categories {
139		- .#{$category} & {
140		- background-color: map-get($categories-complementary-2, $category);
141		- }
142		- }
	133	+ background-color: #45506e;
143	134	}
144	135
145	136	.contraste & {
...	...