Download as
Browse Code »

Commit 37f6ee2386251ae217eae5f26ab734888972138b

Authored by Michel Felipe
1 parent 5fdb7720
Exists in master and in 2 other branches production, staging

Fix presenter panel before calendar with better css styles

Showing 2 changed files with 51 additions and 24 deletions   Show diff stats
index.html
  Diff comments   View file @37f6ee2
... ... @@ -583,14 +583,34 @@
583 583 </div>
584 584 {{/if}}
585 585  
586   - {{#compare event.setting.presenter event.title operator="!=="}}
587   - <div class="col-sm-12">
588   - <div class="row">
589   - <p>{{event.setting.presenter}}</p>
590   - </div>
591   - </div>
592   - {{^}}
593 586 <div class="col-sm-12">
  587 + {{#compare event.setting.presenter event.title operator="!=="}}
  588 +
  589 + <div class="row alert presenter-warning">
  590 + {{event.setting.presenter}}
  591 + </div>
  592 +
  593 + <div class="row calendar__disabled">
  594 + <div class="calendar__column col-xs-12 col-sm-6">
  595 + <div class="row">
  596 + <div class="calendar__presenter">{{event.title}}</div>
  597 + <div class="calendar__presenter-category">{{category}}</div>
  598 + </div>
  599 + </div>
  600 + <div class="calendar__column col-xs-6 col-sm-3">
  601 + <div class="row">
  602 + <div class="calendar__date"><i class="fa fa-calendar" aria-hidden="true"></i> {{date}}</div>
  603 + </div>
  604 + </div>
  605 + <div class="calendar__column col-xs-6 col-sm-3">
  606 + <div class="row">
  607 + <div class="calendar__time"><i class="fa fa-clock-o" aria-hidden="true"></i> {{time}}</div>
  608 + </div>
  609 + </div>
  610 + </div>
  611 +
  612 + {{^}}
  613 +
594 614 <div class="row">
595 615 <div class="calendar__column col-xs-12 col-sm-6">
596 616 <div class="row">
... ...
sass/style.sass
  Diff comments   View file @37f6ee2
1 1 // ------------------------------------
2 2 // Organização da folha de estilo:
3   -//
  3 +//
4 4 // 0 - Dependências
5 5 // 1 - Variaveis
6 6 // 1.1 - espacamento
... ... @@ -92,9 +92,9 @@ $darken: 15%
92 92  
93 93 // 1.7 - screens
94 94 $screen-xs: 480px
95   -$screen-sm: 767px
96   -$screen-md: 992px
97   -$screen-lg: 1200px
  95 +$screen-sm: 767px
  96 +$screen-md: 992px
  97 +$screen-lg: 1200px
98 98  
99 99 // ------------------------------------
100 100 // 2 - Mixins
... ... @@ -439,7 +439,7 @@ h1
439 439 margin-bottom: $gutter * 1.5
440 440 .embed-responsive
441 441 border: 1px solid #333
442   -
  442 +
443 443 &.video-smaller
444 444 @media (min-width: $screen-md)
445 445 width: 60%
... ... @@ -923,14 +923,14 @@ td
923 923 float: right
924 924 background: none
925 925 border: none
926   -
  926 +
927 927 @each $category, $color in $categories
928 928 .#{$category} &
929 929 color: $color
930 930  
931 931 .contraste &
932 932 color: #fff
933   -
  933 +
934 934 .updated-at
935 935 @extend .vote-result
936 936 margin-top: $gutter
... ... @@ -965,7 +965,7 @@ td
965 965 &:after
966 966 display: block
967 967 content: "[...]"
968   - // content: "\e000"
  968 + // content: "\e000"
969 969 position: absolute
970 970 top: 0
971 971 right: 2px
... ... @@ -995,12 +995,12 @@ td
995 995 text-transform: uppercase
996 996 .footable-row-detail-value
997 997 display: block
998   -
  998 +
999 999 // fix height
1000 1000 .footable-row-detail-row:nth-child(1)
1001 1001 .footable-row-detail-value:before
1002 1002 height: 30px
1003   -
  1003 +
1004 1004 // check icon
1005 1005 .footable-row-detail-row:nth-child(2)
1006 1006 .footable-row-detail-name
... ... @@ -1117,8 +1117,15 @@ td
1117 1117 content: "\f054"
1118 1118 &-disabled
1119 1119 opacity: 0.25
  1120 +
  1121 +.presenter-warning
  1122 + background-color: #D9D9DD
  1123 + font-weight: bold
1120 1124  
1121 1125 // .calendar
  1126 +.calendar__disabled
  1127 + opacity: 0.6
  1128 +
1122 1129 .calendar__presenter
1123 1130 font-weight: bold
1124 1131 font-size: 20px
... ... @@ -1127,12 +1134,12 @@ td
1127 1134 height: 90px
1128 1135 padding-top: 20px
1129 1136 background-color: #eeeff1
1130   -
  1137 +
1131 1138 &:not(:last-child)
1132 1139 border-right: 2px solid #fff
1133 1140 &:first-child
1134 1141 padding-left: 40px
1135   -
  1142 +
1136 1143 @media (max-width: $screen-sm)
1137 1144 &:first-child
1138 1145 border-bottom: 2px solid #fff
... ... @@ -1144,14 +1151,14 @@ td
1144 1151  
1145 1152 &:not(:last-child)
1146 1153 border-right: 2px solid #262626
1147   -
  1154 +
1148 1155 @media (max-width: $screen-sm)
1149 1156 &:first-child
1150 1157 border-bottom: 2px solid #262626
1151 1158 border-right: none
1152 1159  
1153 1160 // @media (max-width: $screen-sm)
1154   -
  1161 +
1155 1162 .calendar__date,
1156 1163 .calendar__time
1157 1164 font-size: 20px
... ... @@ -1208,7 +1215,7 @@ td
1208 1215  
1209 1216 // 6.20 - participe
1210 1217 .talk__participate
1211   - .button
  1218 + .button
1212 1219 position: relative
1213 1220 z-index: 5
1214 1221 .talk__counter
... ... @@ -1228,7 +1235,7 @@ td
1228 1235 @each $category, $color in $categories
1229 1236 .#{$category} &
1230 1237 color: $color
1231   -
  1238 +
1232 1239 @media (max-width: $screen-sm)
1233 1240 width: 100%
1234 1241 margin-left: 0
... ... @@ -1579,4 +1586,4 @@ h3.titulo-destaque
1579 1586  
1580 1587 // HACK IDG
1581 1588 #barra-brasil .brasil-flag
1582   - height: 100% !important
1583 1589 \ No newline at end of file
  1590 + height: 100% !important
... ...