diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-06-17 18:49:25 -0700 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-06-17 18:49:25 -0700 |
commit | 6c7bdf9df67d02d26d3052e7fba5a80c482aacb8 (patch) | |
tree | 41bb18e5c8e3d873aefaf3a07bf9fd287f2aaeed /theme | |
parent | 85b4c24188502ce3f8cef32cfba37ab91c8a648f (diff) | |
parent | 00736bddd199b2a43820367c3476b9e9ec84c0db (diff) |
Merge branch 'userdesign' into 0.8.x
* userdesign: (56 commits)
Fix for background image repetition for various page heights
Removed height:100% for better background image repetition
A little more specific selector for notice reply
Have user favorites page show user's design
Placed a check to make sure there is a reply button in a notice before
Make MailboxAction read only
Remove stale reference to deprecated personal.php
Uppercase hex color values
Default to image being on, no tile after upload
Fix sidebar color bug default design
Update background image settings to use bitflags
It was accidently removed
Dynamically tile background image and turn background image on or off
Show a background img in settings form
IE7/8 CSS update for user design
Enable tiling of background imgs for Designs
Added background image tile flag to Design
Init styles for tile and image use on/off for user design settings
Added form option to tile background image and to turn it on and off
Add background dir
...
Diffstat (limited to 'theme')
-rw-r--r-- | theme/base/css/display.css | 20 | ||||
-rw-r--r-- | theme/base/css/ie.css | 6 | ||||
-rw-r--r-- | theme/default/css/display.css | 1 | ||||
-rw-r--r-- | theme/identica/css/display.css | 1 |
4 files changed, 16 insertions, 12 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 9e35d015d..e1b92edce 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%; height:100%; } 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 { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 935116a74..881e264da 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -9,7 +9,6 @@ @import url(../../base/css/display.css); -html, body, a:active { background-color:#C3D6DF; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 6845fda5f..ad57a0f0e 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -9,7 +9,6 @@ @import url(../../base/css/display.css); -html, body, a:active { background-color:#F0F2F5; |