Download as
Browse Code »

Commit f6e5371664499c8404f02496f7115ae0f70dab9b

Authored by Leonardo Merlin
2 parents a1a5950b a2b48f84
Exists in master and in 8 other branches css-list, feature-captcha, feature-proposal-vote, feature-respostas, production, rafael, staging, the_glorious_return_of_piwik

Merge branch 'rafael' into merlin

Showing 2 changed files with 170 additions and 79 deletions   Show diff stats
src/app/layout.scss
  Diff comments   View file @f6e5371
... ... @@ -29,21 +29,21 @@
29 29 table-layout: fixed;
30 30 height: 100%;
31 31 width: 100%;
32   -}
33   -.col-xs-height {
  32 + }
  33 + .col-xs-height {
34 34 display: table-cell;
35 35 float: none;
36 36 height: 100%;
37   -}
38   -.col-xs-top {
  37 + }
  38 + .col-xs-top {
39 39 vertical-align: top;
40   -}
41   -.col-xs-middle {
  40 + }
  41 + .col-xs-middle {
42 42 vertical-align: middle;
43   -}
44   -.col-xs-bottom {
  43 + }
  44 + .col-xs-bottom {
45 45 vertical-align: bottom;
46   -}
  46 + }
47 47 }
48 48  
49 49 @media (min-width: 768px) {
... ... @@ -52,21 +52,21 @@
52 52 table-layout: fixed;
53 53 height: 100%;
54 54 width: 100%;
55   -}
56   -.col-sm-height {
  55 + }
  56 + .col-sm-height {
57 57 display: table-cell;
58 58 float: none;
59 59 height: 100%;
60   -}
61   -.col-sm-top {
  60 + }
  61 + .col-sm-top {
62 62 vertical-align: top;
63   -}
64   -.col-sm-middle {
  63 + }
  64 + .col-sm-middle {
65 65 vertical-align: middle;
66   -}
67   -.col-sm-bottom {
  66 + }
  67 + .col-sm-bottom {
68 68 vertical-align: bottom;
69   -}
  69 + }
70 70 }
71 71  
72 72 @media (min-width: 992px) {
... ... @@ -75,21 +75,21 @@
75 75 table-layout: fixed;
76 76 height: 100%;
77 77 width: 100%;
78   -}
79   -.col-md-height {
  78 + }
  79 + .col-md-height {
80 80 display: table-cell;
81 81 float: none;
82 82 height: 100%;
83   -}
84   -.col-md-top {
  83 + }
  84 + .col-md-top {
85 85 vertical-align: top;
86   -}
87   -.col-md-middle {
  86 + }
  87 + .col-md-middle {
88 88 vertical-align: middle;
89   -}
90   -.col-md-bottom {
  89 + }
  90 + .col-md-bottom {
91 91 vertical-align: bottom;
92   -}
  92 + }
93 93 }
94 94  
95 95 @media (min-width: 1200px) {
... ... @@ -98,29 +98,29 @@
98 98 table-layout: fixed;
99 99 height: 100%;
100 100 width: 100%;
101   -}
102   -.col-lg-height {
  101 + }
  102 + .col-lg-height {
103 103 display: table-cell;
104 104 float: none;
105 105 height: 100%;
106   -}
107   -.col-lg-top {
  106 + }
  107 + .col-lg-top {
108 108 vertical-align: top;
109   -}
110   -.col-lg-middle {
  109 + }
  110 + .col-lg-middle {
111 111 vertical-align: middle;
112   -}
113   -.col-lg-bottom {
  112 + }
  113 + .col-lg-bottom {
114 114 vertical-align: bottom;
115   -}
  115 + }
116 116 }
117 117  
118 118 .vcenter {
119   - display: inline-block;
120   - vertical-align: middle;
121   - float: none;
122   - margin-right: -2px;
123   - margin-left: -2px;
  119 + display: inline-block;
  120 + vertical-align: middle;
  121 + float: none;
  122 + margin-right: -2px;
  123 + margin-left: -2px;
124 124 }
125 125  
126 126 .vertical-padding {
... ... @@ -132,9 +132,9 @@
132 132 .no-space-right { margin-right: 0; padding-right: 0;}
133 133  
134 134 .text-center-sm {
135   - @media screen and (max-width: $screen-sm) {
136   - text-align: center;
137   - }
  135 + @media screen and (max-width: $screen-sm) {
  136 + text-align: center;
  137 + }
138 138 }
139 139  
140 140 .btn-submit {
... ... @@ -162,9 +162,9 @@
162 162 position: relative;
163 163 top: -30px;
164 164 right: 0px;
165   -}
  165 + }
166 166  
167   -&-body {
  167 + &-body {
168 168 padding: 25px 35px;
169 169 height: 500px;
170 170  
... ... @@ -173,9 +173,9 @@
173 173 overflow-y: auto;
174 174 padding: 15px;
175 175 height: 440px;
  176 + }
176 177 }
177 178 }
178   -}
179 179  
180 180 .modal-fechar-pequeno {
181 181 font-size: 15px;
... ... @@ -185,13 +185,6 @@
185 185 font-size: 24px;
186 186 }
187 187  
188   -// Sobreescreve a classe do bootstrap
189   -.close {
190   - color: white;
191   - opacity: 1;
192   - font-weight: normal;
193   -}
194   -
195 188 .btn-question {
196 189 color: #484848;
197 190 background-color: #fff;
... ... @@ -204,24 +197,6 @@
204 197 border-radius: 100%;
205 198 }
206 199  
207   -.destaque-cinza {
208   - background-color: #F1F1F1;
209   - padding: 30px;
210   -}
211   -
212   -.destaque-cinza-claro {
213   - background-color: #F8F8F8;
214   - padding: 30px;
215   -}
216   -
217   -.left-border-gray {
218   - border-left: 3px solid #eeeeee;
219   -
220   - @media (max-width: 768px) {
221   - border: none;
222   -}
223   -}
224   -
225 200 ul.list-color {
226 201 list-style: none;
227 202 padding: 0;
... ... @@ -233,11 +208,10 @@ ul.list-color li:before {
233 208 @each $category, $color in $categories {
234 209 .#{$category} & {
235 210 color: $color;
  211 + }
236 212 }
237 213 }
238 214  
239   -}
240   -
241 215 ul.list-color li:before {
242 216 content: "• ";
243 217 font-weight: bold;
... ... @@ -248,18 +222,135 @@ ul.list-color li:before {
248 222  
249 223 ul.list-color li {
250 224 padding-left: 2em;
251   - padding-bottom: 20px;
  225 + padding-bottom: 10px;
252 226 text-indent: -0.7em;
253 227 }
254 228  
255   -.right-block {
256   - float: right;
  229 +.destaque-bg-cinza {
  230 + background-color: #F1F1F1;
  231 +}
  232 +
  233 +.destaque-padding {
  234 + padding: 20px;
  235 +}
  236 +
  237 +.destaque-font {
  238 + font-size: 130%;
  239 +}
  240 +
  241 +.font-140 {
  242 + font-size: 140%;
  243 +}
  244 +
  245 +.font-115 {
  246 + font-size: 115%;
  247 +}
  248 +
  249 +.font-180 {
  250 + font-size: 180%;
  251 +}
  252 +
  253 +.destaque-bg-lightgray {
  254 + background-color: #F8F8F8;
  255 +}
  256 +
  257 +.margin-15 {
  258 + margin-left: 15px;
  259 + margin-right: 15px;
  260 +}
  261 +
  262 +.left-border-gray {
  263 + border-left: 4px solid #d1d6d9;
  264 + margin-bottom: 10px;
  265 + ul.list-color li:last-child { padding-bottom: 0; }
  266 + @media (max-width: 768px) {
  267 + border: none;
  268 + }
  269 +}
  270 +
  271 +.bottom-border-gray {
  272 + border-bottom: 1px lightgray;
  273 + border-bottom-style: solid;
  274 + margin: 0px!important;
  275 + padding: 30px;
  276 +}
  277 +
  278 +.padding-30 {
  279 + padding: 30px;
257 280 }
258 281  
259 282 a.link-black {
260 283 color: black;
261 284 }
262 285  
  286 +article.program-content {
  287 + margin-top: 40px;
  288 +}
  289 +
  290 +article.program-content div.ng-binding div.container div.row {
  291 + margin-bottom: 40px;
  292 +}
  293 +
  294 +article.program-content h3 {
  295 + margin-bottom: 15px;
  296 +}
  297 +
263 298 .inline-block {
264   - display: inline-block;
  299 + display: inline-block;
  300 +}
  301 +
  302 +blockquote {
  303 + border-left: medium none;
  304 + font-size: 140%;
  305 + padding: 50px 0 0 50px;
  306 + position: relative;
  307 +
  308 + &:before {
  309 + content: "⌜";
  310 + font-size: 200px;
  311 + left: -2px;
  312 + position: absolute;
  313 + top: -50px;
  314 + font-weight: bolder;
  315 + left: -17px;
  316 + top: -68px;
  317 + @each $category, $color in $categories {
  318 + .#{$category} & {
  319 + color: $color;
  320 + }
  321 + }
  322 + }
  323 +
  324 +}
  325 +
  326 +// .cultura blockquote::before {
  327 +// color: #cd999b;
  328 +// }
  329 +
  330 +// Sobreescreve a classe do bootstrap
  331 +.close {
  332 + color: white;
  333 + opacity: 1;
  334 + font-weight: normal;
  335 +}
  336 +
  337 +// .img-responsive {
  338 +// width: 100%;
  339 +// }
  340 +
  341 +strong {
  342 + @each $category, $color in $categories {
  343 + .#{$category} & {
  344 + color: $color;
  345 + }
  346 + }
  347 +}
  348 +
  349 +.top-border-theme {
  350 + @each $category, $color in $categories {
  351 + .#{$category} & {
  352 + border-color: $color;
  353 + }
  354 + }
  355 + border-top: 20px solid;
265 356 }
... ...
src/app/pages/programas/programa.html
  Diff comments   View file @f6e5371
... ... @@ -80,7 +80,7 @@
80 80 <!-- Proposal Box -->
81 81 <div>
82 82 <div class="col-xs-12" ng-if="!pagePrograma.loadingProposalBox && pagePrograma.randomProposal" ng-class="{'focused-proposal': !!pagePrograma.search.proposal_id}">
83   - <h3 class="color-theme-fg">Propostas nesse programa</h3>
  83 + <h3 class="color-theme-fg">Apoie outras propostas</h3>
84 84 <proposal-box proposal="pagePrograma.randomProposal" topic="pagePrograma.article" category="pagePrograma.category" can-vote="true" focus="{{pagePrograma.search.proposal_id}}" ></proposal-box>
85 85 </div>
86 86  
... ...