diff options
| author | Zog | 2018-05-07 09:31:19 +0200 |
|---|---|---|
| committer | Zog | 2018-05-07 09:31:19 +0200 |
| commit | 5b00d38e4917d9b56a9fcda2bdca381586b824af (patch) | |
| tree | 22e842561a3dfb1ff785a79b9c100c4b171cfa45 /app | |
| parent | 8316ed020e2bcd2e9b28d0827ae626a9d927eed4 (diff) | |
| download | chouette-core-5b00d38e4917d9b56a9fcda2bdca381586b824af.tar.bz2 | |
Refs #6923; More :lipstick:
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/modules/_vj_collection.sass | 22 | ||||
| -rw-r--r-- | app/views/referential_vehicle_journeys/_consolidated_line.html.slim | 2 |
2 files changed, 21 insertions, 3 deletions
diff --git a/app/assets/stylesheets/modules/_vj_collection.sass b/app/assets/stylesheets/modules/_vj_collection.sass index b68b191d8..2e9951d35 100644 --- a/app/assets/stylesheets/modules/_vj_collection.sass +++ b/app/assets/stylesheets/modules/_vj_collection.sass @@ -261,13 +261,16 @@ margin-bottom: 0px & > * display: inline-block + & > * + overflow: hidden + min-width: 0 &.open margin-bottom: 40px .highlighted background-color: lighten($highlighted, 20%) !important .disabled - background-color: #ccc + background-color: #dedede color: #777 .t2e-item-list .t2e-item .th @@ -279,6 +282,18 @@ white-space: nowrap .td text-align: center + &:hover:after + position: absolute + height: 100% + bottom: 0 + left: -10000px + right: -10000px + content: "" + background-color: $red + opacity: 0.1 + z-index: 10 + &.headlined:hover:after + height: 50% .table-2entries > .t2e-head > .td > div > span::after @@ -288,4 +303,7 @@ background-color: #F9F9F9 .table.table-2entries .td > div.headlined::before - border-right-color: #F9F9F9 + border-right: none + + // .table.table-2entries .highlighted .td > div.headlined::before + // border-right-color: lighten($highlighted, 20%) diff --git a/app/views/referential_vehicle_journeys/_consolidated_line.html.slim b/app/views/referential_vehicle_journeys/_consolidated_line.html.slim index f6a9dcee8..d4c756d38 100644 --- a/app/views/referential_vehicle_journeys/_consolidated_line.html.slim +++ b/app/views/referential_vehicle_journeys/_consolidated_line.html.slim @@ -106,7 +106,7 @@ headline = vehicle_journey_stop_headline prev_sp, sp prev_sp = sp vjas = journey.vehicle_journey_at_stops.where(stop_point_id: sp.id).last - .td class="#{vjas && sp.highlighted? ? 'highlighted' : ''} #{vjas.nil? ? 'disabled' : ''}" + .td class="#{vjas && sp.highlighted? ? 'highlighted' : ''} #{vjas.nil? ? 'disabled' : ''} #{headline.present? ? 'headlined' : ''}" div title="#{sp.stop_area.city_name ? "#{sp.stop_area.city_name} (#{sp.stop_area.zip_code})" : ''}" data-headline=headline class=(headline.present? ? 'headlined' : '') - if vjas.present? - if vjas.departure_time == vjas.arrival_time |