From: the_mgt Date: Fri, 1 Jul 2011 12:12:13 +0000 (+0200) Subject: Improved logic and look of the login.html (and partly the modal) X-Git-Tag: v8.11~642 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d050b46df08c6babe304130816d34d5a4dca2868 Improved logic and look of the login.html (and partly the modal) Also renamed the delete.png to abort, makes more sense. Deployed abort.png where it fits (closewindow.gif loks bad when blown to 32pixel) --- diff --git a/webcit/static/icons/essen/16x16/abort.png b/webcit/static/icons/essen/16x16/abort.png new file mode 100644 index 000000000..f7b62558f Binary files /dev/null and b/webcit/static/icons/essen/16x16/abort.png differ diff --git a/webcit/static/icons/essen/16x16/delete.png b/webcit/static/icons/essen/16x16/delete.png index f7b62558f..787a6008a 100644 Binary files a/webcit/static/icons/essen/16x16/delete.png and b/webcit/static/icons/essen/16x16/delete.png differ diff --git a/webcit/static/icons/essen/32x32/abort.png b/webcit/static/icons/essen/32x32/abort.png new file mode 100644 index 000000000..72f9e21df Binary files /dev/null and b/webcit/static/icons/essen/32x32/abort.png differ diff --git a/webcit/static/icons/essen/32x32/delete.png b/webcit/static/icons/essen/32x32/delete.png deleted file mode 100644 index 72f9e21df..000000000 Binary files a/webcit/static/icons/essen/32x32/delete.png and /dev/null differ diff --git a/webcit/static/styles/login.css b/webcit/static/styles/login.css index e90502b06..b4ee10ebf 100644 --- a/webcit/static/styles/login.css +++ b/webcit/static/styles/login.css @@ -1,24 +1,25 @@ #login_screen, #logout_screen { position: fixed; - margin: 0px; - top: 0px; - left: 0px; - bottom: 0px; - right: 0px; - padding: 3% 6% 3% 6%; + left: 0; + right: 0; + margin: 5em auto; + width: 42em; overflow: auto; } -#login_screen .login_message, #login_screen .login_image, .login_hello, #login_screen #login_form { +#login_screen .login_message, .login_hello, #login_screen #login_form { display: block; margin: 5px auto 5px auto; } #login_screen .login_message, .login_hello { width: 80% } -#login_screen .login_image { width: 135px } +#login_screen .login_image { + width: 135px; + margin: 0 auto; +} -#login_screen .login_image img { text-align: center } +/*#login_screen .login_image img { width: 135px }*/ #login_screen #login_form { padding: 10px; @@ -68,3 +69,20 @@ text-align: center; font-weight: bold; } + +.logbuttons, .registernow { + width: 50%; + margin: 1em auto; + text-align: center; + display: block; + height: 2em; + line-height: 2em; + background-color: #4d555c; + font-weight: bold; + -khtml-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + behavior: url(static/styles/PIE.htc); +} + +.logbuttons a:link, .registernow a:link { color: #f0feff; } diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css index 7fa51c78f..e0368b180 100644 --- a/webcit/static/styles/webcit.css +++ b/webcit/static/styles/webcit.css @@ -30,7 +30,7 @@ html, body { .address_book_popup_title { font-size: 130% } -#button, #content .button_link a, input#delbutton,.attachfile,.logbuttons input,.buttons input, .buttons a, .customize, .menubar_link, #banner ul.room_actions li, .selector_top, .selector_bottom, .banner .infos,li.search,li.view, .room_actions form select option, .selectbox, ul.adminitems li span, #message_list tr > td { +#button, #content .button_link a, input#delbutton,.attachfile, .buttons input, .buttons a, .customize, .menubar_link, #banner ul.room_actions li, .selector_top, .selector_bottom, .banner .infos,li.search,li.view, .room_actions form select option, .selectbox, ul.adminitems li span, #message_list tr > td { font-size: 100%; } @@ -389,11 +389,11 @@ input, select, .room_actions form select, .room_actions li.search input, .addres .buttons a:hover { background-color: #5c646b; } -.button_link a, input#delbutton,.attachfile, .logbuttons input,.buttons input { +.button_link a, input#delbutton,.attachfile, .buttons input { background-color: #4d555c; } -.button_link a, input#delbutton,.attachfile, .logbuttons input,.buttons input { +.button_link a, input#delbutton,.attachfile, .buttons input { border: 2px solid #5c646b; color: #F0FEFF; } @@ -571,7 +571,7 @@ body { padding: 2px; } -.button_link a, .attachfile, .logbuttons input,.buttons input .logbutton { +.button_link a, .attachfile, .buttons input .logbutton { margin: 3px; padding: 2px 4px 2px 4px; } @@ -798,7 +798,7 @@ table.advanced { /* Links and buttons */ -.logbuttons, .buttons, .registernow { +.buttons { margin: 2px auto 2px auto; width: 96%; text-align: center; @@ -1325,10 +1325,6 @@ a.event_title:hover span.bttbottom, a.event_unread:hover span.bttbottom, a.event padding-left: 18px; } -.registernow { - text-align: right; -} - .older_blog_posts, .newer_blog_posts { font-size: 110%; } diff --git a/webcit/static/t/confirmlogoff.html b/webcit/static/t/confirmlogoff.html index 203a3afc7..d9f8c7b4a 100644 --- a/webcit/static/t/confirmlogoff.html +++ b/webcit/static/t/confirmlogoff.html @@ -1,6 +1,6 @@

 

-

 

+

 

diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html index cb4e8f951..96beced84 100644 --- a/webcit/static/t/login.html +++ b/webcit/static/t/login.html @@ -2,22 +2,21 @@
-
- - Citadel -
-
-
- - - - +
-