From 01f65e4f22084d9dd0bb47931e7190e69170ea57 Mon Sep 17 00:00:00 2001 From: llj Date: Wed, 6 Jun 2012 11:52:37 +0800 Subject: [PATCH] modification for ie --- avatar/templates/avatar/add.html | 2 +- contacts/templates/contacts/contact_add.html | 2 +- contacts/templates/contacts/contact_edit.html | 2 +- media/css/seahub.css | 32 ++++++++++++++----- .../notifications/add_notification_form.html | 2 +- templates/add_user_form.html | 2 +- templates/admin_base.html | 2 +- templates/base.html | 6 ++-- templates/myhome_base.html | 2 +- templates/registration/login.html | 4 +-- .../registration/password_change_form.html | 2 +- .../registration/password_reset_confirm.html | 2 +- .../registration/password_reset_form.html | 2 +- templates/registration/registration_form.html | 2 +- 14 files changed, 40 insertions(+), 24 deletions(-) diff --git a/avatar/templates/avatar/add.html b/avatar/templates/avatar/add.html index b707f44498..9fc9be0009 100644 --- a/avatar/templates/avatar/add.html +++ b/avatar/templates/avatar/add.html @@ -12,7 +12,7 @@
{{ upload_avatar_form.avatar }}
{{ upload_avatar_form.avatar.errors }} - +
diff --git a/contacts/templates/contacts/contact_add.html b/contacts/templates/contacts/contact_add.html index 996a4ff708..babcfcb82a 100644 --- a/contacts/templates/contacts/contact_add.html +++ b/contacts/templates/contacts/contact_add.html @@ -17,7 +17,7 @@

{{ error_msg }}

{% endif %}

请输入邮箱地址。

- + {% endblock %} diff --git a/contacts/templates/contacts/contact_edit.html b/contacts/templates/contacts/contact_edit.html index d5cdbc0017..c5b57413d2 100644 --- a/contacts/templates/contacts/contact_edit.html +++ b/contacts/templates/contacts/contact_edit.html @@ -18,7 +18,7 @@ {% if error_msg %}

{{ error_msg }}

{% endif %} - + {% endblock %} diff --git a/media/css/seahub.css b/media/css/seahub.css index 815191fa1a..4774704638 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -10,6 +10,7 @@ ol { padding-left:2em; } /* input button */ textarea { border: 1px solid #80B0B0; } input { + display:inline-block;/*for ie*/ height:20px; line-height:20px; margin:3px 0; @@ -19,6 +20,7 @@ input[type=checkbox] { height:auto; } input[type=submit], +input.submit, button { font-size:13px;/*for ff*/ color: #080; @@ -32,6 +34,7 @@ button { margin-top:8px; } button { + display:inline-block;/*for ie*/ margin:0; } input[type=submit]:hover, @@ -105,8 +108,8 @@ table img { /* container */ #wrapper { font: 13px/1.5 Arial, Helvetica, sans-serif; } -#header, #main, #footer { width:950px; } -#header, #main { margin:0 auto; } +#header, #main, #footer, .top-bar-in { width:950px; } +#header, #main, .top-bar-in { margin:0 auto; } #header { font-size: 14px; font-weight: bold; @@ -114,6 +117,7 @@ table img { } #main { min-height: 400px; + _height: 400px; padding-top: 10px; } #left-panel { float:right; width:220px; } @@ -136,7 +140,6 @@ table img { /* top-bar */ #top-bar { height:20px; padding-bottom:21px; background:#fff url('../img/dropshadow.png') repeat-x center bottom; } .top-bar { height:20px; color:#fff; text-align:right; font-weight:bold; background:#606; } -.top-bar-in { width:950px; margin:0 auto; } .top-bar a { color:#ddd; font-weight:normal; } .top-bar a.avatar-link { display:inline-block; @@ -159,13 +162,13 @@ table img { background:none; } /* header */ -#header .top-info { margin-bottom:5px;} +#header .top-info { margin-bottom:13px;} #other-info { color: #ccc; text-align:right; } #other-info .wish { font-style:italic; margin-bottom:10px; } #other-info .version { font-size: 12px; } #header .nav li { float: left; height: 18px; padding: 0px 25px 4px 0; } #header .nav a, #header .nav a:visited { color:#8A948F; font-weight:bold; text-decoration:none; } -#header .nav a.cur { color: #000; } +#header .nav a.cur { color:#000; } #header .nav a:hover { color: #ff9933; text-decoration: underline; } /* footer */ #footer a { color:#333; text-decoration:none; } @@ -212,12 +215,25 @@ p.path, p.access-notice { margin: 12px 0 6px 0; } .narrow-panel h3 { margin-top:0; } -.narrow-panel input[type="text"], -.narrow-panel input[type="password"] { - width:96%; +.narrow-panel input { + width:24em; height:1.8em; margin:0 0 0.6em; } +.narrow-panel input.submit { + width:3em; + color: #080; + height:23px; + line-height:21px; + padding:0 3px; + background: #EEE; + border: 1px solid #80B0B0; + margin:8px 0 3px; +} +.login-form a { + vertical-align:middle; +} + /*text-panel: for pages with few text*/ .text-panel { font-size:16px; diff --git a/notifications/templates/notifications/add_notification_form.html b/notifications/templates/notifications/add_notification_form.html index d9a82398ec..f372e1a7b8 100644 --- a/notifications/templates/notifications/add_notification_form.html +++ b/notifications/templates/notifications/add_notification_form.html @@ -7,7 +7,7 @@
{{ form.message }} - +
{% endblock %} diff --git a/templates/add_user_form.html b/templates/add_user_form.html index 6d29708c41..9526b070ad 100644 --- a/templates/add_user_form.html +++ b/templates/add_user_form.html @@ -17,7 +17,7 @@ {{ form.password2.errors }}

- + {% endblock %} diff --git a/templates/admin_base.html b/templates/admin_base.html index f89be677d8..6f6e8b5bdc 100644 --- a/templates/admin_base.html +++ b/templates/admin_base.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block top_bar_manager_class %} class="cur"{% endblock %} {% block nav %} -