summaryrefslogtreecommitdiff
path: root/theme/otalk
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-05-13 14:30:03 -0400
committerRobin Millette <millette@controlyourself.ca>2009-05-13 14:30:03 -0400
commit2e394ef47ce2f069e331c24586cda13bc34413aa (patch)
treed522c115bbd97f4dc8421138426294e6559307b8 /theme/otalk
parent3b7ee5a5f9a2cd3066aff8a7a12d09878be3b06c (diff)
parentd8e49a21745bfde9a18a6d6e1047decc3c7e356f (diff)
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into links
Diffstat (limited to 'theme/otalk')
-rw-r--r--theme/otalk/css/base.css16
-rw-r--r--theme/otalk/css/display.css1
2 files changed, 10 insertions, 7 deletions
diff --git a/theme/otalk/css/base.css b/theme/otalk/css/base.css
index 379590d30..32e8891d2 100644
--- a/theme/otalk/css/base.css
+++ b/theme/otalk/css/base.css
@@ -12,7 +12,7 @@ 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%; background-color:#fff; }
body {
background-color:#fff;
color:#000;
@@ -386,12 +386,12 @@ margin-bottom:1em;
}
#content {
-width:100%;
+width:67.9%;
min-height:259px;
padding-top:1.795%;
padding-bottom:1.795%;
-
float:left;
+clear:left;
border-radius:7px;
-moz-border-radius:7px;
-moz-border-radius-topleft:0;
@@ -409,11 +409,11 @@ float:left;
}
#aside_primary {
-width:96.3%;
+width:27.917%;
min-height:259px;
float:left;
-clear:both;
padding:1.795%;
+margin-left:0.385%;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
@@ -730,7 +730,7 @@ list-style-type:none;
}
#content .notice {
-width:25%;
+width:37%;
margin-left:17px;
margin-bottom:47px;
clear:none;
@@ -743,6 +743,10 @@ min-height:235px;
margin-bottom:18px;
}
+#shownotice #content .notice {
+width:96%;
+}
+
/* NOTICES */
#notices_primary {
diff --git a/theme/otalk/css/display.css b/theme/otalk/css/display.css
index 22e0530ec..6c646791b 100644
--- a/theme/otalk/css/display.css
+++ b/theme/otalk/css/display.css
@@ -15,7 +15,6 @@ html {
html,
body,
a:active {
-/*background-color:#F0F2F5;*/
}
body {
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;