Merge branch 'refact-sass'

Leonardo Merlin
2 parents 448d2d3b 60cf68d7
Showing 3 changed files with 75 additions and 65 deletions Show diff stats
sass/_nav.scss
sass/_proposal_categories.scss
sass/_proposal_group.scss
@@ -2,45 +2,46 @@ nav {
   width: 100%;
   padding: 0;
   margin: 0;
-}
-
-nav ul {
-  padding: 0;
-  margin: 0;
-  width: 100%;
-  font-size: 0;
-  list-style: none;
-}
-
-nav li {
-  display: inline-block;
-  padding: 0;
-  margin: 0;
-  width: 50%;
-}
+  
+  ul {
+    padding: 0;
+    margin: 0;
+    width: 100%;
+    font-size: 0;
+    list-style: none;
+  }
-nav li a {
-  display: block;
-  text-align: center;
-  text-decoration: none;
-  font-size: 16px;
-  font-weight: bold;
-  color: #000;
-  background: #efefef;
-  padding: 20px 5px;
-  text-transform: uppercase;
-  border-bottom: 1px solid #03316f;
+  li {
+    display: inline-block;
+    padding: 0;
+    margin: 0;
+    width: 50%;
+    
+    a {
+      display: block;
+      text-align: center;
+      text-decoration: none;
+      font-size: 16px;
+      font-weight: bold;
+      color: #000;
+      background: #efefef;
+      padding: 20px 5px;
+      text-transform: uppercase;
+      border-bottom: 1px solid #03316f;
+      &.active {
+        background: #fff;
+        color: #03316f;
+        border: 1px solid #03316f;
+        border-bottom: 1px solid #fff;
-}
+        &:hover{
+          cursor: default;
+        }
+      }
-nav li a.active {
-  background: #fff;
-  color: #03316f;
-  border: 1px solid #03316f;
-  border-bottom: 1px solid #fff;
+    }
-  &:hover{
-    cursor: default;
   }
 }
+
@@ -9,10 +9,12 @@
   border-bottom: 1px solid #03316f;
   border-left: 1px solid #03316f;
   border-right: 1px solid #03316f;    
+  
   li {
     list-style: none;
     display: inline-block;
   }
+  
   .proposal-category {
     a {
       text-decoration: none;
@@ -57,33 +59,8 @@
     padding-top: 10px;
   }
-  .proposal-item p {
-    font-size: 14px;
-    color: #172938;
-    margin: 0;
-    padding-top: 5px;
-    margin-bottom: 10px;
-    text-align: left;
-  }
-
-  .proposal-item .item {
-    padding: 15px;
-  }
-
-  .proposal-item .proposal-link {
-    padding-top: 10px;
-    display: block;
-    margin: 0;
-    color: #335277;
-    text-align: left;
-    font-family: 'Asap';
-    font-weight: 700;
-    font-size: 18pt;
-    text-decoration: none;
-    cursor: pointer;
-  }
-
   .proposal-item {
+
     width: 48%;
     // min-height: 200px;
     margin: 0.5%;
@@ -91,21 +68,48 @@
     border-radius: 5px;
     vertical-align: top;
     border: 1px solid #03316f;
+    
+    &:hover {
+      background: #eeeff1;
+    }
+
+    p {
+      font-size: 14px;
+      color: #172938;
+      margin: 0;
+      padding-top: 5px;
+      margin-bottom: 10px;
+      text-align: left;
+    }
+
+    .item {
+      padding: 15px;
+    }
+
     .proposal-link {
+      padding-top: 10px;
+      display: block;
+      margin: 0;
+      color: #335277;
+      text-align: left;
+      font-family: 'Asap';
+      font-weight: 700;
+      font-size: 18pt;
+      text-decoration: none;
+      cursor: pointer;
       min-height: 200px;
+      
       p {
         font-weight: 400;
       }
     }
-  }
-  .proposal-item:hover {
-    background: #eeeff1;
   }
   .proposal-category-items {
     text-align: left;
     border-radius: 6px;
+    
     .proposal-list {
       padding-left: 20px;
       padding-bottom: 20px;
@@ -121,6 +125,7 @@
     color: white;
     padding: 10px 30px;
     text-align: left;
+    
     .name {
       font-weight: bold;
       border-bottom: 2px solid white;
@@ -137,11 +142,13 @@
   .proposal-category-items-#{$category} {
     background-color: $color;
   }
+
   #proposal-category-#{$category} a {
     background-image: url(./images/icons/#{$category}.png?3);
     background-color: $color;
     border-color: $color;
   }
+
   #proposal-category-#{$category} .arrow-box:after {
     border-bottom-color: $color;
   }
@@ -155,6 +162,7 @@
     background-position-x: 3px;
   }
 }
+
 @each $category, $description in $categories-descriptions {
   .proposal-category-items-#{$category} .header .description:before {
     content: "#{$description}";
@@ -9,7 +9,8 @@
     font-size: 14px;
   }
-  #search-input-container, label[for=search] {
+  #search-input-container,
+  label[for=search] {
     width: 49%;
     height: 80px;
     vertical-align: middle;
	@@ -2,45 +2,46 @@ nav {		@@ -2,45 +2,46 @@ nav {
2	width: 100%;	2	width: 100%;
3	padding: 0;	3	padding: 0;
4	margin: 0;	4	margin: 0;
5	-}
6	-
7	-nav ul {
8	- padding: 0;
9	- margin: 0;
10	- width: 100%;
11	- font-size: 0;
12	- list-style: none;
13	-}
14	-
15	-nav li {
16	- display: inline-block;
17	- padding: 0;
18	- margin: 0;
19	- width: 50%;
20	-}	5	+
		6	+ ul {
		7	+ padding: 0;
		8	+ margin: 0;
		9	+ width: 100%;
		10	+ font-size: 0;
		11	+ list-style: none;
		12	+ }
21		13
22	-nav li a {
23	- display: block;
24	- text-align: center;
25	- text-decoration: none;
26	- font-size: 16px;
27	- font-weight: bold;
28	- color: #000;
29	- background: #efefef;
30	- padding: 20px 5px;
31	- text-transform: uppercase;
32	- border-bottom: 1px solid #03316f;	14	+ li {
		15	+ display: inline-block;
		16	+ padding: 0;
		17	+ margin: 0;
		18	+ width: 50%;
		19	+
		20	+ a {
		21	+ display: block;
		22	+ text-align: center;
		23	+ text-decoration: none;
		24	+ font-size: 16px;
		25	+ font-weight: bold;
		26	+ color: #000;
		27	+ background: #efefef;
		28	+ padding: 20px 5px;
		29	+ text-transform: uppercase;
		30	+ border-bottom: 1px solid #03316f;
33		31
		32	+ &.active {
		33	+ background: #fff;
		34	+ color: #03316f;
		35	+ border: 1px solid #03316f;
		36	+ border-bottom: 1px solid #fff;
34		37
35	-}	38	+ &:hover{
		39	+ cursor: default;
		40	+ }
		41	+ }
36		42
37	-nav li a.active {
38	- background: #fff;
39	- color: #03316f;
40	- border: 1px solid #03316f;
41	- border-bottom: 1px solid #fff;	43	+ }
42		44
43	- &:hover{
44	- cursor: default;
45	}	45	}
46	}	46	}
		47	+