From 2149e84d51164f7831811df0d31b0fc92e81233f Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Tue, 2 Aug 2011 13:52:01 +0200 Subject: style polish --- src/site-media/css/style.css | 61 ++++++++++---------------- src/site-media/img/sidhuvudbakgrund.jpg | Bin 0 -> 63437 bytes src/site-media/img/sunet.jpg | Bin 0 -> 19292 bytes src/templates/apps/auth/login.html | 7 +-- src/templates/base.html | 73 ++++++++++++++++---------------- 5 files changed, 64 insertions(+), 77 deletions(-) create mode 100644 src/site-media/img/sidhuvudbakgrund.jpg create mode 100644 src/site-media/img/sunet.jpg diff --git a/src/site-media/css/style.css b/src/site-media/css/style.css index 97912d9..4740442 100644 --- a/src/site-media/css/style.css +++ b/src/site-media/css/style.css @@ -1,43 +1,39 @@ html,body { font-size: 80%; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; height: 100%; margin:0; padding:0;} -body { min-width: 600px; width: 90%; } -div#container { position: relative; height:auto !important; height: 100%; min-height: 80%; margin-left: 50px; margin-top: 0; padding-bottom: 90px;} -#modal-dialog { font-size: 110%; } -#modal-dialog input.text textarea { margin-bottom:12px; width:95%; padding: .4em; } -#modal-dialog fieldset { padding:0; border:0; margin-top:25px; } -div#intro { font-size: 150%; margin-top: 50px; } -div#footer { margin-right: 50px; border-top: 1px solid #CECECE; position: absolute; bottom: 0; padding-bottom: 0px; width: 100%; } -div#footer ul { list-style: none; padding: 0; margin: 0; } -div#footer li { display: inline; } -div#footer li li { display: block; } -div#footer ul ul { float: left; padding-right: 50px; } -div#header { margin: 0; padding: 0; padding-bottom: 30px; } -div#header img { width: 100%; border: 0; margin-top: 5px;} -#headline { position: absolute; top: 20px; left: 150px; z-index: 1; } -div#headline a { text-decoration: none; } +body { min-width: 800px; width: 100%; } +#container { position: relative; height:auto !important; height: 100%; min-height: 80%; margin-left: 0px; margin-top: 0; padding-bottom: 90px;} +.centered { margin-right: auto; margin-left: auto; width: 800px; } +#footer { width: 100%; position: absolute; bottom: 0; padding-bottom: 20px; background-color: #CECECE; } +ul.list-of-lists { list-style: none; padding: 0; margin: 0; margin: 0; padding: 0; padding-bottom: 30px; } +ul.list-of-lists li { display: inline; } +ul.list-of-lists li ul { float: left; padding-right: 50px; } +ul.list-of-lists li ul li { display: block; } +#content{ padding-bottom: 50px; width: 100%;} +#header { background-image: url('../img/sidhuvudbakgrund.jpg'); background-position: top center; background-repeat: repeat-x; } +#welcome { font-size: 180%; margin-top: 100px;} h3.listheader { padding-left: 20px; } .navlist ul { list-style: none; padding: 0; margin: 0; font-size: 90%; } .navlist li { float: right; display: inline;} -.ilist { padding: 0px; margin: 0px; } -.ilist ul { list-style: none; } -.ilist li { display: inline-block; } -.leftright ul { display: inline; list-style: none inside; padding: 0px; } -.leftright li { display: inline-block; padding: 0px; vertical-align: top; } -.rlist ul { list-style: none inside; padding: inherit; } -.rlist li { float: right; display: inline; padding: inherit; } -.clist ul { list-style: none; } -.clist li { display: list-item; } + +ul.ilist { list-style: none inside; margin: 0; padding 0; padding-left: 0px} +.ilist li { display: inline-block; margin: 0; padding 0; } + +ul.rlist { list-style: none inside; padding: 0; margin: 0; padding-left: 0px} +.rlist li { float: right; display: inline; padding: 0; margin: 0; } + +ul.clist { list-style: none; padding: 0; margin: 0;} +.clist li { display: list-item; padding: 0; margin: 0;} + .nlist ul { list-style: none; } .nlist li { display: list-item; list-style: none; } .square li { list-style: none inside none; } + .description { clear: both; margin-top: 10px; padding-top: 15px; } -p.info { font-size: 120%; margin-top: 10px; padding-top: 15px; } div.toolbar{ padding: 4px; float: right; margin-right: 30px; margin-bottom: 20px; margin-top: 50px; } #linklist { float: right; } #linklist ul{ list-style: none; padding: 0; margin: 0; } #linklist li{ float: left; margin: 0 0.15em} #linklist a{ font: 120% "Trebuchet MS", sans-serif; } .clear { clear: both; } -#content{ padding-bottom: 50px; } .code{font: 110% "Courier", fixed} #rhs{ float: right; margin-right: 80px; width: 20%; } #main{ float: left; margin-left: 0px; width:70%} @@ -73,15 +69,4 @@ h1, h1 a { h2, h2 a { color: #E37424; font-size: 150% -} - -#files { width: 520px; clear: both; margin: 20px 0 10px; } -#files .viewport { width: 500px; height: 200px; overflow: hidden; position: relative; } -#files .overview { list-style: none; position: absolute; left: 0; top: 0; } -#files .thumb .end, -#files .thumb { background-color: #003D5D; } -#files .scrollbar { position: relative; float: right; width: 15px; } -#files .track { background-color: #D8EEFD; height: 100%; width:13px; position: relative; padding: 0 1px; } -#files .thumb { height: 20px; width: 13px; cursor: pointer; overflow: hidden; position: absolute; top: 0; } -#files .thumb .end { overflow: hidden; height: 5px; width: 13px; } -#files .disable{ display: none; } \ No newline at end of file +} \ No newline at end of file diff --git a/src/site-media/img/sidhuvudbakgrund.jpg b/src/site-media/img/sidhuvudbakgrund.jpg new file mode 100644 index 0000000..a2af257 Binary files /dev/null and b/src/site-media/img/sidhuvudbakgrund.jpg differ diff --git a/src/site-media/img/sunet.jpg b/src/site-media/img/sunet.jpg new file mode 100644 index 0000000..b8a7c23 Binary files /dev/null and b/src/site-media/img/sunet.jpg differ diff --git a/src/templates/apps/auth/login.html b/src/templates/apps/auth/login.html index b5302a7..6d8139d 100644 --- a/src/templates/apps/auth/login.html +++ b/src/templates/apps/auth/login.html @@ -3,7 +3,8 @@ {% block headline %}Login{% endblock %} {% block title %}SUNET Meeting Tools{% endblock %} {% block content %} -

Welcome!

-

This is a technology preview of the SUNET Meeting Tools. Contact Johnny or Marcus for more info!

-
Login
+
+

This is a technology preview of the SUNET Meeting Tools.

+
Login
+
{% endblock %} \ No newline at end of file diff --git a/src/templates/base.html b/src/templates/base.html index 818e137..1b35ba1 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -60,47 +60,48 @@
- {% block content %}{% endblock %} +
{% block content %}{% endblock %}
-- cgit v1.1