Merge branch 'fix-content-style'

Leonardo Merlin
2 parents 54ee1362 7d4116e5
Showing 3 changed files with 42 additions and 4 deletions Show diff stats
package.json
src/app/content.scss
src/app/index.scss
@@ -48,6 +48,7 @@
     "require-dir": "~0.3.0",
     "sprity": "^1.0.7",
     "uglify-save-license": "~0.4.1",
+    "vinyl": "^1.1.0",
     "wiredep": "~2.2.2",
     "wrench": "~1.5.8"
   },
@@ -0,0 +1,32 @@
+.image-box{
+	&.caption {
+		position: relative;
+		img {
+			width: 100%;
+		}
+		p {
+			position: absolute;
+			padding: 20px 40px 20px 20px;
+			margin: 0;
+			min-width: 50%;
+			max-width: 80%;
+			color: #fff;
+
+			&.caption--right-bottom {
+				bottom: 0;
+				right: 0;
+			}
+
+			&.caption--left-bottom {
+				bottom: 0;
+				left: 0;
+			}
+
+	        @each $category, $color in $categories {
+	            .#{$category} & {
+	                background-color: $color;
+	            }
+	        }
+		}
+	}
+}
 \ No newline at end of file
@@ -22,7 +22,6 @@ $defaultblue: #5E749D;
 // -------------
-//   1.4 - dicionarios
 $categories: (
     saude: #3359a7,
     seguranca-publica: #e95052,
@@ -30,7 +29,9 @@ $categories: (
     reducao-da-pobreza: #38c7a4,
     cultura: #a63738,
     esporte: #f15b31,
-    meio-ambiente: #3cc667
+    meio-ambiente: #3cc667,
+    cidades: #3f5fac,
+    empreendedorismo: #000
 );
 $categories-complementary-1: (
@@ -40,7 +41,9 @@ $categories-complementary-1: (
     reducao-da-pobreza: #57e9cd,
     cultura: #dc5557,
     esporte: #fd8d4c,
-    meio-ambiente: #339950
+    meio-ambiente: #339950,
+    cidades: #21275b,
+    empreendedorismo: #000
 );
 $categories-complementary-2: (
@@ -50,7 +53,9 @@ $categories-complementary-2: (
     reducao-da-pobreza: #2a9677,
     cultura: #862f2f,
     esporte: #ce472c,
-    meio-ambiente:  lighten(#3cc667, 10%)
+    meio-ambiente: lighten(#3cc667, 10%),
+    cidades: lighten(#3f5fac, 10%),
+    empreendedorismo: #000
 );
 // $categories-descriptions: (
	@@ -0,0 +1,32 @@		@@ -0,0 +1,32 @@
		1	+.image-box{
		2	+ &.caption {
		3	+ position: relative;
		4	+ img {
		5	+ width: 100%;
		6	+ }
		7	+ p {
		8	+ position: absolute;
		9	+ padding: 20px 40px 20px 20px;
		10	+ margin: 0;
		11	+ min-width: 50%;
		12	+ max-width: 80%;
		13	+ color: #fff;
		14	+
		15	+ &.caption--right-bottom {
		16	+ bottom: 0;
		17	+ right: 0;
		18	+ }
		19	+
		20	+ &.caption--left-bottom {
		21	+ bottom: 0;
		22	+ left: 0;
		23	+ }
		24	+
		25	+ @each $category, $color in $categories {
		26	+ .#{$category} & {
		27	+ background-color: $color;
		28	+ }
		29	+ }
		30	+ }
		31	+ }
		32	+}
0	\ No newline at end of file	33	\ No newline at end of file