diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-03 15:12:55 -0500 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-03 15:12:55 -0500 |
commit | 0356953cf853bf3bc9eda66f88b5ef4718683337 (patch) | |
tree | e23794c60c2d0ca28fc63fcc52cdb8a532fa1719 /theme | |
parent | 22c806a15a957c300cb047cb42e8f5c49d47afa9 (diff) | |
parent | 0f2c43bd040437b3e40c706d7c3f4ba163e94a71 (diff) |
Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x
Diffstat (limited to 'theme')
-rw-r--r-- | theme/base/css/display.css | 31 | ||||
-rw-r--r-- | theme/base/images/icons/icon_atom.jpg | bin | 1117 -> 0 bytes | |||
-rw-r--r-- | theme/base/images/icons/icon_atom.png | bin | 0 -> 820 bytes | |||
-rw-r--r-- | theme/base/images/icons/icon_rss.jpg | bin | 1166 -> 0 bytes | |||
-rw-r--r-- | theme/base/images/icons/icon_rss.png | bin | 0 -> 777 bytes | |||
-rw-r--r-- | theme/default/css/display.css | 52 | ||||
-rw-r--r-- | theme/default/css/ie.css | 9 | ||||
-rw-r--r-- | theme/identica/css/display.css | 47 |
8 files changed, 42 insertions, 97 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 809c1ba6f..242818c9a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -20,8 +20,6 @@ font-family:sans-serif; font-size:1em; line-height:1.65; position:relative; -margin:0 auto; -width:71.714em; } h1,h2,h3,h4,h5,h6 { text-transform:uppercase; @@ -240,10 +238,9 @@ display:none; #site_notice { position:absolute; -right:0; -top:49px; -float:right; -width:300px; +top:65px; +right:18px; +width:250px; } #page_notice { clear:both; @@ -254,6 +251,7 @@ margin-bottom:18px; #anon_notice { float:left; width:432px; +width:28.052em; padding:11px; border-radius:7px; -moz-border-radius:7px; @@ -361,9 +359,10 @@ margin-right:4px; } #wrap { -float:left; margin:0 auto; width:71.714em; +width:1003px; +overflow:hidden; } #core { @@ -391,9 +390,9 @@ float:left; } #aside_primary { -width:284px; +width:280px; float:left; -margin-left:2px; +margin-left:4px; padding:18px; border-radius:7px; -moz-border-radius:7px; @@ -606,12 +605,14 @@ display:block; .form_user_block input.submit, .form_user_unblock input.submit, .entity_send-a-message a, +.entity_edit a, .form_user_nudge input.submit, .entity_nudge p { border:0; padding-left:20px; } +.entity_edit a, .entity_send-a-message a, .entity_nudge p { padding:4px 4px 4px 23px; @@ -749,7 +750,7 @@ border-radius:4px; /* NOTICES */ #notices_primary { float:left; -width:644px; +width:100%; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; @@ -1063,13 +1064,16 @@ margin-bottom:0; } .section .notice { -padding-top:11px; -padding-bottom:11px; +padding-top:7px; +padding-bottom:7px; +border-top:0; } .section .notice:first-child { padding-top:0; -border-top:0; +} +.section .notice .fn { +display:none; } @@ -1154,3 +1158,4 @@ clear:both; #form_settings_avatar .form_actions { margin-bottom:0; } + diff --git a/theme/base/images/icons/icon_atom.jpg b/theme/base/images/icons/icon_atom.jpg Binary files differdeleted file mode 100644 index 22853edc4..000000000 --- a/theme/base/images/icons/icon_atom.jpg +++ /dev/null diff --git a/theme/base/images/icons/icon_atom.png b/theme/base/images/icons/icon_atom.png Binary files differnew file mode 100644 index 000000000..6a001f11a --- /dev/null +++ b/theme/base/images/icons/icon_atom.png diff --git a/theme/base/images/icons/icon_rss.jpg b/theme/base/images/icons/icon_rss.jpg Binary files differdeleted file mode 100644 index da23422d0..000000000 --- a/theme/base/images/icons/icon_rss.jpg +++ /dev/null diff --git a/theme/base/images/icons/icon_rss.png b/theme/base/images/icons/icon_rss.png Binary files differnew file mode 100644 index 000000000..0ccd1ce25 --- /dev/null +++ b/theme/base/images/icons/icon_rss.png diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 97a6a12a8..da1ba6717 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -67,7 +67,6 @@ color:#002E6E; .profile { border-top-color:#D1D9E4; } -.section .notice, .section .profile { border-top-color:#97BFD1; } @@ -92,12 +91,6 @@ color:#333; color:#000; } -#form_notice #notice_data-attach_view { -background-image:url(../images/icons/twotone/green/paper-clip.gif); -background-repeat:no-repeat; -background-position:0 45%; -background-color:transparent; -} #nav_register a { text-decoration:none; @@ -123,8 +116,6 @@ background-color:rgba(255, 255, 255, 0.7); } - - #page_notice .error { background-color:#F7E8E8; } @@ -144,26 +135,21 @@ background-color:#A9BF4F; } - - #export_data li a { background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../../base/images/icons/icon_rss.jpg); +background-image:url(../../base/images/icons/icon_rss.png); } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.jpg); +background-image:url(../../base/images/icons/icon_atom.png); } #export_data li a.foaf { background-image:url(../../base/images/icons/icon_foaf.gif); } -#export_data li a.export_vcard { -background-image:url(../../base/images/icons/icon_vcard.gif); -} - +.entity_edit a, .entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, @@ -185,6 +171,9 @@ color:#fff; background-color:#97BFD1; } +.entity_edit a { +background-image:url(../images/icons/twotone/green/edit.gif); +} .entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } @@ -204,30 +193,6 @@ background-image:url(../images/icons/twotone/green/shield.gif); background-color:#fcfcfc; } -.notice-data a span { -background-color:transparent; -background-repeat:no-repeat; -background-position:0 45%; -} -.notice_video .notice-data a span { -background-image:url(../images/icons/twotone/green/camera.gif); -} -.notice_audio .notice-data a span { -background-image:url(../images/icons/twotone/green/music.gif); -} -.notice_image .notice-data a span { -background-image:url(../images/icons/twotone/green/search.gif); -} -.notice_event .notice-data a span { -background-image:url(../images/icons/twotone/green/calendar.gif); -} -.notice_location .notice-data a span { -background-image:url(../images/icons/twotone/green/flag.gif); -} -.notice_document .notice-data a span { -background-image:url(../images/icons/twotone/green/document.gif); -} - .notice-options .notice_reply a, .notice-options form input.submit { background-color:transparent; @@ -274,12 +239,13 @@ background:transparent url(../images/icons/twotone/green/news.gif) no-repeat 0 4 .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; +border-color:#D1D9E4; } .pagination .nav_prev a { background-image:url(../images/icons/twotone/green/arrow-left.gif); -background-position:0 45%; +background-position:10% 45%; } .pagination .nav_next a { background-image:url(../images/icons/twotone/green/arrow-right.gif); -background-position:100% 45%; +background-position:90% 45%; } diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css new file mode 100644 index 000000000..2b06768ea --- /dev/null +++ b/theme/default/css/ie.css @@ -0,0 +1,9 @@ +/* IE specific styles */ + +.notice-options input.submit { +color:#fff; +} + +#site_nav_local_views a { +background-color:#ACCCDA; +} diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index beb5a2c13..6fcd730a9 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -67,7 +67,6 @@ color:#002E6E; .profile { border-top-color:#CEE1E9; } -.section .notice, .section .profile { border-top-color:#87B4C8; } @@ -92,12 +91,6 @@ color:#333; color:#000; } -#form_notice #notice_data-attach_view { -background-image:url(../images/icons/twotone/green/paper-clip.gif); -background-repeat:no-repeat; -background-position:0 45%; -background-color:transparent; -} #nav_register a { text-decoration:none; @@ -123,8 +116,6 @@ background-color:rgba(255, 255, 255, 0.7); } - - #page_notice .error { background-color:#F7E8E8; } @@ -144,26 +135,21 @@ background-color:#9BB43E; } - - #export_data li a { background-repeat:no-repeat; background-position:0 45%; } #export_data li a.rss { -background-image:url(../../base/images/icons/icon_rss.jpg); +background-image:url(../../base/images/icons/icon_rss.png); } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.jpg); +background-image:url(../../base/images/icons/icon_atom.png); } #export_data li a.foaf { background-image:url(../../base/images/icons/icon_foaf.gif); } -#export_data li a.export_vcard { -background-image:url(../../base/images/icons/icon_vcard.gif); -} - +.entity_edit a, .entity_send-a-message a, .form_user_nudge input.submit, .form_user_block input.submit, @@ -185,6 +171,9 @@ color:#fff; background-color:#87B4C8; } +.entity_edit a { +background-image:url(../images/icons/twotone/green/edit.gif); +} .entity_send-a-message a { background-image:url(../images/icons/twotone/green/quote.gif); } @@ -204,30 +193,6 @@ background-image:url(../images/icons/twotone/green/shield.gif); background-color:#fcfcfc; } -.notice-data a span { -background-color:transparent; -background-repeat:no-repeat; -background-position:0 45%; -} -.notice_video .notice-data a span { -background-image:url(../images/icons/twotone/green/camera.gif); -} -.notice_audio .notice-data a span { -background-image:url(../images/icons/twotone/green/music.gif); -} -.notice_image .notice-data a span { -background-image:url(../images/icons/twotone/green/search.gif); -} -.notice_event .notice-data a span { -background-image:url(../images/icons/twotone/green/calendar.gif); -} -.notice_location .notice-data a span { -background-image:url(../images/icons/twotone/green/flag.gif); -} -.notice_document .notice-data a span { -background-image:url(../images/icons/twotone/green/document.gif); -} - .notice-options .notice_reply a, .notice-options form input.submit { background-color:transparent; |