Merge branch 'master' of github.com:University-of-Potsdam-MM/rooms

University-of-Potsdam-MM · Jan 18, 2016 · 8e6d38f · 8e6d38f
2 parents 23497a3 + e98c494
commit 8e6d38f
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 11 deletions.
diff --git a/index.html b/index.html
@@ -84,10 +84,10 @@ <h2>Freie Räume</h2>
     </div>
 
     <div class="container current-content">
-
+		<!--
         <div class="row js_page jsb_ jsb_views/AdView" id="ad-view" data-jsb="">
         </div>
-
+		-->
         <div class="row js_page jsb_ jsb_views/TweetsView tweets" data-jsb="">
             <strong class="page-headline"><span class="js_tweets_headline">Tweets</span></strong>
             <a data-chrome="noheader noscrollbar transparent noborders nofooter" class="js_twitter_timeline twitter-timeline" href="https://twitter.com/search?q=%40unipotsdam">Tweets by @unipotsdam</a>

diff --git 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 {
@@ -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;
@@ -259,6 +274,12 @@ th.js_journeys_headline  {
 }
 
 /* NEWS */
+
+.js_body {
+    width: 100%;
+
+}
+
 .page-headline {
 	padding:0;
 }

diff --git a/static/css/split.css b/static/css/split.css
@@ -23,13 +23,112 @@
     left: 576px;
     top: 0;
     width: 186px; /* 192px-6px wegen schwarzem Rand */
-    height: 235px;
-    padding: 5px;
+    height: auto;
+    padding: 1px;
     font-size: 14px;
+
 }
 
-th.js_journeys_headline {
-    font-size: 1.25em !important;
+/* Nahverkehr */
+
+.js_journeys_tbody {
+    font-size:1.3em;
+}
+
+
+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;
+
+}
+
+.js_journeys_tbody tr td {
+
+    min-height:50px;
+
+}
+
+.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;
+
+}
+
+p.js_journey_direction {
+    max-width: 80%;
+    padding-top:5px;
+    padding-left:5px;
+}
+
+td.js_journey_time_absolute {
+    display: none;
+}
+
+.js_journey_time_relative {
+    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 {
+    font-size:0.5em;
+    font-weight:bold;
+    color:#014260;
+}
+
+.js_journey_name.Bus {
+    background-image:url(../img/bus.png);
+    line-height: 1.3 !important;
+    background-repeat:no-repeat;
+    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: 40px 40px;
+    background-repeat:no-repeat;
+    background-size: 20px 20px;
+    background-position:7px 4px;
+    width: 210px;
+   text-align:center;
+   padding-top:20px;
+    text-indent:0;  
+
+
 }
 
 .js_page .js_body {

diff --git a/two.html b/two.html
@@ -1,5 +1,5 @@
 <meta name="next-page-in" content="260" />
 <strong class="page-headline"><span class="js_ads_headline">Werbung</span></strong>
 	<div class="js_body">
-		<video style="max-width: 100%; max-height: 100%" src="http://streamup.uni-potsdam.de/flash/83040532_hi.mp4" autoplay="autoplay"></video>
+		<video style="max-width: 100%; max-height: 100%; width: 100%" src="http://streamup.uni-potsdam.de/flash/83040532_hi.mp4" autoplay="autoplay"></video>
 </div>