From 255d4ff7186c307e7c3d89b7392804cef5876f14 Mon Sep 17 00:00:00 2001 From: Alexander Kiy Date: Mon, 18 Jan 2016 11:03:28 +0100 Subject: [PATCH 1/2] css adjustments for split panel --- static/css/global.css | 8 ++++- static/css/split.css | 80 +++++++++++++++++++++++++++++++++++++++++-- two.html | 2 +- 3 files changed, 86 insertions(+), 4 deletions(-) diff --git a/static/css/global.css b/static/css/global.css index 4a3288e..eb7001b 100644 --- a/static/css/global.css +++ b/static/css/global.css @@ -46,7 +46,7 @@ tr td em { -webkit-box-shadow: 0px -4px 3px -2px rgba(171,171,171,1); -moz-box-shadow: 0px -4px 3px -2px rgba(171,171,171,1); box-shadow: 0px -4px 3px -2px rgba(171,171,171,1); - + } .free-rooms h2 { @@ -259,6 +259,12 @@ th.js_journeys_headline { } /* NEWS */ + +.js_body { + width: 100%; + text-align: center; +} + .page-headline { padding:0; } diff --git a/static/css/split.css b/static/css/split.css index 7569053..ce89c6d 100644 --- a/static/css/split.css +++ b/static/css/split.css @@ -26,10 +26,86 @@ height: 235px; padding: 5px; font-size: 14px; + padding: 0; +} + +/* Nahverkehr */ + +.js_journeys_tbody { + font-size:1.3em; +} + + +.js_journeys_tbody td { + line-height:2em !important; +} + +th.js_journeys_headline { + font-size: 1em !important; + color:#fff; + + text-transform:uppercase; + text-align:left; + background:#014260; + height:2.3em; + line-height:1; + padding:0 0 0 10px !important; + vertical-align:middle !important; +} + +.journey_dir_platf { + width:20em; +} + +.js_journey_platform { + display: none; +} + +.js_journey_direction, .js_journey_name { + font-weight:bold; + font-size:0.5em; + color:#014260; + line-height:1.2; + margin-bottom:0; +} + +td.js_journey_time_absolute { + display: none; +} + +.js_journey_time_relative { + text-align:center; + font-size:0.5em; +} + +.js_journey_time_relative { + font-size:0.5em; + font-weight:bold; + color:#014260; +} + +.js_journey_name.Bus { + background-image:url(../img/bus.png); + background-size: 20px; + background-repeat:no-repeat; + text-indent:54px; + background-position:4px 4px; +} + +.js_journey_name.S { + background-image:url(../img/sbahn.png); + background-size: 20px; + background-repeat:no-repeat; + text-indent:54px; + background-position:4px 4px; } -th.js_journeys_headline { - font-size: 1.25em !important; +.js_journey_name.RB { + background-image:url(../img/regio.png); + background-size: 20px; + background-repeat:no-repeat; + text-indent:54px; + background-position:4px 4px; } .js_page .js_body { diff --git a/two.html b/two.html index e30156d..65b043c 100644 --- a/two.html +++ b/two.html @@ -1,5 +1,5 @@ Werbung
- +
\ No newline at end of file From e98c49458a3cf1590361af471ca62ed3290c1df1 Mon Sep 17 00:00:00 2001 From: Maren Date: Mon, 18 Jan 2016 16:08:33 +0100 Subject: [PATCH 2/2] styling nahverkehr splitscreen --- index.html | 4 +-- static/css/global.css | 23 +++++++++++--- static/css/split.css | 73 ++++++++++++++++++++++++++++--------------- 3 files changed, 69 insertions(+), 31 deletions(-) diff --git a/index.html b/index.html index ed00191..a7051af 100644 --- a/index.html +++ b/index.html @@ -84,10 +84,10 @@

Freie Räume

- +
Tweets diff --git a/static/css/global.css b/static/css/global.css index eb7001b..3b2c157 100644 --- a/static/css/global.css +++ b/static/css/global.css @@ -76,6 +76,8 @@ tr td em { border-top: 1px solid #dddddd; padding: 2px; font-size: 2.5em; + padding-top: .3em; + padding-bottom: .3em; } .reservation .room { @@ -88,7 +90,7 @@ tr td em { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; - margin-right: 50px; + margin-right: 85px; font-weight: 700; } @@ -107,6 +109,11 @@ tr td em { font-weight: normal; } +.reservation strong.pull-right { + background: #d0dae3; + padding:.05em; +} + .container { width: 100%; } @@ -133,6 +140,11 @@ tr td em { position: absolute; } +.js_news_tbody tr + tr { + + border-top: 10px solid #014260; +} + .news-td { background-size: cover; background-position: center center; @@ -227,16 +239,19 @@ th.js_journeys_headline { margin-bottom:0; } -.js_journey_time_absolute, .js_journey_time_relative { + .js_journey_time_relative { text-align:center; } -.js_journey_time_relative { +.js_journey_time_relative,.js_journey_time_absolute { font-size:1.5em; font-weight:bold; color:#014260; } +.js_journey_name, .js_journey_time_absolute { + color:#696969; +} .js_journey_name.Bus { background-image:url(../img/bus.png); background-repeat:no-repeat; @@ -262,7 +277,7 @@ th.js_journeys_headline { .js_body { width: 100%; - text-align: center; + } .page-headline { diff --git a/static/css/split.css b/static/css/split.css index ce89c6d..6f35f19 100644 --- a/static/css/split.css +++ b/static/css/split.css @@ -23,10 +23,10 @@ left: 576px; top: 0; width: 186px; /* 192px-6px wegen schwarzem Rand */ - height: 235px; - padding: 5px; + height: auto; + padding: 1px; font-size: 14px; - padding: 0; + } /* Nahverkehr */ @@ -36,21 +36,22 @@ } -.js_journeys_tbody td { - line-height:2em !important; -} - th.js_journeys_headline { font-size: 1em !important; color:#fff; - text-transform:uppercase; text-align:left; background:#014260; height:2.3em; line-height:1; padding:0 0 0 10px !important; - vertical-align:middle !important; + +} + +.js_journeys_tbody tr td { + + min-height:50px; + } .journey_dir_platf { @@ -67,6 +68,13 @@ th.js_journeys_headline { color:#014260; line-height:1.2; margin-bottom:0; + +} + +p.js_journey_direction { + max-width: 80%; + padding-top:5px; + padding-left:5px; } td.js_journey_time_absolute { @@ -74,8 +82,20 @@ td.js_journey_time_absolute { } .js_journey_time_relative { - text-align:center; - font-size:0.5em; + text-align:left; + font-size:0.5em; + +} +td.js_journey_time_relative { + line-height:1.2 !important; + width:730px; + padding-top:5px !important; +} +.js_journey_time_relative:after { + content: "."; + display: block; + min-height: 30px; + font-size: 0; } .js_journey_time_relative { @@ -86,26 +106,29 @@ td.js_journey_time_absolute { .js_journey_name.Bus { background-image:url(../img/bus.png); - background-size: 20px; + line-height: 1.3 !important; background-repeat:no-repeat; - text-indent:54px; - background-position:4px 4px; -} - -.js_journey_name.S { - background-image:url(../img/sbahn.png); - background-size: 20px; - background-repeat:no-repeat; - text-indent:54px; - background-position:4px 4px; + background-size: 20px 20px; + background-position:8px 4px; + + width: 210px; + text-align:center; + padding-top:25px; + text-indent:0; } .js_journey_name.RB { background-image:url(../img/regio.png); - background-size: 20px; + background-size: 40px 40px; background-repeat:no-repeat; - text-indent:54px; - background-position:4px 4px; + background-size: 20px 20px; + background-position:7px 4px; + width: 210px; + text-align:center; + padding-top:20px; + text-indent:0; + + } .js_page .js_body {