summaryrefslogtreecommitdiff
path: root/theme/base
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-06-18 06:02:54 -0400
committerRobin Millette <millette@controlyourself.ca>2009-06-18 06:02:54 -0400
commitc442b400b985cb9e30bf036007bcffc96807d5a3 (patch)
treeaebb66931d6f15336df8bfcf05202b37ee4aff43 /theme/base
parent65b4cfbb54f5b44820dd02bb9c3c2ca98dbbd321 (diff)
parent87f54c1136fa4ddc476baad0adeaf1b4e7097cc5 (diff)
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'theme/base')
-rw-r--r--theme/base/css/display.css20
-rw-r--r--theme/base/css/ie.css6
2 files changed, 16 insertions, 10 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index dd787f5e2..daf5ada1c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -12,9 +12,9 @@ img { display:block; border:0; }
a abbr { cursor: pointer; border-bottom:0; }
table { border-collapse:collapse; }
ol { list-style-position:inside; }
-html { font-size: 87.5%; background-color:#fff; height:100%; }
+html { font-size: 87.5%; }
body {
-background-color:#fff;
+background-color:#FFFFFF;
color:#000;
font-family:sans-serif;
font-size:1em;
@@ -77,7 +77,8 @@ margin:0 0 18px 0;
form label {
font-weight:bold;
}
-input.checkbox {
+input.checkbox,
+input.radio {
position:relative;
top:2px;
left:0;
@@ -169,7 +170,8 @@ margin-bottom:0;
margin-bottom:11px;
}
-.form_settings input.checkbox {
+.form_settings input.checkbox,
+.form_settings input.radio {
margin-top:3px;
margin-left:0;
}
@@ -181,13 +183,19 @@ margin-left:11px;
float:left;
width:90%;
}
-
+.form_settings label.radio {
+margin-top:0;
+margin-right:47px;
+margin-left:11px;
+width:auto;
+}
#form_login p.form_guide,
#form_register #settings_rememberme p.form_guide,
#form_openid_login #settings_rememberme p.form_guide,
#settings_twitter_remove p.form_guide,
-#form_search ul.form_data #q {
+#form_search ul.form_data #q,
+#design_background-image_onoff p.form_guide {
margin-left:0;
}
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index d1b0558ec..da200388e 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -1,8 +1,6 @@
/* IE specific styles */
-legend {
-margin-left:-7px;
-}
-input.checkbox {
+input.checkbox,
+input.radio {
top:0;
}
#form_notice textarea {