diff options
author | Evan Prodromou <evan@status.net> | 2010-01-19 00:32:05 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-01-19 00:32:05 -0500 |
commit | dd0a99f58acbf779512cd4dd02be50abbf55773c (patch) | |
tree | 788ae859471bea7dc08093ba18d5243f0847e579 /theme | |
parent | 01dc77c2fd783f8b7ff796ca06013804971c8f5e (diff) | |
parent | 0ddfcc5521e023db7be52fe783800a39701ff94f (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'theme')
-rw-r--r-- | theme/base/css/display.css | 7 | ||||
-rw-r--r-- | theme/base/css/farbtastic.css | 32 |
2 files changed, 4 insertions, 35 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index a82d7b2a9..fbf3b6a5b 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -73,7 +73,7 @@ input.checkbox, input.radio { position:relative; top:2px; -left:0; +left:auto; border:0; } @@ -568,7 +568,8 @@ float:right; font-size:0.8em; } -.form_notice #notice_data-geo_wrap label { +.form_notice #notice_data-geo_wrap label, +.form_notice #notice_data-geo_wrap input { position:absolute; top:25px; right:4px; @@ -579,7 +580,7 @@ height:16px; display:block; } .form_notice #notice_data-geo_wrap input { -display:none; +visibility:hidden; } .form_notice #notice_data-geo_wrap label { font-weight:normal; diff --git a/theme/base/css/farbtastic.css b/theme/base/css/farbtastic.css deleted file mode 100644 index 7efcc73c3..000000000 --- a/theme/base/css/farbtastic.css +++ /dev/null @@ -1,32 +0,0 @@ -.farbtastic { - position: relative; -} -.farbtastic * { - position: absolute; - cursor: crosshair; -} -.farbtastic, .farbtastic .wheel { - width: 195px; - height: 195px; -} -.farbtastic .color, .farbtastic .overlay { - top: 47px; - left: 47px; - width: 101px; - height: 101px; -} -.farbtastic .wheel { - background: url(../../../js/farbtastic/wheel.png) no-repeat; - width: 195px; - height: 195px; -} -.farbtastic .overlay { - background: url(../../../js/farbtastic/mask.png) no-repeat; -} -.farbtastic .marker { - width: 17px; - height: 17px; - margin: -8px 0 0 -8px; - overflow: hidden; - background: url(../../../js/farbtastic/marker.png) no-repeat; -} |