diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-13 15:51:12 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-13 15:51:12 -0400 |
| commit | 3a0c59052ace6cdd1ac23e8f6b5c5ba8cb6fffcd (patch) | |
| tree | 9fa3dfae7195acb294bf867953a9a14b3ca80aff /theme | |
| parent | e9e75fc9d5f44b2ffe10602a3bd183cccb7da4ec (diff) | |
| parent | d4f9f2c69bb9cba7aa2ff67a2b75d106f1bd1607 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'theme')
| -rw-r--r-- | theme/base/css/display.css | 11 | ||||
| -rw-r--r-- | theme/default/css/display.css | 7 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 7 |
3 files changed, 13 insertions, 12 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 3b4a2a4b3..2fb1c007f 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; } @@ -607,7 +608,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; @@ -918,6 +921,10 @@ padding:0; } +#usergroups #new_group { +float: left; +margin-right: 2em; +} #new_group, #group_search { margin-bottom:18px; } @@ -1158,4 +1165,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..c5d694610 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -164,7 +164,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; } @@ -231,10 +232,6 @@ background-color:#fcfcfc; #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..c32b6269d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -164,7 +164,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; } @@ -231,10 +232,6 @@ background-color:#fcfcfc; #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 { |