diff options
author | Brenda Wallace <shiny@cpan.org> | 2009-12-28 01:57:51 +0000 |
---|---|---|
committer | Brenda Wallace <shiny@cpan.org> | 2009-12-28 01:57:51 +0000 |
commit | f4459dfedcdea2f2a6078bedf9530deb45b6d52c (patch) | |
tree | 942db6159710f5dd17e0c43a5659e1eec027a9e6 /theme | |
parent | 9d3829df9d29581c1d0281e57fda8ba4452ce2c2 (diff) | |
parent | ce8c69a49fc6668a19886ebc354ea5bef808d12a (diff) |
Merge commit 'origin/0.9.x' into 0.9.x
Diffstat (limited to 'theme')
-rw-r--r-- | theme/base/css/display.css | 79 | ||||
-rw-r--r-- | theme/base/images/icons/icons-01.gif | bin | 3097 -> 3201 bytes | |||
-rw-r--r-- | theme/base/images/icons/twotone/green/recycle-02.gif | bin | 0 -> 77 bytes | |||
-rw-r--r-- | theme/base/images/icons/twotone/green/recycle.gif | bin | 0 -> 87 bytes | |||
-rw-r--r-- | theme/default/css/display.css | 16 | ||||
-rw-r--r-- | theme/identica/css/display.css | 16 |
6 files changed, 100 insertions, 11 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 7446a42cd..29c7ee963 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -259,6 +259,17 @@ font-weight:bold; address img + .fn { display:none; } +address a { +text-decoration:none; +} +address .poweredby { +float:left; +clear:left; +display:block; +position:relative; +top:7px; +margin-right:-47px; +} #header { width:100%; @@ -964,12 +975,12 @@ float:left; font-size:0.95em; margin-left:59px; min-width:60%; -max-width:74%; +max-width:70%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { margin-left:0; -max-width:82%; +max-width:79%; } .notice .notice-options a, @@ -982,31 +993,77 @@ font-size:1.025em; display:inline-block; } +.entry-content .repeat { +display:block; +} +.entry-content .repeat .photo { +float:none; +margin-right:1px; +position:relative; +top:4px; +left:0; +} + +.dialogbox { +position:absolute; +top:-4px; +right:29px; +z-index:9; +min-width:199px; +float:none; +background-color:#FFF; +padding:11px; +border-radius:7px; +-moz-border-radius:7px; +-webkit-border-radius:7px; +border-style:solid; +border-width:1px; +border-color:#DDDDDD; +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} + +.dialogbox legend { +display:block !important; +margin-right:18px; +} + +.dialogbox button.close { +position:absolute; +right:3px; +top:3px; +} + +.dialogbox .submit_dialogbox { +text-indent:0; +font-weight:bold; +} + .notice-options { position:relative; font-size:0.95em; -width:90px; +width:113px; float:right; +margin-right:4px; } .notice-options a { float:left; } -.notice-options .notice_delete, .notice-options .notice_reply, .notice-options .form_repeat, .notice-options .form_favor, -.notice-options .form_disfavor { +.notice-options .form_disfavor, +.notice-options .repeated { float:left; -margin-left:20%; +margin-left:14.2%; } -.notice-options .form_repeat, .notice-options .form_favor, .notice-options .form_disfavor { margin-left:0; } .notice-options input, -.notice-options a { +.notice-options a, +.notice-options .repeated { text-indent:-9999px; outline:none; } @@ -1018,6 +1075,9 @@ border:0; .notice-options .notice_delete { text-decoration:none; } +.notice .notice-options .notice_delete { +float:right; +} .notice-options form input.submit { width:16px; height:16px; @@ -1037,7 +1097,8 @@ display:none; border:0; padding:0; } -.notice-options a { +.notice-options a, +.notice-options .repeated { width:16px; height:16px; } diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif Binary files differindex e910c86c0..417327881 100644 --- a/theme/base/images/icons/icons-01.gif +++ b/theme/base/images/icons/icons-01.gif diff --git a/theme/base/images/icons/twotone/green/recycle-02.gif b/theme/base/images/icons/twotone/green/recycle-02.gif Binary files differnew file mode 100644 index 000000000..060a8c72f --- /dev/null +++ b/theme/base/images/icons/twotone/green/recycle-02.gif diff --git a/theme/base/images/icons/twotone/green/recycle.gif b/theme/base/images/icons/twotone/green/recycle.gif Binary files differnew file mode 100644 index 000000000..1fab5dcc7 --- /dev/null +++ b/theme/base/images/icons/twotone/green/recycle.gif diff --git a/theme/default/css/display.css b/theme/default/css/display.css index d4fcb2343..50209bfd3 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -88,6 +88,7 @@ color:#FFFFFF; border-color:transparent; text-shadow:none; } +.dialogbox .submit_dialogbox, input.submit, .form_notice input.submit { background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; @@ -97,9 +98,11 @@ border-color:#AAAAAA; border-top-color:#CCCCCC; border-left-color:#CCCCCC; } +.dialogbox .submit_dialogbox:hover, input.submit:hover { background-position:0 -5px; } +.dialogbox .submit_dialogbox:focus, input.submit:focus { background-position:0 -15px; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); @@ -160,6 +163,7 @@ opacity:0; .notice-options form.form_favor input.submit, .notice-options form.form_disfavor input.submit, .notice-options .notice_delete, +.notice-options form.form_repeat input.submit, #new_group a, .pagination .nav_prev a, .pagination .nav_next a, @@ -172,7 +176,8 @@ button.close, .entity_moderation p, .entity_sandbox input.submit, .entity_silence input.submit, -.entity_delete input.submit { +.entity_delete input.submit, +.notice-options .repeated { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -334,6 +339,12 @@ background-position:0 -526px; .notice-options .notice_delete { background-position:0 -658px; } +.notice-options form.form_repeat input.submit { +background-position:0 -1582px; +} +.notice-options .repeated { +background-position:0 -1648px; +} .notices div.entry-content, .notices div.notice-options { @@ -343,6 +354,9 @@ opacity:0.4; .notices li:hover div.notice-options { opacity:1; } +.opaque { +opacity:1 !important; +} .notice-options a, .notice-options input { font-family:sans-serif; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 0e8fa6d79..e86ee2437 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -88,6 +88,7 @@ color:#FFFFFF; border-color:transparent; text-shadow:none; } +.dialogbox .submit_dialogbox, input.submit, .form_notice input.submit { background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x; @@ -97,9 +98,11 @@ border-color:#AAAAAA; border-top-color:#CCCCCC; border-left-color:#CCCCCC; } +.dialogbox .submit_dialogbox:hover, input.submit:hover { background-position:0 -5px; } +.dialogbox .submit_dialogbox:focus, input.submit:focus { background-position:0 -15px; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1); @@ -160,6 +163,7 @@ opacity:0; .notice-options form.form_favor input.submit, .notice-options form.form_disfavor input.submit, .notice-options .notice_delete, +.notice-options form.form_repeat input.submit, #new_group a, .pagination .nav_prev a, .pagination .nav_next a, @@ -172,7 +176,8 @@ button.close, .entity_moderation p, .entity_sandbox input.submit, .entity_silence input.submit, -.entity_delete input.submit { +.entity_delete input.submit, +.notice-options .repeated { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -333,6 +338,12 @@ background-position:0 -526px; .notice-options .notice_delete { background-position:0 -658px; } +.notice-options form.form_repeat input.submit { +background-position:0 -1582px; +} +.notice-options .repeated { +background-position:0 -1648px; +} .notices div.entry-content, .notices div.notice-options { @@ -342,6 +353,9 @@ opacity:0.4; .notices li:hover div.notice-options { opacity:1; } +.opaque { +opacity:1 !important; +} .notice-options a, .notice-options input { font-family:sans-serif; |