summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-04-15 11:31:57 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-04-15 11:31:57 -0400
commit573d4cf0fbc8f4ef5fb07e291f4a2b3dc0636ef5 (patch)
treed856565bc3a64d678dfbebb43bed71e109884cec
parent7ba3f8aeb3277bec52eee896f0c6807c7121104c (diff)
parentb142c260108f43636b69adb90d5a27ffa44f0f74 (diff)
Merge branch 'nobase' into 0.7.x
-rw-r--r--lib/action.php4
-rw-r--r--theme/default/css/display.css10
-rw-r--r--theme/identica/css/display.css10
-rw-r--r--theme/iphone/display.css16
4 files changed, 11 insertions, 29 deletions
diff --git a/lib/action.php b/lib/action.php
index b9e8ee6c1..2ec9329e0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -195,10 +195,6 @@ class Action extends HTMLOutputter // lawsuit
if (Event::handle('StartShowLaconicaStyles', array($this))) {
$this->element('link', array('rel' => 'stylesheet',
'type' => 'text/css',
- 'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
- 'media' => 'screen, projection, tv'));
- $this->element('link', array('rel' => 'stylesheet',
- 'type' => 'text/css',
'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
'media' => 'screen, projection, tv'));
if (common_config('site', 'mobile')) {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index c5d694610..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%;
@@ -184,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;
@@ -228,7 +223,6 @@ background-color:#fcfcfc;
}
/*END: NOTICES */
-
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index c32b6269d..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%;
@@ -184,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;
@@ -228,7 +223,6 @@ background-color:#fcfcfc;
}
/*END: NOTICES */
-
#new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
}
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;