diff options
Diffstat (limited to 'theme/base')
27 files changed, 369 insertions, 152 deletions
diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5ce5ac884..8bd0ae1c4 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -27,9 +27,9 @@ overflow:hidden; } h1 { font-size:1.4em; -line-height:1; margin-bottom:18px; } +#showstream h1 { display:none; } h2 { font-size:1.3em; } h3 { font-size:1.2em; } h4 { font-size:1.1em; } @@ -84,12 +84,13 @@ left:0; border:0; } -#page_notice .error, -#page_notice .success { -padding:4px 7px; +.error, +.success { +padding:4px 1.55%; border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; +margin-bottom:18px; } form label.submit { display:none; @@ -151,7 +152,9 @@ font-weight:bold; #form_openid_login legend, #form_search legend, #form_invite legend, -#form_notice_delete legend { +#form_notice_delete legend, +#form_password_recover legend, +#form_password_change legend { display:none; } @@ -215,6 +218,9 @@ margin-right:0; address .fn { font-weight:bold; } +address img + .fn { +display:none; +} #header { width:100%; @@ -242,10 +248,11 @@ display:none; } #site_notice { -position:absolute; -top:65px; -right:18px; -width:250px; +float:right; +clear:right; +margin-top:7px; +margin-right:18px; +width:24%; } #page_notice { clear:both; @@ -255,9 +262,8 @@ margin-bottom:18px; #anon_notice { float:left; -width:432px; -width:28.052em; -padding:11px; +width:43.2%; +padding:1.1%; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; @@ -298,7 +304,7 @@ padding:4px 11px; border-width:1px; border-style:solid; border-bottom:0; -text-shadow: 4px 4px 4px #ddd; +text-shadow: 2px 2px 2px #ddd; font-weight:bold; } #site_nav_local_views .nav { @@ -365,8 +371,9 @@ margin-right:4px; #wrap { margin:0 auto; -width:71.714em; -width:1003px; +width:100%; +min-width:760px; +max-width:1003px; overflow:hidden; } @@ -378,14 +385,20 @@ margin-bottom:1em; } #content { -width:644px; -padding:18px; +width:64.009%; +min-height:259px; +padding:1.795%; float:left; border-radius:7px; -moz-border-radius:7px; -moz-border-radius-topleft:0; -webkit-border-radius:7px; -webkit-border-top-left-radius:0; +border-style:solid; +border-width:1px; +} +#shownotice #content { +min-height:0; } #content_inner { @@ -395,10 +408,11 @@ float:left; } #aside_primary { -width:280px; +width:27.917%; +min-height:259px; float:left; -margin-left:4px; -padding:18px; +margin-left:0.385%; +padding:1.795%; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; @@ -406,9 +420,8 @@ border-width:1px; border-style:solid; } -/*Start: FORM NOTICE*/ #form_notice { -width:458px; +width:45.664%; float:left; position:relative; line-height:1; @@ -416,45 +429,36 @@ line-height:1; #form_notice fieldset { border:0; padding:0; +position:relative; } #form_notice legend { display:none; } #form_notice textarea { +float:left; border-radius:7px; -moz-border-radius:7px; -webkit-border-radius:7px; -width:370px; +width:80.789%; height:67px; line-height:1.5; padding:7px 7px 16px 7px; } #form_notice label { display:block; +float:left; font-size:1.3em; margin-bottom:7px; } -#form_notice .form_data li { -float:left; -} - -#form_notice #notice_attach_file label, #form_notice #notice_submit label { display:none; } - -#form_notice #notice_attachment { -margin-top:25px; -margin-left:4px; -} - #form_notice .form_note { position:absolute; top:99px; right:98px; z-index:9; } - #form_notice .form_note dt { font-weight:bold; display:none; @@ -464,51 +468,34 @@ font-weight:bold; line-height:1.15; padding:1px 2px; } - -#form_notice #notice_data-attach_view { -position:absolute; -top:25px; -right:30px; -margin-left:4px; +#form_notice #notice_action-submit { +width:14%; +height:47px; padding:0; -width:16px; -height:16px; -border:0; -text-indent:-9999px; -} -#form_notice .form_actions { position:absolute; bottom:0; right:0; } -#form_notice .form_actions input.submit { -width:60px; -padding:8px; -} - -#form_notice li { -margin-bottom:0; +#form_notice label[for=to] { +margin-top:7px; } - -#form_notice #notice_to { +#form_notice select[id=to] { margin-bottom:7px; -} - -#notice_to label { +margin-left:18px; float:left; -margin-right:18px; -margin-top:11px; } -#notice_to select { +#form_notice .error { float:left; +clear:both; +width:96.9%; +margin-bottom:0; +line-height:1.618; } -/*end FORM NOTICE*/ - /* entity_profile */ .entity_profile { position:relative; -width:475px; +width:74.702%; min-height:123px; float:left; margin-bottom:18px; @@ -538,19 +525,21 @@ margin-bottom:18px; .entity_profile .entity_tags { margin-left:113px; margin-bottom:4px; -width:322px; } .entity_profile .entity_fn, .entity_profile .entity_nickname { margin-left:11px; display:inline; -font-weight:bold; } .entity_profile .entity_nickname { margin-left:0; } - +.entity_profile .fn, +.entity_profile .nickname { +font-size:1.1em; +font-weight:bold; +} .entity_profile .entity_fn dd:before { content: "("; font-weight:normal; @@ -566,14 +555,14 @@ display:none; .entity_profile h2 { display:none; } - /* entity_profile */ /*entity_actions*/ .entity_actions { float:right; -margin-left:28px; +margin-left:2.35%; +max-width:25%; } .entity_actions h2 { display:none; @@ -632,7 +621,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; @@ -648,6 +639,7 @@ margin-bottom:29px; clear:both; float:left; width:100%; +list-style-position:inside; } .aside .section h2 { text-transform:uppercase; @@ -671,6 +663,7 @@ list-style-type:none; float:left; margin-right:7px; margin-bottom:7px; +display:inline; } .section .entities li .photo { margin-right:0; @@ -714,7 +707,7 @@ float:none; .profile .entity_profile .entity_note, .profile .entity_profile .entity_url, .profile .entity_profile .entity_tags, -.profile .entity_profile .form_subcription_edit { +.profile .entity_profile .form_subscription_edit { margin-left:59px; clear:none; display:block; @@ -726,7 +719,7 @@ margin-right:11px; } -.profile .entity_profile .form_subcription_edit label { +.profile .entity_profile .form_subscription_edit label { font-weight:normal; margin-right:11px; } @@ -742,7 +735,7 @@ clear:both; float:left; width:100%; border-top-width:1px; -border-top-style:dashed; +border-top-style:dotted; } .notices li { list-style-type:none; @@ -781,16 +774,14 @@ overflow:hidden; font-weight:bold; } -.notice .author .photo { -margin-bottom:0; -} - .vcard .photo { display:inline; margin-right:11px; -margin-bottom:11px; float:left; } +#shownotice .vcard .photo { +margin-bottom:4px; +} .vcard .url { text-decoration:none; } @@ -827,9 +818,10 @@ clear:left; float:left; font-size:0.95em; margin-left:59px; -width:70%; +width:65%; } -#showstream .notice div.entry-content { +#showstream .notice div.entry-content, +#shownotice .notice div.entry-content { margin-left:0; } @@ -857,23 +849,6 @@ text-transform:lowercase; } - -.notice-data { -position:absolute; -top:18px; -right:0; -min-height:50px; -margin-bottom:4px; -} -.notice .entry-content .notice-data dt { -display:none; -} - -.notice-data a { -display:block; -outline:none; -} - .notice-options { padding-left:2%; float:left; @@ -902,7 +877,7 @@ left:0; left:29px; } .notice-options .notice_delete { -left:76px; +right:0; } .notice-options .notice_reply dt { display:none; @@ -941,10 +916,12 @@ display:none; border:0; padding:0; } -/*END: NOTICES */ - +#usergroups #new_group { +float: left; +margin-right: 2em; +} #new_group, #group_search { margin-bottom:18px; } @@ -1049,6 +1026,8 @@ padding-right:30px; .hentry .entry-content p { margin-bottom:18px; } +.system_notice ul, +.instructions ul, .hentry entry-content ol, .hentry .entry-content ul { list-style-position:inside; @@ -1065,7 +1044,7 @@ margin-left:18px; /* TOP_POSTERS */ .section tbody td { -padding-right:11px; +padding-right:18px; padding-bottom:11px; } .section .vcard .photo { @@ -1173,4 +1152,36 @@ clear:both; margin-bottom:0; } +#form_settings_design #settings_design_color .form_data, +#form_settings_design #color-picker { +float:left; +} +#form_settings_design #settings_design_color .form_data { +width:400px; +margin-right:28px; +} +#settings_design_color .form_data li { +width:33%; +} +#settings_design_color .form_data label { +float:none; +} +#settings_design_color .form_data .swatch { +padding:11px; +margin-left:0; +} + +.instructions ul { +list-style-position:inside; +} +.instructions p, +.instructions ul { +margin-bottom:18px; +} +.help dt { +display:none; +} +.guide { +clear:both; +} diff --git a/theme/base/css/farbtastic.css b/theme/base/css/farbtastic.css new file mode 100644 index 000000000..7efcc73c3 --- /dev/null +++ b/theme/base/css/farbtastic.css @@ -0,0 +1,32 @@ +.farbtastic { + position: relative; +} +.farbtastic * { + position: absolute; + cursor: crosshair; +} +.farbtastic, .farbtastic .wheel { + width: 195px; + height: 195px; +} +.farbtastic .color, .farbtastic .overlay { + top: 47px; + left: 47px; + width: 101px; + height: 101px; +} +.farbtastic .wheel { + background: url(../../../js/farbtastic/wheel.png) no-repeat; + width: 195px; + height: 195px; +} +.farbtastic .overlay { + background: url(../../../js/farbtastic/mask.png) no-repeat; +} +.farbtastic .marker { + width: 17px; + height: 17px; + margin: -8px 0 0 -8px; + overflow: hidden; + background: url(../../../js/farbtastic/marker.png) no-repeat; +} diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 45176a201..5d8bea8ae 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -1,8 +1,21 @@ /* IE specific styles */ - -#aside_primary { -padding-left:11px; +legend { +margin-left:-7px; +} +input.checkbox { +top:0; +} +#form_notice textarea { +width:78%; +} +#form_notice #notice_action-submit { +width:17%; +max-width:17%; } +#anon_notice { +max-width:39%; +} + .notice-options input.submit { font-size:0; margin-top:3px; @@ -11,15 +24,9 @@ text-align:right; text-indent:0; width:24px; } - -input.checkbox { -top:0; -} - -legend { -margin-left:-7px; -} - .notice div.entry-content .timestamp a { margin-right:4px; } +.entity_profile { +width:64%; +} diff --git a/theme/base/css/ie6.css b/theme/base/css/ie6.css index 10b31cbcb..76a82c004 100644 --- a/theme/base/css/ie6.css +++ b/theme/base/css/ie6.css @@ -1,4 +1,17 @@ /* IE6 specific styles */ +address { +margin-left:7px; +} +address .fn { +display:none; +} +#content { +width:70%; +} +#aside_primary { +padding:5%; +width:29.5%; +} .entity_profile .entity_nickname, .entity_profile .entity_location, .entity_profile .entity_url, @@ -9,3 +22,9 @@ margin-left:0; .entity_profile .entity_depiction { margin-bottom:123px; } +.entity_actions { +width:20%; +} +.notice div.entry-content { +width:63%; +} diff --git a/theme/base/css/mobile.css b/theme/base/css/mobile.css new file mode 100644 index 000000000..eee98317c --- /dev/null +++ b/theme/base/css/mobile.css @@ -0,0 +1,150 @@ +/** theme: base + * + * @package Laconica + * @author Meitar Moscovitz <meitar@maymay.net> + * @author Sarven Capadisli <csarven@controlyourself.ca> + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +body { +font-size:2.5em; +} + +#wrap { +width:95%; +} + +#header, +#header address, +#anon_notice, +#site_nav_local_views .nav, +#form_notice, +#form_notice .form_data li, +#core, +#content_inner, +#notices_primary, +.notice, +.notice .entry-title, +.notice div.entry-content, +.notice-options, +.notice .notice-options a, +.pagination, +.pagination .nav, +.aside .section { +float:none; +} + +.notice-options .notice_reply, +.notice-options .notice_delete, +.notice-options .form_favor, +.notice-options .form_disfavor { +position:static; +} + +#form_notice, +#anon_notice, +#footer, +#form_notice .form_actions input.submit { +width:auto; +} + +.form_settings label { +width:25%; +} +.form_settings .form_data p.form_guide { +margin-left:26%; +} + +#site_nav_global_primary { +width:75%; +} + +.entity_profile { +width:65%; +} +.entity_actions { +margin-left:0; +} + +#form_notice, +#anon_notice { +clear:both; +} + +#content, +#aside_primary { +width:96%; +padding-left:2%; +padding-right:2%; +} + +#site_notice { +position:static; +float:right; +clear:right; +width:75%; +margin-right:0; +margin-bottom:11px; +} + +.notices { +font-size:1.5em; +} + +#form_notice textarea { +width:80%; +height:5em; +} +#form_notice .form_note { +right:20%; +top:6em; +} + + +.vcard .photo, +.section .vcard .photo { +margin-right:18px; +} +.notice, +.profile { +margin-bottom:18px; +} + +.notices .entry-title, +.notices div.entry-content { +width:90%; +} +.notice div.entry-content { +margin-left:0; +} + +.notice .author .photo { +height:4.5em; +width:4.5em; +} +.notice-options { +position:absolute; +top:0; +right:0; +padding-left:7%; +width:3%; +} + +.notice-options .notice_delete a { +float:left; +} +.pagination .nav { +overflow:auto; +} + +#export_data { +display:none; +} + +#site_nav_local_views li { +margin-right:4px; +} +#site_nav_local_views a { +padding:18px 11px; +} diff --git a/theme/base/css/modal.css b/theme/base/css/modal.css deleted file mode 100644 index 985e4adfa..000000000 --- a/theme/base/css/modal.css +++ /dev/null @@ -1,22 +0,0 @@ -/* - * SimpleModal Basic Modal Dialog - * http://www.ericmmartin.com/projects/simplemodal/ - * http://code.google.com/p/simplemodal/ - * - * Copyright (c) 2008 Eric Martin - http://ericmmartin.com - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/mit-license.php - * - * Revision: $Id: basic.css 162 2008-12-01 23:36:58Z emartin24 $ - * - */ - - -/* Overlay */ -#simplemodal-overlay {background-color:#000; cursor:wait;} - -/* Container */ -#simplemodal-container {height:240px; width:320px; background-color:#fff; border:3px solid #ccc;} -#simplemodal-container a.modalCloseImg {background:url(../images/x.png) no-repeat; width:25px; height:29px; display:inline; z-index:3200; position:absolute; top:-15px; right:-18px; cursor:pointer;} -#simplemodal-container #basicModalContent {padding:8px;} diff --git a/theme/base/css/modal_ie.css b/theme/base/css/modal_ie.css deleted file mode 100644 index eab4637c0..000000000 --- a/theme/base/css/modal_ie.css +++ /dev/null @@ -1,16 +0,0 @@ -/* - * SimpleModal Basic Modal Dialog - * http://www.ericmmartin.com/projects/simplemodal/ - * http://code.google.com/p/simplemodal/ - * - * Copyright (c) 2008 Eric Martin - http://ericmmartin.com - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/mit-license.php - * - * Revision: $Id: basic_ie.css 162 2008-12-01 23:36:58Z emartin24 $ - * - */ - -/* IE 6 hacks*/ -#simplemodal-container a.modalCloseImg {background:none; right:-14px; width:22px; height:26px; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='../images/x.png',sizingMethod='scale');} diff --git a/theme/base/css/print.css b/theme/base/css/print.css new file mode 100644 index 000000000..d76dd608c --- /dev/null +++ b/theme/base/css/print.css @@ -0,0 +1,36 @@ +/** theme: base + * + * @package Laconica + * @author Sarven Capadisli <csarven@controlyourself.ca> + * @copyright 2009 Control Yourself, Inc. + * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 + * @link http://laconi.ca/ + */ + +a:after { background-color:#fff; } +a:not([href^="#"]):after { content:" ( "attr(href)" ) "; } + +img { border:none; } +p { orphans: 2; widows: 1; } + +#site_nav_global_primary, +#site_nav_local_views, +#form_notice, +.pagination, +#site_nav_global_secondary, +.entity_actions, +.notice-options, +#aside_primary, +.form_subscription_edit .submit { +display:none; +} + +.timestamp dt, .timestamp dd, +.device dt, .device dd { +display:inline; +} + +.profiles li, +.notices li { +margin-bottom:18px; +} diff --git a/theme/base/default-avatar-mini.png b/theme/base/default-avatar-mini.png Binary files differnew file mode 100644 index 000000000..38b8692b4 --- /dev/null +++ b/theme/base/default-avatar-mini.png diff --git a/theme/base/default-avatar-profile.png b/theme/base/default-avatar-profile.png Binary files differnew file mode 100644 index 000000000..f8357d4fc --- /dev/null +++ b/theme/base/default-avatar-profile.png diff --git a/theme/base/default-avatar-stream.png b/theme/base/default-avatar-stream.png Binary files differnew file mode 100644 index 000000000..6b63baa70 --- /dev/null +++ b/theme/base/default-avatar-stream.png diff --git a/theme/base/images/icons/clip-big.png b/theme/base/images/icons/clip-big.png Binary files differnew file mode 100644 index 000000000..3945f56cc --- /dev/null +++ b/theme/base/images/icons/clip-big.png diff --git a/theme/base/images/icons/clip.png b/theme/base/images/icons/clip.png Binary files differnew file mode 100644 index 000000000..3c5a17d18 --- /dev/null +++ b/theme/base/images/icons/clip.png diff --git a/theme/base/images/icons/icon_processing.gif b/theme/base/images/icons/icon_processing.gif Binary files differnew file mode 100644 index 000000000..d0bce1542 --- /dev/null +++ b/theme/base/images/icons/icon_processing.gif diff --git a/theme/base/images/icons/twotone/green/arrow-left.gif b/theme/base/images/icons/twotone/green/arrow-left.gif Binary files differnew file mode 100644 index 000000000..afed19084 --- /dev/null +++ b/theme/base/images/icons/twotone/green/arrow-left.gif diff --git a/theme/base/images/icons/twotone/green/arrow-right.gif b/theme/base/images/icons/twotone/green/arrow-right.gif Binary files differnew file mode 100644 index 000000000..ee1707ed9 --- /dev/null +++ b/theme/base/images/icons/twotone/green/arrow-right.gif diff --git a/theme/base/images/icons/twotone/green/disfavourite.gif b/theme/base/images/icons/twotone/green/disfavourite.gif Binary files differnew file mode 100644 index 000000000..3946869ae --- /dev/null +++ b/theme/base/images/icons/twotone/green/disfavourite.gif diff --git a/theme/base/images/icons/twotone/green/edit.gif b/theme/base/images/icons/twotone/green/edit.gif Binary files differnew file mode 100644 index 000000000..c746aca60 --- /dev/null +++ b/theme/base/images/icons/twotone/green/edit.gif diff --git a/theme/base/images/icons/twotone/green/favourite.gif b/theme/base/images/icons/twotone/green/favourite.gif Binary files differnew file mode 100644 index 000000000..d93515e37 --- /dev/null +++ b/theme/base/images/icons/twotone/green/favourite.gif diff --git a/theme/base/images/icons/twotone/green/mail.gif b/theme/base/images/icons/twotone/green/mail.gif Binary files differnew file mode 100644 index 000000000..1084c862f --- /dev/null +++ b/theme/base/images/icons/twotone/green/mail.gif diff --git a/theme/base/images/icons/twotone/green/news.gif b/theme/base/images/icons/twotone/green/news.gif Binary files differnew file mode 100644 index 000000000..712c685dc --- /dev/null +++ b/theme/base/images/icons/twotone/green/news.gif diff --git a/theme/base/images/icons/twotone/green/quote.gif b/theme/base/images/icons/twotone/green/quote.gif Binary files differnew file mode 100644 index 000000000..4ba1f0c03 --- /dev/null +++ b/theme/base/images/icons/twotone/green/quote.gif diff --git a/theme/base/images/icons/twotone/green/reply.gif b/theme/base/images/icons/twotone/green/reply.gif Binary files differnew file mode 100644 index 000000000..6ff01bb35 --- /dev/null +++ b/theme/base/images/icons/twotone/green/reply.gif diff --git a/theme/base/images/icons/twotone/green/shield.gif b/theme/base/images/icons/twotone/green/shield.gif Binary files differnew file mode 100644 index 000000000..419d5ee4b --- /dev/null +++ b/theme/base/images/icons/twotone/green/shield.gif diff --git a/theme/base/images/icons/twotone/green/trash.gif b/theme/base/images/icons/twotone/green/trash.gif Binary files differnew file mode 100644 index 000000000..78dd64a3d --- /dev/null +++ b/theme/base/images/icons/twotone/green/trash.gif diff --git a/theme/base/images/x.png b/theme/base/images/x.png Binary files differdeleted file mode 100644 index c11f7af69..000000000 --- a/theme/base/images/x.png +++ /dev/null diff --git a/theme/base/logo.png b/theme/base/logo.png Binary files differnew file mode 100644 index 000000000..7c68b34f6 --- /dev/null +++ b/theme/base/logo.png |
