summaryrefslogtreecommitdiff
path: root/theme
diff options
context:
space:
mode:
Diffstat (limited to 'theme')
-rw-r--r--theme/base/css/display.css55
-rw-r--r--theme/default/css/display.css17
-rw-r--r--theme/identica/css/display.css17
-rw-r--r--theme/iphone/display.css16
4 files changed, 42 insertions, 63 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3b4a2a4b3..8029a5eee 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -29,6 +29,7 @@ h1 {
font-size:1.4em;
margin-bottom:18px;
}
+#showstream h1 { display:none; }
h2 { font-size:1.3em; }
h3 { font-size:1.2em; }
h4 { font-size:1.1em; }
@@ -85,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;
@@ -425,6 +426,7 @@ line-height:1;
#form_notice fieldset {
border:0;
padding:0;
+position:relative;
}
#form_notice legend {
display:none;
@@ -479,12 +481,18 @@ 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 {
position:relative;
-width:67.702%;
+width:74.702%;
min-height:123px;
float:left;
margin-bottom:18px;
@@ -520,12 +528,15 @@ margin-bottom:4px;
.entity_profile .entity_nickname {
margin-left:11px;
display:inline;
-font-weight:bold;
}
.entity_profile .entity_nickname {
margin-left:0;
}
-
+.entity_profile .fn,
+.entity_profile .nickname {
+font-size:1.1em;
+font-weight:bold;
+}
.entity_profile .entity_fn dd:before {
content: "(";
font-weight:normal;
@@ -547,7 +558,7 @@ display:none;
/*entity_actions*/
.entity_actions {
float:right;
-margin-left:4.35%;
+margin-left:2.35%;
max-width:25%;
}
.entity_actions h2 {
@@ -607,7 +618,9 @@ border-radius:4px;
-moz-border-radius:4px;
-webkit-border-radius:4px;
}
-
+.entity_actions .accept {
+margin-bottom:18px;
+}
.entity_tags ul {
list-style-type:none;
@@ -832,23 +845,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;
@@ -918,6 +914,10 @@ padding:0;
}
+#usergroups #new_group {
+float: left;
+margin-right: 2em;
+}
#new_group, #group_search {
margin-bottom:18px;
}
@@ -1022,6 +1022,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;
@@ -1146,9 +1148,6 @@ clear:both;
margin-bottom:0;
}
-.instructions ul {
-list-style-position:inside;
-}
.instructions p,
.instructions ul {
margin-bottom:18px;
@@ -1158,4 +1157,4 @@ display:none;
}
.guide {
clear:both;
-} \ No newline at end of file
+}
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 42e29374f..69a600cc2 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -7,6 +7,8 @@
* @link http://laconi.ca/
*/
+@import url(../../base/css/display.css);
+
html,
body,
a:active {
@@ -70,7 +72,6 @@ border-top-color:#D1D9E4;
border-top-color:#97BFD1;
}
-
#content .notice p.entry-content a:visited {
background-color:#fcfcfc;
}
@@ -82,7 +83,6 @@ background-color:#fcfffc;
background-color:#CEE1E9;
}
-
#notice_text-count {
color:#333;
}
@@ -112,7 +112,6 @@ background-color:rgba(255, 255, 255, 0.2);
background-color:rgba(255, 255, 255, 0.7);
}
-
.error {
background-color:#F7E8E8;
}
@@ -120,7 +119,6 @@ background-color:#F7E8E8;
background-color:#EFF3DC;
}
-
#anon_notice {
background-color:#97BFD1;
color:#fff;
@@ -131,7 +129,6 @@ border-color:#fff;
background-color:#A9BF4F;
}
-
#export_data li a {
background-repeat:no-repeat;
background-position:0 45%;
@@ -164,7 +161,8 @@ background-color:#A9BF4F;
color:#fff;
}
.form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
background-color:#97BFD1;
}
@@ -183,8 +181,6 @@ background-image:url(../images/icons/twotone/green/mail.gif);
background-image:url(../images/icons/twotone/green/shield.gif);
}
-
-
/* NOTICES */
.notices li.over {
background-color:#fcfcfc;
@@ -227,14 +223,9 @@ background-color:#fcfcfc;
}
/*END: NOTICES */
-
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8edb005a6..d05578d43 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,6 +7,8 @@
* @link http://laconi.ca/
*/
+@import url(../../base/css/display.css);
+
html,
body,
a:active {
@@ -70,7 +72,6 @@ border-top-color:#CEE1E9;
border-top-color:#87B4C8;
}
-
#content .notice p.entry-content a:visited {
background-color:#fcfcfc;
}
@@ -82,7 +83,6 @@ background-color:#fcfffc;
background-color:#CEE1E9;
}
-
#notice_text-count {
color:#333;
}
@@ -112,7 +112,6 @@ background-color:rgba(135, 180, 200, 0.3);
background-color:rgba(255, 255, 255, 0.7);
}
-
.error {
background-color:#F7E8E8;
}
@@ -120,7 +119,6 @@ background-color:#F7E8E8;
background-color:#EFF3DC;
}
-
#anon_notice {
background-color:#87B4C8;
color:#fff;
@@ -131,7 +129,6 @@ border-color:#fff;
background-color:#9BB43E;
}
-
#export_data li a {
background-repeat:no-repeat;
background-position:0 45%;
@@ -164,7 +161,8 @@ background-color:#9BB43E;
color:#fff;
}
.form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
background-color:#87B4C8;
}
@@ -183,8 +181,6 @@ background-image:url(../images/icons/twotone/green/mail.gif);
background-image:url(../images/icons/twotone/green/shield.gif);
}
-
-
/* NOTICES */
.notices li.over {
background-color:#fcfcfc;
@@ -227,14 +223,9 @@ background-color:#fcfcfc;
}
/*END: NOTICES */
-
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
-#usergroups #new_group {
-float: left;
-margin-right: 2em;
-}
.pagination .nav_prev a,
.pagination .nav_next a {
diff --git a/theme/iphone/display.css b/theme/iphone/display.css
index 6ac471c1e..1838a8e86 100644
--- a/theme/iphone/display.css
+++ b/theme/iphone/display.css
@@ -2,6 +2,8 @@
/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
/* Simplified for mobile by Ken Sheppardson http://identi.ca/kshep */
+@import url(../../base/css/display.css);
+
html {}
body {
width: 100%;
@@ -28,7 +30,6 @@ h1 {
font-size: 1.2em;
}
-
#wrap {
margin: 0;
}
@@ -196,7 +197,7 @@ p#branding a {
}
.instructions a:hover, .success a:hover, .error a:hover {
color: #FCFFF5;
-}
+}
.success {
clear: both;
float: left;
@@ -210,7 +211,6 @@ p#branding a {
background-color: #ce3728;
}
-
/* ----- Stream -----*/
#notices {
@@ -273,7 +273,7 @@ p.time {
p.time a {
color: #91AA9D;
}
-
+
/* ----- Profile -----*/
#profile {
clear: both;
@@ -356,7 +356,7 @@ dl.statistics {
clear: left;
float: left;
width: 200px;
-}
+}
.statistics dd {
float: left;
}
@@ -402,8 +402,6 @@ ul.subscriptions li, ul.subscribers li {
}
/* ----- End Subscriptions & Subscribers -----*/
-
-
#pagination {
margin: 18px auto;
}
@@ -488,7 +486,7 @@ input#submit:hover, input.submit:hover {
input.checkbox {
width: auto;
border: 0;
-}
+}
textarea, input {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 1em;
@@ -629,7 +627,7 @@ input#openid_url {
#profiles a:hover {
text-decoration: underline;
}
-
+
.profile_single {
clear: both;
display: block;