From: the_mgt Date: Sun, 3 Jul 2011 17:45:34 +0000 (+0200) Subject: Cleaned and sobered up the roombanner css and html: X-Git-Tag: v8.11~629 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=e4f503392ef0a752b7fa2e6e9a27b05c19617fee Cleaned and sobered up the roombanner css and html: 1. It is all a table now 2. paddings and margins look good (room info no longer growing into actiondiv) 3. moved the "logged in as" into actiondiv (looks a bit crowded, but we will take care of that soon) 4. fade in/out effects for extended room info are no longer collibri style I am not yet satisfied with the height of the #room_info and the scrollbar doesnt work! --- diff --git a/webcit/static/styles/banner.css b/webcit/static/styles/banner.css index 03b86e322..bbeb9513e 100644 --- a/webcit/static/styles/banner.css +++ b/webcit/static/styles/banner.css @@ -6,7 +6,7 @@ -pie-background: linear-gradient(#4D555C, #7D858C); behavior: url(/static/styles/PIE.htc); border-bottom: 2px solid #424b52; - color: #FFF; + color: #f0feff; margin: 0; padding: 0; top: 0; @@ -18,13 +18,17 @@ overflow: hidden; } -#banner a { color: #FFF } +#banner table { width: 100% } + +#banner a { color: #f0feff } #banner h1 { font-size: 160%; font-weight: 700; } +#banner #rmname { white-space: nowrap; } + #banner h2 { font-weight: 700} #banner h2, #banner .titlebar { font-size: 130% } @@ -34,21 +38,21 @@ color: #FEFFFC; border: 1px solid black; } -#banner .banner { - display: table-cell; - width: 90%; -} + +#banner .banner {} #banner .banner img { float: left; - margin: 0 5px 15px 0; + margin: 0 0.3em 1em 0; } -#banner h1, #banner h2, #banner .banner .infos, #banner .banner p { +#banner h1, #banner h2, #banner .banner p { margin: 2px; padding: 0; } +#banner .infos{ margin: 0.5em } + #room_infos { position: absolute; top: 0; @@ -63,9 +67,9 @@ #room_infos img.close_infos { float: right } #actiondiv { - position: absolute; - right: 0; - top: 0; + float: right; + margin: 0; + padding: 0; text-align: right; font-size: 70%; font-weight: bold; @@ -74,10 +78,10 @@ #banner ul.room_actions { list-style: none; margin: 0; + padding: 0; } #banner ul.room_actions li { white-space: nowrap; - display: inline; } #banner ul.room_actions li form { margin: 0; @@ -88,6 +92,7 @@ margin-top: 2px; margin-right: 2px; } + #selectpage.hidden { display: none !important } @@ -95,6 +100,4 @@ .room_actions form select { cursor: pointer } -.start_page { - font-size: 50% -} +.start_page { font-size: 50% } diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css index c397bb641..3ee668a1f 100644 --- a/webcit/static/styles/webcit.css +++ b/webcit/static/styles/webcit.css @@ -62,13 +62,13 @@ body { } #room_infos, #address_book_popup, .roomops_cell, .roomops_cell_edit, .mimepart { - background-color: #F0FFFF; - color: #333; + background-color: #deded0; + color: #5C646B; } #room_infos, #address_book_popup, .mimepart, .room_actions form select { - border: 1px solid #333; - overflow: scroll; + border: 1px solid #5C646B; + overflow: auto; } .buttons a,.tablabel,.treetitle { diff --git a/webcit/static/t/readinfo.html b/webcit/static/t/readinfo.html index 5c8bcd4c7..747093ef5 100644 --- a/webcit/static/t/readinfo.html +++ b/webcit/static/t/readinfo.html @@ -1,6 +1,6 @@
diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html index b714617c6..544ddf19d 100644 --- a/webcit/static/t/roombanner.html +++ b/webcit/static/t/roombanner.html @@ -13,10 +13,11 @@

-
+