1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00

Merge branch 'lj'

This commit is contained in:
xiez
2012-06-12 10:18:41 +08:00

View File

@@ -10,19 +10,22 @@ ol { padding-left:2em; }
/* input button */ /* input button */
textarea { border: 1px solid #80B0B0; } textarea { border: 1px solid #80B0B0; }
input { input {
display:inline-block;/*for ie*/
height:20px; height:20px;
line-height:20px; line-height:20px;
margin:3px 0; margin:3px 0;
border: 1px solid #80B0B0; border: 1px solid #80B0B0;
} }
input,
button {
font-size:13px;/*for ff*/
display:inline-block;/*for ie*/
}
input[type=checkbox] { input[type=checkbox] {
height:auto; height:auto;
} }
input[type=submit], input[type=submit],
input.submit, input.submit,
button { button {
font-size:13px;/*for ff*/
color: #080; color: #080;
height:23px; height:23px;
line-height:21px; line-height:21px;
@@ -34,7 +37,6 @@ button {
margin-top:8px; margin-top:8px;
} }
button { button {
display:inline-block;/*for ie*/
margin:0; margin:0;
} }
input[type=submit]:hover, input[type=submit]:hover,
@@ -215,6 +217,9 @@ p.path, p.access-notice { margin: 12px 0 6px 0; }
.narrow-panel h3 { .narrow-panel h3 {
margin-top:0; margin-top:0;
} }
.narrow-panel h2 {
margin-bottom:10px;
}
.narrow-panel input { .narrow-panel input {
width:24em; width:24em;
height:1.8em; height:1.8em;