wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nobase' into 0.7.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-04-15 11:31:57 -04:00
commit 573d4cf0fb
4 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/action.php
View File

@ -193,10 +193,6 @@ class Action extends HTMLOutputter // lawsuit
{ {
if (Event::handle('StartShowStyles', array($this))) { if (Event::handle('StartShowStyles', array($this))) {
if (Event::handle('StartShowLaconicaStyles', array($this))) { 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', $this->element('link', array('rel' => 'stylesheet',
'type' => 'text/css', 'type' => 'text/css',
'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION, 'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,

10
theme/default/css/display.css
View File

@ -7,6 +7,8 @@
* @link http://laconi.ca/ * @link http://laconi.ca/
*/ */
@import url(../../base/css/display.css);
html, html,
body, body,
a:active { a:active {
@ -70,7 +72,6 @@ border-top-color:#D1D9E4;
border-top-color:#97BFD1; border-top-color:#97BFD1;
} }
#content .notice p.entry-content a:visited { #content .notice p.entry-content a:visited {
background-color:#fcfcfc; background-color:#fcfcfc;
} }
@ -82,7 +83,6 @@ background-color:#fcfffc;
background-color:#CEE1E9; background-color:#CEE1E9;
} }
#notice_text-count { #notice_text-count {
color:#333; color:#333;
} }
@ -112,7 +112,6 @@ background-color:rgba(255, 255, 255, 0.2);
background-color:rgba(255, 255, 255, 0.7); background-color:rgba(255, 255, 255, 0.7);
} }
.error { .error {
background-color:#F7E8E8; background-color:#F7E8E8;
} }
@ -120,7 +119,6 @@ background-color:#F7E8E8;
background-color:#EFF3DC; background-color:#EFF3DC;
} }
#anon_notice { #anon_notice {
background-color:#97BFD1; background-color:#97BFD1;
color:#fff; color:#fff;
@ -131,7 +129,6 @@ border-color:#fff;
background-color:#A9BF4F; background-color:#A9BF4F;
} }
#export_data li a { #export_data li a {
background-repeat:no-repeat; background-repeat:no-repeat;
background-position:0 45%; 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); background-image:url(../images/icons/twotone/green/shield.gif);
} }
/* NOTICES */ /* NOTICES */
.notices li.over { .notices li.over {
background-color:#fcfcfc; background-color:#fcfcfc;
@ -228,7 +223,6 @@ background-color:#fcfcfc;
} }
/*END: NOTICES */ /*END: NOTICES */
#new_group a { #new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
} }

10
theme/identica/css/display.css
View File

@ -7,6 +7,8 @@
* @link http://laconi.ca/ * @link http://laconi.ca/
*/ */
@import url(../../base/css/display.css);
html, html,
body, body,
a:active { a:active {
@ -70,7 +72,6 @@ border-top-color:#CEE1E9;
border-top-color:#87B4C8; border-top-color:#87B4C8;
} }
#content .notice p.entry-content a:visited { #content .notice p.entry-content a:visited {
background-color:#fcfcfc; background-color:#fcfcfc;
} }
@ -82,7 +83,6 @@ background-color:#fcfffc;
background-color:#CEE1E9; background-color:#CEE1E9;
} }
#notice_text-count { #notice_text-count {
color:#333; color:#333;
} }
@ -112,7 +112,6 @@ background-color:rgba(135, 180, 200, 0.3);
background-color:rgba(255, 255, 255, 0.7); background-color:rgba(255, 255, 255, 0.7);
} }
.error { .error {
background-color:#F7E8E8; background-color:#F7E8E8;
} }
@ -120,7 +119,6 @@ background-color:#F7E8E8;
background-color:#EFF3DC; background-color:#EFF3DC;
} }
#anon_notice { #anon_notice {
background-color:#87B4C8; background-color:#87B4C8;
color:#fff; color:#fff;
@ -131,7 +129,6 @@ border-color:#fff;
background-color:#9BB43E; background-color:#9BB43E;
} }
#export_data li a { #export_data li a {
background-repeat:no-repeat; background-repeat:no-repeat;
background-position:0 45%; 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); background-image:url(../images/icons/twotone/green/shield.gif);
} }
/* NOTICES */ /* NOTICES */
.notices li.over { .notices li.over {
background-color:#fcfcfc; background-color:#fcfcfc;
@ -228,7 +223,6 @@ background-color:#fcfcfc;
} }
/*END: NOTICES */ /*END: NOTICES */
#new_group a { #new_group a {
background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%; background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 45%;
} }

6
theme/iphone/display.css
View File

@ -2,6 +2,8 @@
/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */ /* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */
/* Simplified for mobile by Ken Sheppardson http://identi.ca/kshep */ /* Simplified for mobile by Ken Sheppardson http://identi.ca/kshep */
@import url(../../base/css/display.css);
html {} html {}
body { body {
width: 100%; width: 100%;
@ -28,7 +30,6 @@ h1 {
font-size: 1.2em; font-size: 1.2em;
} }
#wrap { #wrap {
margin: 0; margin: 0;
} }
@ -210,7 +211,6 @@ p#branding a {
background-color: #ce3728; background-color: #ce3728;
} }
/* ----- Stream -----*/ /* ----- Stream -----*/
#notices { #notices {
@ -402,8 +402,6 @@ ul.subscriptions li, ul.subscribers li {
} }
/* ----- End Subscriptions & Subscribers -----*/ /* ----- End Subscriptions & Subscribers -----*/
#pagination { #pagination {
margin: 18px auto; margin: 18px auto;
} }