Download as
Browse Code »

Commit 8ac2a775c242ead59940082a902fae6947c512fd

Authored by Leonardo Merlin
2 parents 448d2d3b 60cf68d7
Exists in master and in 7 other branches build, build2, capa, captcha, contigency_plan_recaptcha, production, staging

Merge branch 'refact-sass'

Showing 3 changed files with 75 additions and 65 deletions   Show diff stats
sass/_nav.scss
  Diff comments   View file @8ac2a77
... ... @@ -2,45 +2,46 @@ nav {
2 2 width: 100%;
3 3 padding: 0;
4 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 +
... ...
sass/_proposal_categories.scss
  Diff comments   View file @8ac2a77
... ... @@ -9,10 +9,12 @@
9 9 border-bottom: 1px solid #03316f;
10 10 border-left: 1px solid #03316f;
11 11 border-right: 1px solid #03316f;
  12 +
12 13 li {
13 14 list-style: none;
14 15 display: inline-block;
15 16 }
  17 +
16 18 .proposal-category {
17 19 a {
18 20 text-decoration: none;
... ... @@ -57,33 +59,8 @@
57 59 padding-top: 10px;
58 60 }
59 61  
60   - .proposal-item p {
61   - font-size: 14px;
62   - color: #172938;
63   - margin: 0;
64   - padding-top: 5px;
65   - margin-bottom: 10px;
66   - text-align: left;
67   - }
68   -
69   - .proposal-item .item {
70   - padding: 15px;
71   - }
72   -
73   - .proposal-item .proposal-link {
74   - padding-top: 10px;
75   - display: block;
76   - margin: 0;
77   - color: #335277;
78   - text-align: left;
79   - font-family: 'Asap';
80   - font-weight: 700;
81   - font-size: 18pt;
82   - text-decoration: none;
83   - cursor: pointer;
84   - }
85   -
86 62 .proposal-item {
  63 +
87 64 width: 48%;
88 65 // min-height: 200px;
89 66 margin: 0.5%;
... ... @@ -91,21 +68,48 @@
91 68 border-radius: 5px;
92 69 vertical-align: top;
93 70 border: 1px solid #03316f;
  71 +
  72 + &:hover {
  73 + background: #eeeff1;
  74 + }
  75 +
  76 + p {
  77 + font-size: 14px;
  78 + color: #172938;
  79 + margin: 0;
  80 + padding-top: 5px;
  81 + margin-bottom: 10px;
  82 + text-align: left;
  83 + }
  84 +
  85 + .item {
  86 + padding: 15px;
  87 + }
  88 +
94 89 .proposal-link {
  90 + padding-top: 10px;
  91 + display: block;
  92 + margin: 0;
  93 + color: #335277;
  94 + text-align: left;
  95 + font-family: 'Asap';
  96 + font-weight: 700;
  97 + font-size: 18pt;
  98 + text-decoration: none;
  99 + cursor: pointer;
95 100 min-height: 200px;
  101 +
96 102 p {
97 103 font-weight: 400;
98 104 }
99 105 }
100   - }
101 106  
102   - .proposal-item:hover {
103   - background: #eeeff1;
104 107 }
105 108  
106 109 .proposal-category-items {
107 110 text-align: left;
108 111 border-radius: 6px;
  112 +
109 113 .proposal-list {
110 114 padding-left: 20px;
111 115 padding-bottom: 20px;
... ... @@ -121,6 +125,7 @@
121 125 color: white;
122 126 padding: 10px 30px;
123 127 text-align: left;
  128 +
124 129 .name {
125 130 font-weight: bold;
126 131 border-bottom: 2px solid white;
... ... @@ -137,11 +142,13 @@
137 142 .proposal-category-items-#{$category} {
138 143 background-color: $color;
139 144 }
  145 +
140 146 #proposal-category-#{$category} a {
141 147 background-image: url(./images/icons/#{$category}.png?3);
142 148 background-color: $color;
143 149 border-color: $color;
144 150 }
  151 +
145 152 #proposal-category-#{$category} .arrow-box:after {
146 153 border-bottom-color: $color;
147 154 }
... ... @@ -155,6 +162,7 @@
155 162 background-position-x: 3px;
156 163 }
157 164 }
  165 +
158 166 @each $category, $description in $categories-descriptions {
159 167 .proposal-category-items-#{$category} .header .description:before {
160 168 content: "#{$description}";
... ...
sass/_proposal_group.scss
  Diff comments   View file @8ac2a77
... ... @@ -9,7 +9,8 @@
9 9 font-size: 14px;
10 10 }
11 11  
12   - #search-input-container, label[for=search] {
  12 + #search-input-container,
  13 + label[for=search] {
13 14 width: 49%;
14 15 height: 80px;
15 16 vertical-align: middle;
... ...