Download as
Browse Code »

Commit 5dfcfbc3af1318faec09902e3dd511524dc4a0d6

Authored by Victor Costa
2 parents ad50b999 16f995a8
Exists in production

Merge branch 'master' into production

Showing 3 changed files with 95 additions and 49 deletions   Show diff stats
src/app/content.scss
  Diff comments   View file @5dfcfbc
... ... @@ -22,11 +22,11 @@
22 22 left: 0;
23 23 }
24 24  
25   - @each $category, $color in $categories {
26   - .#{$category} & {
27   - background-color: $color;
28   - }
29   - }
  25 + @each $category, $color in $categories {
  26 + .#{$category} & {
  27 + background-color: $color;
  28 + }
  29 + }
30 30 }
31 31 }
32 32 }
... ... @@ -40,13 +40,13 @@
40 40 margin-top: 30px;
41 41  
42 42 @media screen and (max-width: $screen-sm) {
43   - margin-top: 20px;
44   - }
  43 + margin-top: 20px;
  44 + }
45 45  
46 46 @media screen and (max-width: $screen-xs) {
47   - margin-top: 10px;
48   - }
49   -
  47 + margin-top: 10px;
  48 + }
  49 +
50 50 }
51 51  
52 52 .col-sm-12 {
... ... @@ -55,26 +55,27 @@
55 55  
56 56 .icon-wrapper {
57 57 width: 61px;
58   - height: 61px;
59   - float: left;
60   - border-radius: 100%;
61   - margin: 14px 14px 14px 0;
  58 + height: 61px;
  59 + float: left;
  60 + border-radius: 100%;
  61 + margin: 14px 14px 14px 0;
62 62 }
63 63  
64 64 .icon {
65 65 position: relative;
66   - top: 7px;
67   - left: 11px;
  66 + top: 7px;
  67 + left: 11px;
68 68 }
69 69  
70   - @each $category, $color in $categories {
71   - .#{$category} & {
72   - color: $color;
  70 + @each $category, $color in $categories {
  71 + .#{$category} & {
  72 + color: $color;
73 73  
74   - .icon-wrapper {
75   - background-color: $color;
76   - }
77   - }
  74 + .icon-wrapper {
  75 + background-color: $color;
  76 + }
  77 + }
  78 +
  79 + }
  80 +}
78 81  
79   - }
80   -}
81 82 \ No newline at end of file
... ...
src/app/layout.scss
  Diff comments   View file @5dfcfbc
... ... @@ -253,8 +253,8 @@
253 253 // img {
254 254 // width: 100%;
255 255 // }
256   - }
257   - }
  256 +}
  257 +}
258 258 }
259 259  
260 260 .destaque-bg-cinza {
... ... @@ -344,35 +344,35 @@ blockquote {
344 344 .content-highlight-icon {
345 345 // &:before {
346 346 // content: "";
347   - width: 110px;
348   - height: 112px;
349   - position: absolute;
350   - display: inline-block;
351   - opacity: .5;
352   -
353   - @each $category,
354   - $color in $categories {
355   - .#{$category} & {
356   - border-left: 34px solid $color;
357   - border-top: 33px solid $color;
358   - }
  347 + width: 110px;
  348 + height: 112px;
  349 + position: absolute;
  350 + display: inline-block;
  351 + opacity: .5;
  352 +
  353 + @each $category,
  354 + $color in $categories {
  355 + .#{$category} & {
  356 + border-left: 34px solid $color;
  357 + border-top: 33px solid $color;
359 358 }
360 359 }
  360 +}
361 361  
362   - p {
363   - margin-left: 60px;
  362 +p {
  363 + margin-left: 60px;
364 364  
365   - &:first-of-type {
366   - padding-top: 50px;
367   - }
  365 + &:first-of-type {
  366 + padding-top: 50px;
368 367 }
  368 +}
369 369  
370 370 }
371 371  
372 372 .page--program .program-content blockquote,
373 373 .page--program .program-content blockquote p {
374   - font-size: 24px;
375   - line-height: 28px;
  374 + font-size: 24px;
  375 + line-height: 28px;
376 376 }
377 377  
378 378 .top-border-theme {
... ... @@ -445,7 +445,21 @@ ul li:last-child {
445 445  
446 446 .bloco1-futebol {
447 447 @media (min-width: 992px) {
448   - padding: 3% 5% 0 5%;
  448 + padding: 14% 5% 0 5%;
  449 + }
  450 +
  451 + @media (max-width: 1199px) {
  452 + padding-top: 6%;
  453 + }
  454 +
  455 + @media (max-width: 992px) {
  456 + font-size: 77%;
  457 + padding: 20px 10px 0px 10px;
  458 + }
  459 +
  460 + @media (max-width: 767px) {
  461 + font-size: 100%;
  462 + padding: 20px 20px 10px 20px;
449 463 }
450 464 }
451 465  
... ... @@ -484,3 +498,34 @@ ul li:last-child {
484 498 background-color: #3D4AB3;
485 499 padding-top: 25px;
486 500 }
  501 +
  502 +.img-full {
  503 + @media (min-width: 1199px) {
  504 + width: 100%;
  505 + height: 100%;
  506 + }
  507 +}
  508 +
  509 +.middle-row{
  510 + @media (min-width: 768px) {
  511 + display: table;
  512 + table-layout: fixed;
  513 + }
  514 +}
  515 +
  516 +.middle-col{
  517 + @media (min-width: 768px) {
  518 + display: table-cell;
  519 + vertical-align: middle;
  520 + float: none;
  521 + }
  522 +}
  523 +
  524 +// Links grandes quebram a linha em telas pequenas
  525 +a {
  526 + white-space: pre-wrap; /* css-3 */
  527 + white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
  528 + white-space: -pre-wrap; /* Opera 4-6 */
  529 + white-space: -o-pre-wrap; /* Opera 7 */
  530 + word-wrap: break-word; /* Internet Explorer 5.5+ */
  531 +}
487 532 \ No newline at end of file
... ...
src/app/pages/inicio/inicio.html
  Diff comments   View file @5dfcfbc
... ... @@ -88,7 +88,7 @@
88 88 </div>
89 89 </div>
90 90 </section>
91   - <section class="section-event">
  91 +<!-- <section class="section-event">
92 92 <div ng-if="pageInicio.events">
93 93 <event-list events="pageInicio.events"></event-list>
94 94 </div>
... ... @@ -106,7 +106,7 @@
106 106 </div>
107 107 </div>
108 108 </div>
109   - </section>
  109 + </section> -->
110 110 <section class="section-info" ng-if="pageInicio.loading || pageInicio.error">
111 111 <div class="container">
112 112 <div class="row">
... ...