summaryrefslogtreecommitdiff
path: root/theme/base
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-05-01 00:16:25 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-05-01 00:16:25 +0000
commitd30df0790818d77b81ee8b271b9bd8ebe3063ee7 (patch)
treed3a9b32815252caabcf16f593fbf4e2080cff93f /theme/base
parentf798d1ea430d25c2f4a60179c65b39b1257a5340 (diff)
parentb79fef307481b36b4d04dbabb54e3f6d9edf6896 (diff)
Merge branch '0.7.x' into 0.8.x
Resolved Conflicts: lib/queuehandler.php lib/util.php theme/base/css/display.css
Diffstat (limited to 'theme/base')
-rw-r--r--theme/base/css/display.css30
1 files changed, 11 insertions, 19 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index a6fe8eb75..efa5f4ac6 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -86,7 +86,7 @@ border:0;
.error,
.success {
-padding:4px 7px;
+padding:4px 1.55%;
border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
@@ -426,6 +426,7 @@ line-height:1;
#form_notice fieldset {
border:0;
padding:0;
+position:relative;
}
#form_notice legend {
display:none;
@@ -480,7 +481,13 @@ margin-bottom:7px;
margin-left:18px;
float:left;
}
-
+#form_notice .error {
+float:left;
+clear:both;
+width:96.9%;
+margin-bottom:0;
+line-height:1.618;
+}
/* entity_profile */
.entity_profile {
@@ -835,23 +842,6 @@ text-transform:lowercase;
}
-
-.notice-data {
-position:absolute;
-top:18px;
-right:0;
-min-height:50px;
-margin-bottom:4px;
-}
-.notice .entry-content .notice-data dt {
-display:none;
-}
-
-.notice-data a {
-display:block;
-outline:none;
-}
-
.notice-options {
padding-left:2%;
float:left;
@@ -1029,6 +1019,8 @@ padding-right:30px;
.hentry .entry-content p {
margin-bottom:18px;
}
+.system_notice ul,
+.instructions ul,
.hentry entry-content ol,
.hentry .entry-content ul {
list-style-position:inside;