summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Millette <millette@plantard.controlezvous.ca>2009-01-23 04:03:11 +0000
committerRobin Millette <millette@plantard.controlezvous.ca>2009-01-23 04:03:11 +0000
commit11b99b8144b46b49c895d0105697ccce38a6811e (patch)
tree9691bd23ebf7c813e4d66f7600b58e6e374e26bb
parent1e1a24d8c11479da877e130dd6bf1a9ffc0a4aba (diff)
parent8b7c71ac249a4d29f126c7dea556d4eaf465a928 (diff)
Merge branch 'master' of /var/www/trunk
-rw-r--r--actions/groups.php4
-rw-r--r--actions/public.php2
-rw-r--r--actions/showstream.php2
-rw-r--r--theme/base/css/display.css23
-rw-r--r--theme/base/css/initial_states.css1
-rw-r--r--theme/identica/css/display.css13
6 files changed, 39 insertions, 6 deletions
diff --git a/actions/groups.php b/actions/groups.php
index 6faa497fc..261f9b3aa 100644
--- a/actions/groups.php
+++ b/actions/groups.php
@@ -95,9 +95,11 @@ class GroupsAction extends Action
function showContent()
{
+ $this->elementStart('p', array('id' => 'new_group'));
$this->element('a', array('href' => common_local_url('newgroup'),
- 'id' => 'new_group'),
+ 'class' => 'more'),
_('Create a new group'));
+ $this->elementEnd('p');
$offset = ($this->page-1) * GROUPS_PER_PAGE;
$limit = GROUPS_PER_PAGE + 1;
diff --git a/actions/public.php b/actions/public.php
index 396b60e83..f5380589a 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -215,7 +215,7 @@ class PublicAction extends Action
$m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
'[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
- $this->elementStart('div', 'anonymous');
+ $this->elementStart('div', array('id' => 'anon_notice'));
$this->raw(common_markup_to_html($m));
$this->elementEnd('div');
}
diff --git a/actions/showstream.php b/actions/showstream.php
index 3005cdd88..157ccdd0c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -538,7 +538,7 @@ class ShowstreamAction extends Action
'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
'[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'),
$this->user->nickname, $this->user->nickname);
- $this->elementStart('div', 'anonymous');
+ $this->elementStart('div', array('id' => 'anon_notice'));
$this->raw(common_markup_to_html($m));
$this->elementEnd('div');
}
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5cafd8c1f..ba1cc06f5 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -234,6 +234,22 @@ clear:both;
margin-bottom:18px;
}
+
+#anon_notice {
+float:left;
+width:432px;
+padding:11px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+border-width:2px;
+border-style:solid;
+line-height:1.5;
+font-size:1.1em;
+font-weight:bold;
+}
+
+
#footer {
float:left;
width:64%;
@@ -378,7 +394,6 @@ border-radius:7px;
/*Start: FORM NOTICE*/
#form_notice {
-width:384px;
width:458px;
float:left;
position:relative;
@@ -395,7 +410,6 @@ display:none;
border-radius:7px;
-moz-border-radius:7px;
-webkit-border-radius:7px;
-width:377px;
width:370px;
height:67px;
line-height:1.5;
@@ -1088,6 +1102,11 @@ border-top:0;
.tag-cloud {
list-style-type:none;
}
+
+.aside .tag-cloud {
+font-size:0.8em;
+}
+
.tag-cloud li {
display:inline;
margin-right:7px;
diff --git a/theme/base/css/initial_states.css b/theme/base/css/initial_states.css
deleted file mode 100644
index 8b1378917..000000000
--- a/theme/base/css/initial_states.css
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 62086d74e..5088d7ac7 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -119,6 +119,19 @@ background-color:#F7E8E8;
background-color:#EFF3DC;
}
+
+#anon_notice {
+background-color:#97BFD1;
+color:#fff;
+}
+
+#showstream #anon_notice {
+background-color:#A9BF4F;
+}
+
+
+
+
#export_data li a {
background-repeat:no-repeat;
background-position:0 45%;