Commit 53fcf3e35af29b7e230ec811d4a516b20a840aa9
Exists in
master
and in
6 other branches
Merge branch 'merlin' into staging
Showing
5 changed files
with
41 additions
and
3 deletions
Show diff stats
| @@ -0,0 +1 @@ | @@ -0,0 +1 @@ | ||
| 1 | +v0.12.7 |
src/app/components/social-share/social-share.html
| @@ -3,12 +3,13 @@ | @@ -3,12 +3,13 @@ | ||
| 3 | </div> | 3 | </div> |
| 4 | <ul class="social-share list-inline"> | 4 | <ul class="social-share list-inline"> |
| 5 | <li> | 5 | <li> |
| 6 | - <!-- socialshare-via="687948707977695" --> | 6 | + <!-- socialshare-via="687948707977695" dialoga --> |
| 7 | + <!-- socialshare-via="476168325877872" MyApp / Test --> | ||
| 7 | <a href="#" role="button" | 8 | <a href="#" role="button" |
| 8 | socialshare | 9 | socialshare |
| 9 | socialshare-provider="facebook" | 10 | socialshare-provider="facebook" |
| 10 | socialshare-type="feed" | 11 | socialshare-type="feed" |
| 11 | - socialshare-via="476168325877872" | 12 | + socialshare-via="687948707977695" |
| 12 | socialshare-url="http://dialoga.gov.br" | 13 | socialshare-url="http://dialoga.gov.br" |
| 13 | socialshare-redirect-uri="https://dialoga.gov.br/" | 14 | socialshare-redirect-uri="https://dialoga.gov.br/" |
| 14 | socialshare-media="http://dialoga.gov.br/images/logo.png" | 15 | socialshare-media="http://dialoga.gov.br/images/logo.png" |
src/app/layout.scss
| @@ -250,6 +250,7 @@ ul.list-color li:before { | @@ -250,6 +250,7 @@ ul.list-color li:before { | ||
| 250 | 250 | ||
| 251 | .destaque-bg-cinza { | 251 | .destaque-bg-cinza { |
| 252 | background-color: #F1F1F1; | 252 | background-color: #F1F1F1; |
| 253 | + color: #484848; | ||
| 253 | } | 254 | } |
| 254 | 255 | ||
| 255 | .destaque-padding { | 256 | .destaque-padding { |
| @@ -319,6 +320,11 @@ a.link-black { | @@ -319,6 +320,11 @@ a.link-black { | ||
| 319 | } | 320 | } |
| 320 | 321 | ||
| 321 | blockquote { | 322 | blockquote { |
| 323 | + border-left: medium none; | ||
| 324 | + font-size: 140%; | ||
| 325 | + padding: 45px 0 0 45px; | ||
| 326 | + position: relative; | ||
| 327 | + margin: 0px; | ||
| 322 | border-left: none; | 328 | border-left: none; |
| 323 | font-size: 24px; | 329 | font-size: 24px; |
| 324 | line-height: 28px; | 330 | line-height: 28px; |
| @@ -347,6 +353,21 @@ blockquote { | @@ -347,6 +353,21 @@ blockquote { | ||
| 347 | } | 353 | } |
| 348 | } | 354 | } |
| 349 | 355 | ||
| 356 | +blockquote p { | ||
| 357 | + font-size: 140%!important; | ||
| 358 | + line-height: normal!important; | ||
| 359 | +} | ||
| 360 | + | ||
| 361 | +// .cultura blockquote::before { | ||
| 362 | +// color: #cd999b; | ||
| 363 | +// } | ||
| 364 | +// Sobreescreve a classe do bootstrap | ||
| 365 | +.close { | ||
| 366 | + color: white; | ||
| 367 | + opacity: 1; | ||
| 368 | + font-weight: normal; | ||
| 369 | +} | ||
| 370 | + | ||
| 350 | .top-border-theme { | 371 | .top-border-theme { |
| 351 | @each $category, | 372 | @each $category, |
| 352 | $color in $categories { | 373 | $color in $categories { |
src/app/pages/programas/programa.html
| @@ -206,7 +206,7 @@ | @@ -206,7 +206,7 @@ | ||
| 206 | </section> | 206 | </section> |
| 207 | 207 | ||
| 208 | <section class="section-content"> | 208 | <section class="section-content"> |
| 209 | - <article class="program-content" ng-if="pagePrograma.article"> | 209 | + <article class="program-content" ng-if="pagePrograma.article" ng-class="pagePrograma.article.slug"> |
| 210 | <div ng-bind-html="pagePrograma.article.bodyTrusted"></div> | 210 | <div ng-bind-html="pagePrograma.article.bodyTrusted"></div> |
| 211 | </article> | 211 | </article> |
| 212 | </section> | 212 | </section> |