From 83b09164573ede90d87a7038a56f651a5f82b9f1 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 16 Sep 2009 11:14:26 +0200 Subject: Updated csarven emails to csarven@status.net and removed dupes --- theme/readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/readme.txt b/theme/readme.txt index 151b1fb71..d030f2db4 100644 --- a/theme/readme.txt +++ b/theme/readme.txt @@ -1,7 +1,7 @@ /** Howto: create a statusnet theme * * @package StatusNet - * @author Sarven Capadisli + * @author Sarven Capadisli * @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/ -- cgit v1.2.3-54-g00ecf From df8cce27887a3a7cd813ade61b9bd47e945d9ddc Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 4 Oct 2009 16:51:43 +0000 Subject: Removed obsolete iphone theme (pre v0.7) --- theme/iphone/bg-body.gif | Bin 136 -> 0 bytes theme/iphone/bg-header.gif | Bin 2469 -> 0 bytes theme/iphone/default-avatar-mini.png | Bin 646 -> 0 bytes theme/iphone/default-avatar-profile.png | Bin 2853 -> 0 bytes theme/iphone/default-avatar-stream.png | Bin 1487 -> 0 bytes theme/iphone/display.css | 698 -------------------------------- theme/iphone/display.css.dist | 686 ------------------------------- theme/iphone/ie6.css.dist | 63 --- theme/iphone/ie7.css.dist | 20 - theme/iphone/login-bg.gif | Bin 328 -> 0 bytes theme/iphone/logo.png | Bin 818 -> 0 bytes 11 files changed, 1467 deletions(-) delete mode 100644 theme/iphone/bg-body.gif delete mode 100644 theme/iphone/bg-header.gif delete mode 100644 theme/iphone/default-avatar-mini.png delete mode 100644 theme/iphone/default-avatar-profile.png delete mode 100644 theme/iphone/default-avatar-stream.png delete mode 100644 theme/iphone/display.css delete mode 100644 theme/iphone/display.css.dist delete mode 100644 theme/iphone/ie6.css.dist delete mode 100644 theme/iphone/ie7.css.dist delete mode 100644 theme/iphone/login-bg.gif delete mode 100644 theme/iphone/logo.png (limited to 'theme') diff --git a/theme/iphone/bg-body.gif b/theme/iphone/bg-body.gif deleted file mode 100644 index d87e2e8d7..000000000 Binary files a/theme/iphone/bg-body.gif and /dev/null differ diff --git a/theme/iphone/bg-header.gif b/theme/iphone/bg-header.gif deleted file mode 100644 index 5154b2e5e..000000000 Binary files a/theme/iphone/bg-header.gif and /dev/null differ diff --git a/theme/iphone/default-avatar-mini.png b/theme/iphone/default-avatar-mini.png deleted file mode 100644 index 38b8692b4..000000000 Binary files a/theme/iphone/default-avatar-mini.png and /dev/null differ diff --git a/theme/iphone/default-avatar-profile.png b/theme/iphone/default-avatar-profile.png deleted file mode 100644 index f8357d4fc..000000000 Binary files a/theme/iphone/default-avatar-profile.png and /dev/null differ diff --git a/theme/iphone/default-avatar-stream.png b/theme/iphone/default-avatar-stream.png deleted file mode 100644 index 6b63baa70..000000000 Binary files a/theme/iphone/default-avatar-stream.png and /dev/null differ diff --git a/theme/iphone/display.css b/theme/iphone/display.css deleted file mode 100644 index 1838a8e86..000000000 --- a/theme/iphone/display.css +++ /dev/null @@ -1,698 +0,0 @@ -/* CSS Document */ -/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */ -/* Simplified for mobile by Ken Sheppardson http://identi.ca/kshep */ - -@import url(../../base/css/display.css); - -html {} -body { - width: 100%; - padding: 0; - margin: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 24px; - min-height: 100%; - height: 100%; - color: #193441; -} - -a { - color: #C15D42; - text-decoration: none; -} -a:hover { - text-decoration: underline; -} -img, img a { - border: 0; -} -h1 { - font-size: 1.2em; -} - -#wrap { - margin: 0; -} - -#header { - width: 100%; - float: left; - background-color: #193441; - margin: 0 0 20px 0; - padding: 0; -} -#logo { - float: left; - margin: 10px 0px 0px 10px; -} -p#branding { - margin: 0; - padding: 6px 0 3px 0; - color: #fbf2d7; - font-size: 2em; - font-weight: bold; - line-height: 2.5em; -} -p#branding a { - color: #dab134; -} - -#header h1.pagetitle { - display: none; - margin: 0; - padding: 0; - font-size: 1.2em; - line-height: 2em; - color: #d8e2d7; -} - -#header h2.sitename { - display: none; - margin: 0; - padding: 0; - color: #FCFFF5; -} - -/* ===== Begin Navigation Styling ===== */ - -/* ----- Navigation ------ */ -#nav { - float: right; - margin: 0; - padding: 0; - list-style-type: none; - font-size: 1.2em; -} -#nav li { - display: block; - float: left; -} -#nav li a { - display: block; - padding: 9px 15px 12px 0px; - color: #91AA9D; -} -#nav li a:hover { - text-decoration: underline; -} - -/* ----- Tabs ----- */ -#nav_views { - clear: both; - float: left; - margin: 10px 0px 0px 5px; - padding: 0; - bottom: 0; - list-style-type: none; - font-size: 1.1em; - font-weight: bold; -} -#nav_views li { - display: block; - float: left; - line-height: 1.3em; -} -#nav_views li a { - display: block; - margin: 0; - padding: 4px 12px 3px 12px; - color: #FCFFF5; - background-color: #91AA9D; - border-right: 1px solid #6A8787; -} -#nav_views li a:hover { - text-decoration: none; -} -#nav_views li.current a, #nav_views li.current a:hover { - color: #3F606F; - background-color: #FCFFF5; - border-right: 1px solid #6A8787; -} -#nav_views li.current a:hover { - color: #193441; -} -#nav_views li a:hover { - color: #FCFFF5; - background-color: #3F606F; - border-right: 1px solid #6A8787; -} - -/* ----- Nav Footer ----- */ -#nav_sub { - clear: both; - margin: 18px 10px 0 10px; - padding: 0; - list-style-type: none; - font-size: 1.1em; - font-weight: bold; - line-height: 2em; - border-top: 1px solid #D8E2D7; -} -#nav_sub li { - display: block; - float: left; -} -#nav_sub li a { - padding: 6px 24px 6px 0; -} -#nav_sub li a:hover { - text-decoration: underline; -} -/* ===== End Navigation Styling ===== */ - -#content { - clear: left; - margin: 10px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 1em; - line-height: 1.1em; -} -#content h2 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1.1em; -} -#content label { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1.1em; -} - -.instructions { - clear: both; - float: left; - margin: 5px 5px 10px 5px; -} -.instructions p, .success, .error { - font-weight: normal; - margin: 0; - padding: 10px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 1.1em; - line-height: 1.2em; - border: 1px solid #91AA9D; - color: #FCFFF5; -} -.instructions a, .success a, .error a { - color: #d8e2d7; - text-decoration: underline; -} -.instructions a:hover, .success a:hover, .error a:hover { - color: #FCFFF5; -} -.success { - clear: both; - float: left; - margin: 5px 5px 10px 5px; - background-color: #48705b; -} -.error { - clear: both; - float: left; - margin: 5px 5px 10px 5px; - background-color: #ce3728; -} - -/* ----- Stream -----*/ - -#notices { - clear: both; - margin: 0 auto; - padding: 0; - list-style-type: none; - border-top: 1px solid #D8E2D7; -} -#notices a:hover { - text-decoration: underline; -} -.notice_single { - clear: both; - display: block; - margin: 0; - padding: 5px 5px 5px 0; - min-height: 48px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 1em; - line-height: 1.4em; - border-bottom: 1px solid #D8E2D7; -} -.notice_single:hover { - background-color: #F3F8EA; -} -.notice_single p { - display: inline; - margin: 0; - padding: 0; -} -#notice_delete_form #confirmation_text { - display: block; - font-size: 1.1em; - font-weight: bold; -} -input#submit_yes, input#submit_no { - margin: 18px 10px 0px 0px; - padding: 4px; - font-weight: bold; - color: #FCFFF5; - background-color: #C15D42; - cursor: pointer; - border: 0; - width: 40px; -} -input#submit_yes:hover, input#submit_no:hover { - background-color: #904632; -} -.avatar.stream { - float: left; - margin: 0 10px 0 0; -} -p.time { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 0.9em; - line-height: 2em; -} -p.time a { - color: #91AA9D; -} - -/* ----- Profile -----*/ -#profile { - clear: both; - float: left; - padding: 10px 0 0 0; - border-top: 1px solid #D8E2D7; - font-family: Georgia, "Times New Roman", Times, serif; -} -#profile h1 { - clear: both; - float: left; - margin: 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1.2em; -} -#profile h2 { - clear: both; - float: left; - margin: 0; - padding: 1em 0 0.2em 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1.1em; - text-transform: uppercase; - color: #91AA9D; -} -#profile p { - clear: both; - float: left; - margin: 0 10px 0 0; - font-size: 1em; - line-height: 1.4em; -} -#profile p.location { - margin: 0 10px 12px 0; - font-style: italic; -} -#profile p.notice_current { - font-size: 1.2em; - line-height: 1.3em; -} -#profile_avatar { - float: left; - margin-right: 4px; -} -#profile_avatar img { - margin-bottom: 5px; -} -.avatar.profile { - clear: left; - margin: 0 10px 5px 0; -} -.avatar.original { - float: left; - margin: 0 10px 18px 0; -} -a.nickname { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 1.1em; - padding-right: 3px; -} -#profile_information { - float: left; -} - -.statistics { - clear: both; - float: left; -} -.statistics h2 { - clear: both; - float: left; - margin: 12px 0 3px 0; -} -dl.statistics { - margin: 0; -} -.statistics dt { - clear: left; - float: left; - width: 200px; -} -.statistics dd { - float: left; -} -.statistics dt:after { - content: ":"; -} -#subscriptions { - clear: both; - float: left; - margin: 18px 0 30px 0; -} -#subscriptions_avatars { - clear: both; - float: left; - margin: 6px 0 0 0; - padding: 0; - list-style-type: none; -} -#subscriptions_avatars li .avatar.mini { - float: left; - margin: 0 3px 3px 0; - padding: 0; - line-height: 0; -} -#subscriptions_viewall { - clear: left; -} -/* ----- End Profile -----*/ - -/* ----- Begin Subscriptions & Subscribers -----*/ - -ul.subscriptions, ul.subscribers { - float: none; - margin: 0; - padding: 0; - list-style-type: none; - overflow: auto; -} -ul.subscriptions li, ul.subscribers li { - display: block; - float: left; - padding: 0; -} -/* ----- End Subscriptions & Subscribers -----*/ - -#pagination { - margin: 18px auto; -} -#nav_pagination { - margin: 0 0 36px 0; - padding: 0; - float: right; - list-style-type: none; - font-size: 12px; - font-weight: bold; -} -#nav_pagination li { - display: block; - float: left; - background-color: #91AA9D; -} -#nav_pagination li.before { - margin-right: 1px; -} -#nav_pagination li a { - padding: 6px 15px; - line-height: 2em; - background-color: #91AA9D; - color: #FCFFF5; -} -#nav_pagination li a:hover { - background-color: #3F606F; - color: #FCFFF5; - text-decoration: none; -} - -#footer { - clear: both; - margin: 10px; - border-top: 1px solid #D8E2D7; -} -#footer p { - font-size: 0.8em; - margin-top: 1em; - line-height: 1.2em; -} -#cc { - float: left; - margin: 3px 10px 0 0; -} - -/* ===== Begin Forms Styling ===== */ - -/* ----- Forms General Style ----- */ -form { - margin: 0 auto; - padding: 0; -} -form { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1em; -} -form label { - display: block; - font-size: 1em; - font-weight: bold; - line-height: 1.5em; -} -form input { - border: 1px solid #D8E2D7; - width: 264px; -} -input#submit, input.submit { - display: block; - margin: 18px 0; - padding: 4px; - font-weight: bold; - color: #FCFFF5; - background-color: #C15D42; - cursor: pointer; - border: 0; - width: auto; -} -input#submit:hover, input.submit:hover { - background-color: #904632; -} -input.checkbox { - width: auto; - border: 0; -} -textarea, input { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1em; - color: #193441; - padding: 3px; -} -textarea:focus, input:focus { - background-color: #f0f6eb; -} -textarea { - width: 270px; - border: 1px solid #D8E2D7; -} -.input_instructions { - margin-top: 3px; - display: block; - font-size: 1em; - line-height: 1.2em; - color: #91aa9d; - font-family: Verdana, Arial, Helvetica, sans-serif; -} - -/* ----- Status Form ----- */ -#status_form { - width: 100%; - margin: 0px 0px 10px 5px; -} -#status_form p { - margin: 0; - padding: 0; -} -#status_label { - display: none; - clear: both; - margin: 0; - padding: 0 0 3px 0; - font-size: 1.5em; - font-weight: bold; - line-height: 2em; - color: #91AA9D; -} -#status_textarea { - display: block; - float: left; - width: 70%; - height: 3em; - margin: 0 0 10px 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 1.1em; - color: #193441; - border: 0; -} -#status_submit { - display: block; - float: left; - margin: 0 0 0 4px; - padding: 1em 10px 1em 10px; - line-height: 1em; - width: 10%; - background-color: #C15D42; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 1em; - color: #FCFFF5; - cursor: pointer; - border: 0; -} -#status_submit:hover { - background-color: #904632; -} -#counter { - padding: 1em .5em 1em 5px; - color: #fff; - clear: both; - float: left; - font-weight: bold; - text-align: right; -} -/* ----- Subscribe Form ----- */ -#subscribe .submit, #unsubscribe .submit, #remotesubscribe .button, #remotesubscribe { - clear: left; - margin: 0; - width: 96px; - height: 27px; - font-family: verdana, arial, helvetica, sans-serif; - font-weight: bold; - font-size: 12px; - text-transform: uppercase; - background-color: #c15d42; - color: #fcfff5; - border: 0; -} -#remotesubscribe { - width: 96px; - height: 22px; - padding: 5px 0 0 0; - text-align: center; -} -#subscribe .button:hover, #unsubscribe .button:hover { - background-color: #904632; - cursor: pointer; -} - -a#remotesubscribe { - display: block; -} - -/* ----- Login Form -----*/ -input#license { - width: auto; - border: 0; -} -/* ----- Avatar Form -----*/ -form { - clear: left; -} - -/* ----- OpenID Form -----*/ - -input#openid_url { - background: url(login-bg.gif) no-repeat; - background-color: #fff; - background-position: 4px 50%; - color: #000; - padding-left: 24px; -} - -/* People lists (search results, maybe subscribers) */ - -#profiles { - clear: both; - margin: 0 auto; - padding: 0; - list-style-type: none; - border-top: 1px solid #D8E2D7; -} -#profiles a:hover { - text-decoration: underline; -} - -.profile_single { - clear: both; - display: block; - margin: 0; - padding: 5px 5px 5px 0; - min-height: 48px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 1.2em; - line-height: 1.4em; - border-bottom: 1px solid #D8E2D7; -} -.profile_single:hover { - background-color: #F3F8EA; -} - -/* ----- IM Settings Form -----*/ - -#imsettings p { - margin: 0; - padding: 0; - line-height: 1.3em; -} - -/* ===== End Forms Styling ===== */ - -/* ===== Tag Cloud Styling ===== */ - -p.tagcloud { -text-align: center; -} - -p.tagcloud a { -line-height:1em; -vertical-align:middle; -} - -p.tagcloud a.largest { -font-size: 4em; -} -p.tagcloud a.verylarge { -font-size: 3em; -} - -p.tagcloud a.large { -font-size: 2em; -} - -p.tagcloud a.medium { -font-size: 1.5em; -} - -p.tagcloud a.small { -font-size: 1em; -} - -p.tagcloud a.verysmall { -font-size: 80%; -} - -p.tagcloud a.smallest { -font-size: 60%; -} - -a.replybutton { - border: 1px solid #D8E2D7; - padding: 0px 10px 0px 10px; - line-height: 0.8em; -} diff --git a/theme/iphone/display.css.dist b/theme/iphone/display.css.dist deleted file mode 100644 index 395da2e2f..000000000 --- a/theme/iphone/display.css.dist +++ /dev/null @@ -1,686 +0,0 @@ -/* CSS Document */ -/* Design & CSS by Marie-Claude Doyon http://www.marieclaudedoyon.com */ - -html { - background: url(bg-body.gif) repeat-y top center #d8e2d7; - } -body { - position: absolute; - width: 100%; - margin: 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - line-height: 12px; - min-height: 100%; - height: 100%; - color: #193441; - } -a { - color: #C15D42; - text-decoration: none; - } -a:hover { - text-decoration: underline; - } -img, img a { - border: 0; - } -h1 { - font-size: 14px; - } - - -#wrap { - margin: 0 auto; - padding: 0 20px; - width: 760px; - background: url(bg-header.gif) repeat-x #FCFFF5; - } -#header { - position: relative; - margin: 0 auto; - width: 540px; - height: 216px; - } -#logo { - margin-top: 9px; - } -p#branding { - margin: 0; - padding: 6px 0 3px 0; - color: #fbf2d7; - font-size: 21px; - font-weight: bold; - line-height: 27px; - } -p#branding a { - color: #dab134; - } - -#header h1.pagetitle { - margin: 0; - padding: 0; - font-size: 15px; - line-height: 24px; - color: #d8e2d7; -} - -#header h2.sitename { - display: none; - margin: 0; - padding: 0; - color: #FCFFF5; -} - -/* ===== Begin Navigation Styling ===== */ - -/* ----- Navigation ------ */ -#nav { - float: right; - margin: 0; - padding: 0; - list-style-type: none; - font-size: 12px; - } -#nav li { - display: block; - float: left; - } -#nav li a { - display: block; - padding: 9px 9px 12px 9px; - color: #91AA9D; - } -#nav li a:hover { - text-decoration: underline; - } - -/* ----- Tabs ----- */ -#nav_views { - margin: 0 auto; - padding: 0; - position: absolute; - bottom: 0; - list-style-type: none; - font-size: 14px; - font-weight: bold; - width: 540px; - /*height: 30px;*/ - } -#nav_views li { - display: block; - float: left; - line-height: 21px; - } -#nav_views li a { - display: block; - margin: 0; - padding: 4px 12px 3px 12px; - color: #FCFFF5; - background-color: #91AA9D; - border-right: 1px solid #6A8787; - } -#nav_views li a:hover { - text-decoration: none; - } -#nav_views li.current a, #nav_views li.current a:hover { - color: #3F606F; - background-color: #FCFFF5; - border-right: 1px solid #6A8787; - } -#nav_views li.current a:hover { - color: #193441; - } -#nav_views li a:hover { - color: #FCFFF5; - background-color: #3F606F; - border-right: 1px solid #6A8787; - } - -/* ----- Nav Footer ----- */ -#nav_sub { - clear: both; - margin: 18px auto 0 auto; - padding: 0; - list-style-type: none; - font-size: 11px; - font-weight: bold; - line-height: 21px; - border-top: 1px solid #D8E2D7; - width: 540px; - } -#nav_sub li { - display: block; - float: left; - } -#nav_sub li a { - padding: 6px 24px 6px 0; - } -#nav_sub li a:hover { - text-decoration: underline; - } -/* ===== End Navigation Styling ===== */ - -#content { - clear: left; - margin: 40px 0 45px 0; - padding: 0 110px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 14px; - line-height: 18px; - } -#content h2 { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 15px; - } -#content label { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - } -.instructions p, .success, .error { - font-weight: normal; - margin: 36px 0 0 0; - padding: 10px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 13px; - line-height: 15px; - border: 1px solid #91AA9D; - color: #FCFFF5; - } -.instructions a, .success a, .error a { - color: #d8e2d7; - text-decoration: underline; - } -.instructions a:hover, .success a:hover, .error a:hover { - color: #FCFFF5; - } -.success { - background-color: #48705b; - } -.error { - background-color: #ce3728; - } - - -/* ----- Stream -----*/ - -#notices { - clear: both; - margin: 0 auto; - padding: 0; - list-style-type: none; - width: 540px; - border-top: 1px solid #D8E2D7; - } -#notices a:hover { - text-decoration: underline; - } -.notice_single { - clear: both; - display: block; - margin: 0; - padding: 5px 5px 5px 0; - min-height: 48px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 13px; - line-height: 16px; - border-bottom: 1px solid #D8E2D7; - } -.notice_single:hover { - background-color: #F3F8EA; - } -.notice_single p { - display: inline; - margin: 0; - padding: 0; - } -#notice_delete_form #confirmation_text { - display: block; - font-size: 14px; - font-weight: bold; - } -input#submit_yes, input#submit_no { - margin: 18px 10px 0px 0px; - padding: 4px; - font-weight: bold; - color: #FCFFF5; - background-color: #C15D42; - cursor: pointer; - border: 0; - width: 40px; - } -input#submit_yes:hover, input#submit_no:hover { - background-color: #904632; - } -.avatar.stream { - float: left; - margin: 0 10px 0 0; - } -p.time { - display: block; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - line-height: 15px; - } -p.time a { - color: #91AA9D; - } - -/* ----- Profile -----*/ -#profile { - clear: left; - margin: 0 -110px; - padding: 10px 0 0 0; - min-height: 170px; - border-top: 1px solid #D8E2D7; - font-family: Georgia, "Times New Roman", Times, serif; - } -#profile h1 { - margin: 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 14px; - } -#profile h2 { - margin: 0; - padding: 0; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - text-transform: uppercase; - color: #91AA9D; - } -#profile p { - margin: 0 10px 0 0; - font-size: 12px; - line-height: 14px; - } -#profile p.location { - margin: 0 10px 12px 0; - font-style: italic; - } -#profile p.notice_current { - font-size: 18px; - line-height: 21px; - } -#profile_avatar { - float: left; - margin-right: 4px; - } -#profile_avatar img { - margin-bottom: 5px; - } -.avatar.profile { - clear: left; - margin: 0 10px 5px 0; - } -.avatar.original { - float: left; - margin: 0 10px 18px 0; - } -a.nickname { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 12px; - padding-right: 3px; - } -#profile_information { - float: left; - position: relative; - width: 270px; - height: 200px; - } -.statistics { - margin-top: 18px; - } -.statistics h2 { - margin: 12px 0 3px 0; - } -dl.statistics { - margin: 0; - font-size: 12px; - line-height: 14px; - } -.statistics dt { - float: left; - width: 96px; -} -.statistics dd { - margin-left: 100px; -} -.statistics dt:after { - content: ":"; - } -#subscriptions { - float: left; - margin: 18px 0 30px 0; - } -#subscriptions_avatars { - float: left; - margin: 6px 0 0 0; - padding: 0; - list-style-type: none; - width: 270px; - } -#subscriptions_avatars li .avatar.mini { - float: left; - margin: 0 3px 3px 0; - padding: 0; - line-height: 0; - /* border: 1px solid #f00; */ - } -#subscriptions_viewall { - clear: left; - } -/* ----- End Profile -----*/ - -/* ----- Begin Subscriptions & Subscribers -----*/ - -ul.subscriptions, ul.subscribers { - float: none; - margin: 0; - padding: 0; - list-style-type: none; - overflow: auto; - } -ul.subscriptions li, ul.subscribers li { - display: block; - float: left; - padding: 0; - } -/* ----- End Subscriptions & Subscribers -----*/ - - - -#pagination { - margin: 18px auto; - width: 540px; - } -#nav_pagination { - margin: 0 0 36px 0; - padding: 0; - float: right; - list-style-type: none; - font-size: 12px; - font-weight: bold; - } -#nav_pagination li { - display: block; - float: left; - background-color: #91AA9D; - } -#nav_pagination li.before { - margin-right: 1px; - } -#nav_pagination li a { - padding: 6px 15px; - line-height: 21px; - background-color: #91AA9D; - color: #FCFFF5; - } -#nav_pagination li a:hover { - background-color: #3F606F; - color: #FCFFF5; - text-decoration: none; - } - -#footer { - clear: both; - margin: 0 auto; - padding: 0 0 36px 0; - width: 540px; - border-top: 1px solid #D8E2D7; - } -#footer p { - margin-top: 9px; - line-height: 12px; - } -#cc { - float: left; - margin: 3px 10px 0 0; - } - -/* ===== Begin Forms Styling ===== */ - -/* ----- Forms General Style ----- */ -form { - margin: 0 auto; - padding: 0; - } -form { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - } -form label { - display: block; - font-size: 12px; - font-weight: bold; - line-height: 18px; - } -form input { - border: 1px solid #D8E2D7; - width: 264px; - } -input#submit, input.submit { - display: block; - margin: 18px 0; - padding: 4px; - font-weight: bold; - color: #FCFFF5; - background-color: #C15D42; - cursor: pointer; - border: 0; - width: auto; - } -input#submit:hover, input.submit:hover { - background-color: #904632; - } -input.checkbox { - /*width: 14px; - height: 14px;*/ - width: auto; - border: 0; - } -textarea, input { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #193441; - padding: 3px; - } -textarea:focus, input:focus { - background-color: #f0f6eb; - } -textarea { - width: 270px; - border: 1px solid #D8E2D7; - } -.input_instructions { - margin-top: 3px; - display: block; - font-size: 11px; - line-height: 15px; - color: #91aa9d; - font-family: Verdana, Arial, Helvetica, sans-serif; - } - -/* ----- Status Form ----- */ -#status_form { - height: 96px; - /*background-color: #F00;*/ - } -#status_form p { - margin: 36px 0 0 0; - padding: 0; - } -#status_label { - display: block; - clear: both; - margin: 0; - padding: 0 0 3px 0; - font-size: 18px; - font-weight: bold; - line-height: 24px; - color: #91AA9D; - } -#status_textarea { - display: block; - float: left; - width: 463px; - height: 35px; - padding: 5px; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px; - color: #193441; - border: 0; - } -#status_submit { - display: block; - float: left; - margin: 1px 0 0 4px; - width: 63px; - height: 45px; - background-color: #C15D42; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 14px; - color: #FCFFF5; - cursor: pointer; - border: 0; - } -#status_submit:hover { - background-color: #904632; - } -#counter { - position: absolute; - top: 140px; - left: -64px; - width: 50px; - font-weight: bold; - text-align: right; -} -/* ----- Subscribe Form ----- */ -#subscribe .submit, #unsubscribe .submit, #remotesubscribe .button, #remotesubscribe { - clear: left; - margin: 0; - width: 96px; - height: 27px; - font-family: verdana, arial, helvetica, sans-serif; - font-weight: bold; - font-size: 10px; - text-transform: uppercase; - background-color: #c15d42; - color: #fcfff5; - border: 0; - } -#remotesubscribe { - width: 96px; - height: 22px; - padding: 5px 0 0 0; - text-align: center; - } -#subscribe .button:hover, #unsubscribe .button:hover { - background-color: #904632; - cursor: pointer; - } - -a#remotesubscribe { - display: block; -} - -/* ----- Login Form -----*/ -input#license { - width: auto; - border: 0; - } -/* ----- Avatar Form -----*/ -form { - clear: left; -} - -/* ----- OpenID Form -----*/ - -input#openid_url { - background: url(login-bg.gif) no-repeat; - background-color: #fff; - background-position: 4px 50%; - color: #000; - padding-left: 24px; -} - -/* People lists (search results, maybe subscribers) */ - -#profiles { - clear: both; - margin: 0 auto; - padding: 0; - list-style-type: none; - width: 540px; - border-top: 1px solid #D8E2D7; - /*border: 1px solid #F00;*/ - } -#profiles a:hover { - text-decoration: underline; - } - -.profile_single { - clear: both; - display: block; - margin: 0; - padding: 5px 5px 5px 0; - min-height: 48px; - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 13px; - line-height: 16px; - border-bottom: 1px solid #D8E2D7; - } -.profile_single:hover { - background-color: #F3F8EA; - } - -/* ----- IM Settings Form -----*/ - -#imsettings p { - margin: 0; - padding: 0; - line-height: 15px; -} - -/* ===== End Forms Styling ===== */ - -/* ===== Tag Cloud Styling ===== */ - -p.tagcloud { -text-align: center; -} - -p.tagcloud a { -line-height:100%; -vertical-align:middle; -} - -p.tagcloud a.largest { -font-size: 400%; -} -p.tagcloud a.verylarge { -font-size: 300%; -} - -p.tagcloud a.large { -font-size: 200%; -} - -p.tagcloud a.medium { -font-size: 150%; -} - -p.tagcloud a.small { -font-size: 100%; -} - -p.tagcloud a.verysmall { -font-size: 80%; -} - -p.tagcloud a.smallest { -font-size: 60%; -} diff --git a/theme/iphone/ie6.css.dist b/theme/iphone/ie6.css.dist deleted file mode 100644 index 97d9fee3f..000000000 --- a/theme/iphone/ie6.css.dist +++ /dev/null @@ -1,63 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ -body { - text-align: center; -} -input { - height: 24px; -} -#wrap { - margin: 0 auto; - padding: 0 20px; - width: 800px; - text-align: left; - background: url(bg-header.gif) repeat-x #FCFFF5; - } -#header { - position: relative; - margin-left: 108px; - } -#nav_views { - margin: 0; - } -#nav_views li { - line-height: 19px; - } -.statistics dd { - margin-top: -15px; - clear: both; - } -#notices { - margin: 0; - } -.notice_single { - height: 48px; - } -#profile p.notice_current { - height: 96px; - } - -#subscriptions_avatars li { - float: left; - margin: 0; - padding: 0; - } -img.avatar.original, img.avatar.profile { - clear: none; - float: left; -} -#status_textarea { - height: 46px; - } - -#nav_pagination li a { - padding: 6px 15px; - line-height: 27px; - } -#nav_sub { - position: relative; - margin-left: 108px; - } -#footer { - margin-left: 108px; -} diff --git a/theme/iphone/ie7.css.dist b/theme/iphone/ie7.css.dist deleted file mode 100644 index bbf52d5cf..000000000 --- a/theme/iphone/ie7.css.dist +++ /dev/null @@ -1,20 +0,0 @@ -@charset "UTF-8"; -/* CSS Document */ - -#statistics dd { - clear: both; - } - - -#subscriptions_avatars li { - float: left; - } -img.avatar.original, img.avatar.profile { - clear: none; - float: left; -} - -#nav_pagination li a { - padding: 6px 15px; - line-height: 27px; - } \ No newline at end of file diff --git a/theme/iphone/login-bg.gif b/theme/iphone/login-bg.gif deleted file mode 100644 index e2d8377db..000000000 Binary files a/theme/iphone/login-bg.gif and /dev/null differ diff --git a/theme/iphone/logo.png b/theme/iphone/logo.png deleted file mode 100644 index 3b271814d..000000000 Binary files a/theme/iphone/logo.png and /dev/null differ -- cgit v1.2.3-54-g00ecf From 2f065d687dc76bfbac3e1b7b3dcccf544f4b4987 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 4 Oct 2009 23:53:02 +0200 Subject: Unnecessary selector bit --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 7706fba48..76709113f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -251,7 +251,7 @@ margin-right:18px; margin-bottom:11px; margin-left:18px; } -#site_nav_global_primary ul li { +#site_nav_global_primary li { display:inline; margin-left:11px; } -- cgit v1.2.3-54-g00ecf From e63a435868318bd183d8ae36ff0f6a110cdc85db Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 6 Oct 2009 17:16:28 +0200 Subject: Using 'CSS sprites' for common icons for the identica theme. Default theme will follow after some tests. --- theme/base/images/icons/icons-01.png | Bin 0 -> 3260 bytes theme/identica/css/display.css | 48 ++++++++++++++++++++--------------- 2 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 theme/base/images/icons/icons-01.png (limited to 'theme') diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png new file mode 100644 index 000000000..c4e371330 Binary files /dev/null and b/theme/base/images/icons/icons-01.png differ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 9fc97180d..aebbb54ed 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -88,7 +88,7 @@ color:#333333; color:#000000; } #form_notice label[for=notice_data-attach] { -background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; } #form_notice #notice_data-attach { opacity:0; @@ -150,16 +150,18 @@ 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.png); +background-image:url(../../base/images/icons/icons-01.png); +background-position:0 -130px; } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.png); +background-image:url(../../base/images/icons/icons-01.png); +background-position:0 -64px; } #export_data li a.foaf { -background-image:url(../../base/images/icons/icon_foaf.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position:0 1px; } .entity_edit a, @@ -171,7 +173,6 @@ background-image:url(../../base/images/icons/icon_foaf.gif); .form_group_unblock input.submit, .entity_nudge p, .form_make_admin input.submit { -background-position: 0 40%; background-repeat: no-repeat; background-color:transparent; } @@ -189,43 +190,48 @@ background-color:#87B4C8; } .entity_edit a { -background-image:url(../../base/images/icons/twotone/green/edit.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -718px; } .entity_send-a-message a { -background-image:url(../../base/images/icons/twotone/green/quote.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -785px; } .entity_nudge p, .form_user_nudge input.submit { -background-image:url(../../base/images/icons/twotone/green/mail.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -950px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-image:url(../../base/images/icons/twotone/green/shield.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -918px; } .form_make_admin input.submit { -background-image:url(../../base/images/icons/twotone/green/admin.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -983px; } /* NOTICES */ .notice .attachment { -background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px; } #attachments .attachment { background:none; } .notice-options .notice_reply { -background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px; } .notice-options form.form_favor input.submit { -background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px; } .notice-options form.form_disfavor input.submit { -background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px; } .notice-options .notice_delete { -background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px; } .notices div.entry-content, @@ -262,7 +268,7 @@ background-color:rgba(200, 200, 200, 0.300); /*END: NOTICES */ #new_group a { -background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px; } .pagination .nav_prev a, @@ -271,10 +277,10 @@ background-repeat:no-repeat; border-color:#CEE1E9; } .pagination .nav_prev a { -background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; +background-image:url(../../base/images/icons/icons-01.png); +background-position:10% -187px; } .pagination .nav_next a { -background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; +background-image:url(../../base/images/icons/icons-01.png); +background-position:105% -252px; } -- cgit v1.2.3-54-g00ecf From d37bf29bba03f707a201e194c17ce8f0113c25be Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 6 Oct 2009 15:40:28 +0000 Subject: Fixed nudge and direct message background image alignment --- theme/identica/css/display.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index aebbb54ed..6339c9314 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -195,12 +195,12 @@ background-position: 0 -718px; } .entity_send-a-message a { background-image:url(../../base/images/icons/icons-01.png); -background-position: 0 -785px; +background-position: 0 -849px; } .entity_nudge p, .form_user_nudge input.submit { background-image:url(../../base/images/icons/icons-01.png); -background-position: 0 -950px; +background-position: 0 -785px; } .form_user_block input.submit, .form_user_unblock input.submit, -- cgit v1.2.3-54-g00ecf From 7fe1facc99c0e5b2ffead9bb6def8438f7d011d4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 6 Oct 2009 15:40:56 +0000 Subject: Fixed IE background image alignment for attach, favour and disfavour --- theme/identica/css/ie.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css index 97cabc30a..044c32ff1 100644 --- a/theme/identica/css/ie.css +++ b/theme/identica/css/ie.css @@ -7,8 +7,14 @@ color:#FFFFFF; background-color:#D9DADB; } #form_notice .form_note + label { -background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; } #form_notice #notice_data-attach { filter: alpha(opacity=0); } +.notice-options form.form_favor input.submit { +background-position:0 -460px; +} +.notice-options form.form_disfavor input.submit { +background-position:0 -526px; +} -- cgit v1.2.3-54-g00ecf From 81199d0258115d02e1980ae7e5827b325f55629c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 6 Oct 2009 15:51:06 +0000 Subject: Aligning notice attach label from right instead of left --- theme/base/css/display.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 76709113f..d9dca9815 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -468,16 +468,15 @@ margin-bottom:7px; #form_notice #notice_data-attach { position:absolute; top:25px; +right:10.5%; cursor:pointer; } #form_notice label[for=notice_data-attach] { text-indent:-9999px; -left:86%; width:16px; height:16px; } #form_notice #notice_data-attach { -left:40.6%; padding:0; height:16px; } -- cgit v1.2.3-54-g00ecf From 16243737606d4e1f29a94e07369e69f430d3ecc8 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 13 Oct 2009 11:44:56 +0000 Subject: Updated default theme to use the CSS Sprites method for common icons --- theme/default/css/display.css | 48 ++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 21 deletions(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 86369cb99..3993da717 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -88,7 +88,7 @@ color:#333333; color:#000000; } #form_notice label[for=notice_data-attach] { -background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; } #form_notice #notice_data-attach { opacity:0; @@ -150,16 +150,18 @@ 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.png); +background-image:url(../../base/images/icons/icons-01.png); +background-position:0 -130px; } #export_data li a.atom { -background-image:url(../../base/images/icons/icon_atom.png); +background-image:url(../../base/images/icons/icons-01.png); +background-position:0 -64px; } #export_data li a.foaf { -background-image:url(../../base/images/icons/icon_foaf.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position:0 1px; } .entity_edit a, @@ -171,7 +173,6 @@ background-image:url(../../base/images/icons/icon_foaf.gif); .form_group_unblock input.submit, .entity_nudge p, .form_make_admin input.submit { -background-position: 0 40%; background-repeat: no-repeat; background-color:transparent; } @@ -189,43 +190,48 @@ background-color:#87B4C8; } .entity_edit a { -background-image:url(../../base/images/icons/twotone/green/edit.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -718px; } .entity_send-a-message a { -background-image:url(../../base/images/icons/twotone/green/quote.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -849px; } .entity_nudge p, .form_user_nudge input.submit { -background-image:url(../../base/images/icons/twotone/green/mail.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -785px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-image:url(../../base/images/icons/twotone/green/shield.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -918px; } .form_make_admin input.submit { -background-image:url(../../base/images/icons/twotone/green/admin.gif); +background-image:url(../../base/images/icons/icons-01.png); +background-position: 0 -983px; } /* NOTICES */ .notice .attachment { -background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px; } #attachments .attachment { background:none; } .notice-options .notice_reply { -background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px; } .notice-options form.form_favor input.submit { -background:transparent url(../../base/images/icons/twotone/green/favourite.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px; } .notice-options form.form_disfavor input.submit { -background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px; } .notice-options .notice_delete { -background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px; } .notices div.entry-content, @@ -262,7 +268,7 @@ background-color:rgba(200, 200, 200, 0.300); /*END: NOTICES */ #new_group a { -background:transparent url(../../base/images/icons/twotone/green/news.gif) no-repeat 0 45%; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px; } .pagination .nav_prev a, @@ -271,10 +277,10 @@ background-repeat:no-repeat; border-color:#C8D1D5; } .pagination .nav_prev a { -background-image:url(../../base/images/icons/twotone/green/arrow-left.gif); -background-position:10% 45%; +background-image:url(../../base/images/icons/icons-01.png); +background-position:10% -187px; } .pagination .nav_next a { -background-image:url(../../base/images/icons/twotone/green/arrow-right.gif); -background-position:90% 45%; +background-image:url(../../base/images/icons/icons-01.png); +background-position:105% -252px; } -- cgit v1.2.3-54-g00ecf From d18f4a35edd055edb3e21153a0a94bb2c1cbc2f1 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 19 Oct 2009 14:47:08 +0000 Subject: Better alignment --- theme/default/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 3993da717..6833373b4 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -18,7 +18,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } address { -margin-right:7.2%; +margin-right:5.8%; } input, textarea, select, option { -- cgit v1.2.3-54-g00ecf From 0e029d728429009e7791ae052df4e9998e309fab Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 27 Oct 2009 14:59:58 +0100 Subject: Some CSS updates for FB app --- theme/base/css/facebookapp.css | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css index e6b1c9ee5..47c63d823 100644 --- a/theme/base/css/facebookapp.css +++ b/theme/base/css/facebookapp.css @@ -5,8 +5,8 @@ font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; #wrap { background-color:#F0F2F5; -padding-left:18px; -padding-right:18px; +padding-left:1.795%; +padding-right:1.795%; width:auto; } @@ -15,8 +15,16 @@ h1,h2,h3,h4,h5,h6 { color:#000; } +#header { +width:131%; +} + #content { -width:95%; +width:92.7%; +} + +#aside_primary { +display:none; } #site_nav_local_views a { @@ -26,6 +34,22 @@ background-color:#D0DFE7; background-color:#FAFBFC; } +#form_notice .form_note + label { +position:absolute; +top:25px; +right:10.5%; +cursor:pointer; +text-indent:-9999px; +width:16px; +height:16px; +background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; +} + +#form_notice #notice_action-submit { +height:47px !important; +} + + span.facebook-button { border: 2px solid #aaa; padding: 3px; -- cgit v1.2.3-54-g00ecf From 0c8990b435695654131d6ae7a734e3059febb0b6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 27 Oct 2009 16:32:09 +0100 Subject: Slight alignment --- theme/default/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 6833373b4..a5f1fd6e4 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -18,7 +18,7 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif; font-size:1em; } address { -margin-right:5.8%; +margin-right:5.7%; } input, textarea, select, option { -- cgit v1.2.3-54-g00ecf From c370f0aadffd136ac80ad732bab05e415afd20c8 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 27 Oct 2009 17:44:55 +0100 Subject: Removed attachment UI --- theme/base/css/facebookapp.css | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'theme') diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css index 47c63d823..8cd06f78a 100644 --- a/theme/base/css/facebookapp.css +++ b/theme/base/css/facebookapp.css @@ -34,15 +34,9 @@ background-color:#D0DFE7; background-color:#FAFBFC; } -#form_notice .form_note + label { -position:absolute; -top:25px; -right:10.5%; -cursor:pointer; -text-indent:-9999px; -width:16px; -height:16px; -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; +#form_notice .form_note + label, +#form_notice #notice_data-attach { +display:none; } #form_notice #notice_action-submit { -- cgit v1.2.3-54-g00ecf From 4de05f1e475ef21fabd0fc607dec31506ad8dbf8 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 27 Oct 2009 21:00:26 +0000 Subject: Forgot to move the facebookapp.css file into the new Facebook plugin --- plugins/Facebook/facebookaction.php | 4 +- plugins/Facebook/facebookapp.css | 115 ++++++++++++++++++++++++++++++++++++ theme/base/css/facebookapp.css | 115 ------------------------------------ 3 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 plugins/Facebook/facebookapp.css delete mode 100644 theme/base/css/facebookapp.css (limited to 'theme') diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php index f5ad3d06b..a10fdf90d 100644 --- a/plugins/Facebook/facebookaction.php +++ b/plugins/Facebook/facebookaction.php @@ -83,8 +83,8 @@ class FacebookAction extends Action function showStylesheets() { $this->cssLink('css/display.css', 'base'); - $this->cssLink('css/display.css',null,'screen, projection, tv'); - $this->cssLink('css/facebookapp.css', 'base'); + $this->cssLink('css/display.css', null, 'screen, projection, tv'); + $this->cssLink('plugins/Facebook/facebookapp.css'); } function showScripts() diff --git a/plugins/Facebook/facebookapp.css b/plugins/Facebook/facebookapp.css new file mode 100644 index 000000000..8cd06f78a --- /dev/null +++ b/plugins/Facebook/facebookapp.css @@ -0,0 +1,115 @@ +* { +font-size:14px; +font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; +} + +#wrap { +background-color:#F0F2F5; +padding-left:1.795%; +padding-right:1.795%; +width:auto; +} + +p,label, +h1,h2,h3,h4,h5,h6 { +color:#000; +} + +#header { +width:131%; +} + +#content { +width:92.7%; +} + +#aside_primary { +display:none; +} + +#site_nav_local_views a { +background-color:#D0DFE7; +} +#site_nav_local_views a:hover { +background-color:#FAFBFC; +} + +#form_notice .form_note + label, +#form_notice #notice_data-attach { +display:none; +} + +#form_notice #notice_action-submit { +height:47px !important; +} + + +span.facebook-button { +border: 2px solid #aaa; +padding: 3px; +display: block; +float: left; +margin-right: 20px; +-moz-border-radius: 4px; +border-radius:4px; +-webkit-border-radius:4px; +font-weight: bold; +background-color:#A9BF4F; +color:#fff; +font-size:1.2em +} + +span.facebook-button a { color:#fff } + +.facebook_guide { +margin-bottom:18px; +} +.facebook_guide p { +font-weight:bold; +} + + +input { +height:auto !important; +} + +#facebook-friends { +float:left; +width:100%; +} + +#facebook-friends li { +float:left; +margin-right:2%; +margin-bottom:11px; +width:18%; +height:115px; +} +#facebook-friends li a { +float:left; +} + +#add_to_profile { +position:absolute; +right:18px; +top:10px; +z-index:2; +} + +.notice div.entry-content dl, +.notice div.entry-content dt, +.notice div.entry-content dd { +margin-right:5px; +} + +#content_inner p { +margin-bottom:18px; +} + +#content_inner ul { +list-style-type:none; +} + +.form_settings label { +margin-right:18px; +} diff --git a/theme/base/css/facebookapp.css b/theme/base/css/facebookapp.css deleted file mode 100644 index 8cd06f78a..000000000 --- a/theme/base/css/facebookapp.css +++ /dev/null @@ -1,115 +0,0 @@ -* { -font-size:14px; -font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; -} - -#wrap { -background-color:#F0F2F5; -padding-left:1.795%; -padding-right:1.795%; -width:auto; -} - -p,label, -h1,h2,h3,h4,h5,h6 { -color:#000; -} - -#header { -width:131%; -} - -#content { -width:92.7%; -} - -#aside_primary { -display:none; -} - -#site_nav_local_views a { -background-color:#D0DFE7; -} -#site_nav_local_views a:hover { -background-color:#FAFBFC; -} - -#form_notice .form_note + label, -#form_notice #notice_data-attach { -display:none; -} - -#form_notice #notice_action-submit { -height:47px !important; -} - - -span.facebook-button { -border: 2px solid #aaa; -padding: 3px; -display: block; -float: left; -margin-right: 20px; --moz-border-radius: 4px; -border-radius:4px; --webkit-border-radius:4px; -font-weight: bold; -background-color:#A9BF4F; -color:#fff; -font-size:1.2em -} - -span.facebook-button a { color:#fff } - -.facebook_guide { -margin-bottom:18px; -} -.facebook_guide p { -font-weight:bold; -} - - -input { -height:auto !important; -} - -#facebook-friends { -float:left; -width:100%; -} - -#facebook-friends li { -float:left; -margin-right:2%; -margin-bottom:11px; -width:18%; -height:115px; -} -#facebook-friends li a { -float:left; -} - -#add_to_profile { -position:absolute; -right:18px; -top:10px; -z-index:2; -} - -.notice div.entry-content dl, -.notice div.entry-content dt, -.notice div.entry-content dd { -margin-right:5px; -} - -#content_inner p { -margin-bottom:18px; -} - -#content_inner ul { -list-style-type:none; -} - -.form_settings label { -margin-right:18px; -} -- cgit v1.2.3-54-g00ecf From 47c659a1ba67940b537d77aacc2dba486b52f278 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 29 Oct 2009 13:31:56 +0100 Subject: Updated bookmarklet styles --- doc-src/bookmarklet | 2 +- theme/base/css/display.css | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'theme') diff --git a/doc-src/bookmarklet b/doc-src/bookmarklet index 0aa9e1e49..ff42f66b2 100644 --- a/doc-src/bookmarklet +++ b/doc-src/bookmarklet @@ -2,4 +2,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy. -Post to %%site.name%% +Post to %%site.name%% diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d9dca9815..c8aafe489 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1295,3 +1295,13 @@ display:none; .guide { clear:both; } + +#bookmarklet address { +display:none; +} +#bookmarklet #form_notice { +width:auto; +} +#bookmarklet #wrap { +min-width:0; +} -- cgit v1.2.3-54-g00ecf From f9bb95174b93de4ce28167eea21535a01394f71f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 31 Oct 2009 16:14:38 +0100 Subject: Added XHR for direct messages. --- actions/newmessage.php | 17 ++++++++++++++++- js/util.js | 28 ++++++++++++++++++++++++++++ theme/base/css/display.css | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletion(-) (limited to 'theme') diff --git a/actions/newmessage.php b/actions/newmessage.php index eac4ab210..37fca1ca2 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -223,7 +223,22 @@ class NewmessageAction extends Action } $this->msg = $msg; - $this->showPage(); + if ($this->trimmed('ajax')) { + $this->startHTML('text/xml;charset=UTF-8'); + $this->elementStart('head'); + $this->element('title', null, _('New message')); + $this->elementEnd('head'); + $this->elementStart('body'); + if (common_logged_in()) { + $this->showNoticeForm(); + } + $this->elementEnd('div'); + $this->elementEnd('body'); + $this->endHTML(); + } + else { + $this->showPage(); + } } function showPageNotice() diff --git a/js/util.js b/js/util.js index 11b06298d..c7a3e8f88 100644 --- a/js/util.js +++ b/js/util.js @@ -57,6 +57,8 @@ $(document).ready(function(){ SN.U.NoticeReply(); SN.U.NoticeDataAttach(); + + SN.U.NewDirectMessage(); } SN.U.NoticeAttachments(); @@ -350,6 +352,32 @@ var SN = { // StatusNet NDA.val(''); }); }); + }, + + NewDirectMessage: function() { + NDM = $('.entity_send-a-message a'); + NDM.attr({'href':NDM.attr('href')+'&ajax=1'}); + NDM.click(function() { + var NDMF = $('.entity_send-a-message form'); + if (NDMF.length == 0) { + $.get(NDM.attr('href'), null, function(data) { + $('.entity_send-a-message').append(document._importNode($('form', data).get(0), true)); + $('.entity_send-a-message textarea').focus(); + + NDMF = $('.entity_send-a-message form'); + NDMF.append(''); + $('.entity_send-a-message button').click(function(){ + NDMF.hide(); + return false; + }); + }); + } + else { + NDMF.show(); + $('.entity_send-a-message textarea').focus(); + } + return false; + }); } } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c8aafe489..db6b08e63 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -670,6 +670,40 @@ border-radius:4px; margin-bottom:18px; } + +.entity_send-a-message button { +position:absolute; +top:0; +right:0; +} + +.entity_send-a-message #form_notice { +position:absolute; +top:34px; +right:-1px; +padding:1.795%; +width:65%; +z-index:1; + +background-color:#FFFFFF; +border:1px solid #CCCCCC; +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-moz-border-radius:7px; +} +.entity_send-a-message #form_notice legend { +display:block; +margin-bottom:11px; +} + +.entity_send-a-message #form_notice label, +.entity_send-a-message #form_notice select { +display:none; +} +.entity_send-a-message input.submit { +text-align:center; +} + + .entity_tags ul { list-style-type:none; display:inline; -- cgit v1.2.3-54-g00ecf From d42ef1112338be06d0549adbc0b8f2ad42dcba2f Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 31 Oct 2009 17:25:41 +0100 Subject: Updated form_notice styles. .form_notice applies to both noticeform (form_notice) and messageform (form_notice-direct) --- theme/base/css/display.css | 50 +++++++++++++++++++++--------------------- theme/base/css/ie.css | 10 ++++----- theme/default/css/display.css | 10 ++++----- theme/default/css/ie.css | 4 ++-- theme/identica/css/display.css | 10 ++++----- theme/identica/css/ie.css | 4 ++-- 6 files changed, 44 insertions(+), 44 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index db6b08e63..8355a0a5c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -432,21 +432,21 @@ border-width:1px; border-style:solid; } -#form_notice { +.form_notice { width:45%; float:left; position:relative; line-height:1; } -#form_notice fieldset { +.form_notice fieldset { border:0; padding:0; position:relative; } -#form_notice legend { +.form_notice legend { display:none; } -#form_notice textarea { +.form_notice textarea { float:left; border-radius:7px; -moz-border-radius:7px; @@ -458,44 +458,44 @@ padding:7px 7px 16px 7px; position:relative; z-index:2; } -#form_notice label { +.form_notice label { display:block; float:left; font-size:1.3em; margin-bottom:7px; } -#form_notice label[for=notice_data-attach], -#form_notice #notice_data-attach { +.form_notice label[for=notice_data-attach], +.form_notice #notice_data-attach { position:absolute; top:25px; right:10.5%; cursor:pointer; } -#form_notice label[for=notice_data-attach] { +.form_notice label[for=notice_data-attach] { text-indent:-9999px; width:16px; height:16px; } -#form_notice #notice_data-attach { +.form_notice #notice_data-attach { padding:0; height:16px; } -#form_notice .form_note { +.form_notice .form_note { position:absolute; bottom:2px; right:21.715%; z-index:9; } -#form_notice .form_note dt { +.form_notice .form_note dt { font-weight:bold; display:none; } -#notice_text-count { +.form_notice #notice_text-count { font-weight:bold; line-height:1.15; padding:1px 2px; } -#form_notice #notice_action-submit { +.form_notice #notice_action-submit { width:14%; height:47px; padding:0; @@ -503,24 +503,24 @@ position:absolute; bottom:0; right:0; } -#form_notice label[for=to] { +.form_notice label[for=to] { margin-top:7px; } -#form_notice select[id=to] { +.form_notice select[id=to] { margin-bottom:7px; margin-left:18px; float:left; max-width:322px; } -#form_notice .error, -#form_notice .success { +.form_notice .error, +.form_notice .success { float:left; clear:both; width:81.5%; margin-bottom:0; line-height:1.618; } -#form_notice #notice_data-attach_selected code { +.form_notice #notice_data-attach_selected code { float:left; width:90%; display:block; @@ -528,7 +528,7 @@ font-size:1.1em; line-height:1.8; overflow:auto; } -#form_notice #notice_data-attach_selected button { +.form_notice #notice_data-attach_selected button { float:right; font-size:0.8em; } @@ -677,7 +677,7 @@ top:0; right:0; } -.entity_send-a-message #form_notice { +.entity_send-a-message .form_notice { position:absolute; top:34px; right:-1px; @@ -690,16 +690,16 @@ border:1px solid #CCCCCC; -moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); -moz-border-radius:7px; } -.entity_send-a-message #form_notice legend { +.entity_send-a-message .form_notice legend { display:block; margin-bottom:11px; } -.entity_send-a-message #form_notice label, -.entity_send-a-message #form_notice select { +.entity_send-a-message .form_notice label, +.entity_send-a-message .form_notice select { display:none; } -.entity_send-a-message input.submit { +.entity_send-a-message .form_notice input.submit { text-align:center; } @@ -1333,7 +1333,7 @@ clear:both; #bookmarklet address { display:none; } -#bookmarklet #form_notice { +#bookmarklet .form_notice { width:auto; } #bookmarklet #wrap { diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 3e128b84e..84bc1b1d6 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -3,10 +3,10 @@ input.checkbox, input.radio { top:0; } -#form_notice textarea { +.form_notice textarea { width:78%; } -#form_notice .form_note + label { +.form_notice .form_note + label { position:absolute; top:25px; left:83%; @@ -15,14 +15,14 @@ height:16px; width:16px; display:block; } -#form_notice #notice_action-submit { +.form_notice #notice_action-submit { width:17%; max-width:17%; } -#form_notice #notice_data-attach_selected { +.form_notice #notice_data-attach_selected { width:78.5%; } -#form_notice #notice_data-attach_selected button { +.form_notice #notice_data-attach_selected button { padding:0 4px; } .notice-options input.submit { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index a5f1fd6e4..5eff5842a 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -37,14 +37,14 @@ background:none; } input.submit, -#form_notice.warning #notice_text-count, +.form_notice.warning #notice_text-count, .form_settings .form_note, .entity_remote_subscribe { background-color:#9BB43E; } input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { +.form_notice.warning #notice_data-text { border-color:#9BB43E; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); @@ -84,13 +84,13 @@ background-color:#C8D1D5; #notice_text-count { color:#333333; } -#form_notice.warning #notice_text-count { +.form_notice.warning #notice_text-count { color:#000000; } -#form_notice label[for=notice_data-attach] { +.form_notice label[for=notice_data-attach] { background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; } -#form_notice #notice_data-attach { +.form_notice #notice_data-attach { opacity:0; } diff --git a/theme/default/css/ie.css b/theme/default/css/ie.css index cbbd49ce6..a0d3cd682 100644 --- a/theme/default/css/ie.css +++ b/theme/default/css/ie.css @@ -6,9 +6,9 @@ color:#FFFFFF; #site_nav_local_views a { background-color:#C8D1D5; } -#form_notice .form_note + label { +.form_notice .form_note + label { background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%; } -#form_notice #notice_data-attach { +.form_notice #notice_data-attach { filter: alpha(opacity=0); } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 6339c9314..8aedd5144 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -37,14 +37,14 @@ background:none; } input.submit, -#form_notice.warning #notice_text-count, +.form_notice.warning #notice_text-count, .form_settings .form_note, .entity_remote_subscribe { background-color:#9BB43E; } input:focus, textarea:focus, select:focus, -#form_notice.warning #notice_data-text { +.form_notice.warning #notice_data-text { border-color:#9BB43E; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); @@ -84,13 +84,13 @@ background-color:#CEE1E9; #notice_text-count { color:#333333; } -#form_notice.warning #notice_text-count { +.form_notice.warning #notice_text-count { color:#000000; } -#form_notice label[for=notice_data-attach] { +.form_notice label[for=notice_data-attach] { background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; } -#form_notice #notice_data-attach { +.form_notice #notice_data-attach { opacity:0; } diff --git a/theme/identica/css/ie.css b/theme/identica/css/ie.css index 044c32ff1..9ede1e324 100644 --- a/theme/identica/css/ie.css +++ b/theme/identica/css/ie.css @@ -6,10 +6,10 @@ color:#FFFFFF; #site_nav_local_views a { background-color:#D9DADB; } -#form_notice .form_note + label { +.form_notice .form_note + label { background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; } -#form_notice #notice_data-attach { +.form_notice #notice_data-attach { filter: alpha(opacity=0); } .notice-options form.form_favor input.submit { -- cgit v1.2.3-54-g00ecf From b975ab6c2ec8828cedeab64e4f44a1ef3a5db1b7 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 1 Nov 2009 19:48:54 +0100 Subject: Moved theme styles from identica to base --- theme/base/css/display.css | 8 ++++---- theme/identica/css/display.css | 12 ++++++++++-- 2 files changed, 14 insertions(+), 6 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 8355a0a5c..1e6cd085a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -684,11 +684,11 @@ right:-1px; padding:1.795%; width:65%; z-index:1; - -background-color:#FFFFFF; -border:1px solid #CCCCCC; --moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); + border-radius:7px; -moz-border-radius:7px; +-webkit-radius-border:7px; +border-width:1px; +border-style:solid; } .entity_send-a-message .form_notice legend { display:block; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 8aedd5144..a1e5dbdb9 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -28,7 +28,8 @@ input, textarea, select, .entity_remote_subscribe { border-color:#AAAAAA; } -#filter_tags ul li { +#filter_tags ul li, +.entity_send-a-message .form_notice { border-color:#DDDDDD; } @@ -112,7 +113,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); border-color:transparent; } #content, -#site_nav_local_views .current a { +#site_nav_local_views .current a, +.entity_send-a-message .form_notice { background-color:#FFFFFF; } @@ -197,6 +199,12 @@ background-position: 0 -718px; background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -849px; } +.entity_send-a-message .form_notice { +box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} + .entity_nudge p, .form_user_nudge input.submit { background-image:url(../../base/images/icons/icons-01.png); -- cgit v1.2.3-54-g00ecf From f471606a5048a1240162e94fbee7ed1f1cd501cc Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 1 Nov 2009 19:54:20 +0100 Subject: Updated default theme for direct message --- theme/default/css/display.css | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 5eff5842a..f943caacf 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -28,7 +28,8 @@ input, textarea, select, .entity_remote_subscribe { border-color:#AAAAAA; } -#filter_tags ul li { +#filter_tags ul li, +.entity_send-a-message .form_notice { border-color:#DDDDDD; } @@ -112,7 +113,8 @@ box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3); border-color:transparent; } #content, -#site_nav_local_views .current a { +#site_nav_local_views .current a, +.entity_send-a-message .form_notice { background-color:#FFFFFF; } @@ -197,6 +199,12 @@ background-position: 0 -718px; background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -849px; } +.entity_send-a-message .form_notice { +box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); +} + .entity_nudge p, .form_user_nudge input.submit { background-image:url(../../base/images/icons/icons-01.png); -- cgit v1.2.3-54-g00ecf From 7576c67aa6dc64218044a0d8ffb9ecb409330a6d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 1 Nov 2009 20:07:45 +0100 Subject: Updated default and identica theme to use a single instance of property:value for icons. --- theme/default/css/display.css | 50 ++++++++++++++++++++++++++++-------------- theme/identica/css/display.css | 50 ++++++++++++++++++++++++++++-------------- 2 files changed, 66 insertions(+), 34 deletions(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index f943caacf..4388c7b55 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -89,12 +89,38 @@ color:#333333; color:#000000; } .form_notice label[for=notice_data-attach] { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; +background-position:0 -328px; } .form_notice #notice_data-attach { opacity:0; } +.form_notice label[for=notice_data-attach], +#export_data li a.rss, +#export_data li a.atom, +#export_data li a.foaf, +.entity_edit a, +.entity_send-a-message a, +.entity_nudge p, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.form_group_block input.submit, +.form_group_unblock input.submit, +.form_make_admin input.submit, +.notice .attachment, +.notice-options .notice_reply, +.notice-options form.form_favor input.submit, +.notice-options form.form_disfavor input.submit, +.notice-options .notice_delete, +#new_group a, +.pagination .nav_prev a, +.pagination .nav_next a { +background-image:url(../../base/images/icons/icons-01.png); +background-repeat:no-repeat; +background-color:transparent; +} + #wrap form.processing input.submit { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; cursor:wait; @@ -154,15 +180,12 @@ background-color:#9BB43E; background-repeat:no-repeat; } #export_data li a.rss { -background-image:url(../../base/images/icons/icons-01.png); background-position:0 -130px; } #export_data li a.atom { -background-image:url(../../base/images/icons/icons-01.png); background-position:0 -64px; } #export_data li a.foaf { -background-image:url(../../base/images/icons/icons-01.png); background-position:0 1px; } @@ -192,11 +215,9 @@ background-color:#87B4C8; } .entity_edit a { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -718px; } .entity_send-a-message a { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -849px; } .entity_send-a-message .form_notice { @@ -207,39 +228,36 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); .entity_nudge p, .form_user_nudge input.submit { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -785px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -918px; } .form_make_admin input.submit { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -983px; } /* NOTICES */ .notice .attachment { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px; +background-position:0 -394px; } #attachments .attachment { background:none; } .notice-options .notice_reply { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px; +background-position:0 -589px; } .notice-options form.form_favor input.submit { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px; +background-position:0 -457px; } .notice-options form.form_disfavor input.submit { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px; +background-position:0 -523px; } .notice-options .notice_delete { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px; +background-position:0 -655px; } .notices div.entry-content, @@ -276,7 +294,7 @@ background-color:rgba(200, 200, 200, 0.300); /*END: NOTICES */ #new_group a { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px; +background-position:0 -1054px; } .pagination .nav_prev a, @@ -285,10 +303,8 @@ background-repeat:no-repeat; border-color:#C8D1D5; } .pagination .nav_prev a { -background-image:url(../../base/images/icons/icons-01.png); background-position:10% -187px; } .pagination .nav_next a { -background-image:url(../../base/images/icons/icons-01.png); background-position:105% -252px; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index a1e5dbdb9..5209c49d3 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -89,12 +89,38 @@ color:#333333; color:#000000; } .form_notice label[for=notice_data-attach] { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -328px; +background-position:0 -328px; } .form_notice #notice_data-attach { opacity:0; } +.form_notice label[for=notice_data-attach], +#export_data li a.rss, +#export_data li a.atom, +#export_data li a.foaf, +.entity_edit a, +.entity_send-a-message a, +.entity_nudge p, +.form_user_nudge input.submit, +.form_user_block input.submit, +.form_user_unblock input.submit, +.form_group_block input.submit, +.form_group_unblock input.submit, +.form_make_admin input.submit, +.notice .attachment, +.notice-options .notice_reply, +.notice-options form.form_favor input.submit, +.notice-options form.form_disfavor input.submit, +.notice-options .notice_delete, +#new_group a, +.pagination .nav_prev a, +.pagination .nav_next a { +background-image:url(../../base/images/icons/icons-01.png); +background-repeat:no-repeat; +background-color:transparent; +} + #wrap form.processing input.submit { background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%; cursor:wait; @@ -154,15 +180,12 @@ background-color:#9BB43E; background-repeat:no-repeat; } #export_data li a.rss { -background-image:url(../../base/images/icons/icons-01.png); background-position:0 -130px; } #export_data li a.atom { -background-image:url(../../base/images/icons/icons-01.png); background-position:0 -64px; } #export_data li a.foaf { -background-image:url(../../base/images/icons/icons-01.png); background-position:0 1px; } @@ -192,11 +215,9 @@ background-color:#87B4C8; } .entity_edit a { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -718px; } .entity_send-a-message a { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -849px; } .entity_send-a-message .form_notice { @@ -207,39 +228,36 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); .entity_nudge p, .form_user_nudge input.submit { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -785px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -918px; } .form_make_admin input.submit { -background-image:url(../../base/images/icons/icons-01.png); background-position: 0 -983px; } /* NOTICES */ .notice .attachment { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -394px; +background-position:0 -394px; } #attachments .attachment { background:none; } .notice-options .notice_reply { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -589px; +background-position:0 -589px; } .notice-options form.form_favor input.submit { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -457px; +background-position:0 -457px; } .notice-options form.form_disfavor input.submit { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -523px; +background-position:0 -523px; } .notice-options .notice_delete { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -655px; +background-position:0 -655px; } .notices div.entry-content, @@ -276,7 +294,7 @@ background-color:rgba(200, 200, 200, 0.300); /*END: NOTICES */ #new_group a { -background:transparent url(../../base/images/icons/icons-01.png) no-repeat 0 -1054px; +background-position:0 -1054px; } .pagination .nav_prev a, @@ -285,10 +303,8 @@ background-repeat:no-repeat; border-color:#CEE1E9; } .pagination .nav_prev a { -background-image:url(../../base/images/icons/icons-01.png); background-position:10% -187px; } .pagination .nav_next a { -background-image:url(../../base/images/icons/icons-01.png); background-position:105% -252px; } -- cgit v1.2.3-54-g00ecf From 1793cec8a56cff4b867d1c1de989e342ca53bd74 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 1 Nov 2009 20:11:51 +0100 Subject: Removed unneessary styles --- theme/default/css/display.css | 12 ------------ theme/identica/css/display.css | 12 ------------ 2 files changed, 24 deletions(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 4388c7b55..89f682d73 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -189,18 +189,6 @@ background-position:0 -64px; background-position:0 1px; } -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_nudge p, -.form_make_admin input.submit { -background-repeat: no-repeat; -background-color:transparent; -} .form_group_join input.submit, .form_group_leave input.submit .form_user_subscribe input.submit, diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 5209c49d3..ec869212d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -189,18 +189,6 @@ background-position:0 -64px; background-position:0 1px; } -.entity_edit a, -.entity_send-a-message a, -.form_user_nudge input.submit, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_nudge p, -.form_make_admin input.submit { -background-repeat: no-repeat; -background-color:transparent; -} .form_group_join input.submit, .form_group_leave input.submit .form_user_subscribe input.submit, -- cgit v1.2.3-54-g00ecf From b1367ae8da8e67686f38c99b66c25fa049dbfba3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 1 Nov 2009 20:53:25 +0100 Subject: Updated button.close styles --- js/util.js | 6 +++--- theme/base/css/display.css | 15 ++++++++++----- theme/default/css/display.css | 7 +++++++ theme/identica/css/display.css | 7 +++++++ 4 files changed, 27 insertions(+), 8 deletions(-) (limited to 'theme') diff --git a/js/util.js b/js/util.js index c5d03ce11..210459844 100644 --- a/js/util.js +++ b/js/util.js @@ -310,7 +310,7 @@ var SN = { // StatusNet imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif', bgClickToClose : true, success : function() { - $('#jOverlayContent').append(''); + $('#jOverlayContent').append(''); $('#jOverlayContent button').click($.closeOverlay); }, timeout : 0, @@ -352,7 +352,7 @@ var SN = { // StatusNet NoticeDataAttach: function() { NDA = $('#'+SN.C.S.NoticeDataAttach); NDA.change(function() { - S = '
'+$(this).val()+'
'; + S = '
'+$(this).val()+'
'; NDAS = $('#'+SN.C.S.NoticeDataAttachSelected); (NDAS.length > 0) ? NDAS.replaceWith(S) : $('#'+SN.C.S.FormNotice).append(S); $('#'+SN.C.S.NoticeDataAttachSelected+' button').click(function(){ @@ -372,7 +372,7 @@ var SN = { // StatusNet $('.entity_send-a-message').append(document._importNode($('form', data).get(0), true)); NDMF = $('.entity_send-a-message .form_notice'); SN.U.FormNoticeEnhancements(NDMF); - NDMF.append(''); + NDMF.append(''); $('.entity_send-a-message button').click(function(){ NDMF.hide(); return false; diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1e6cd085a..fb630d58a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -533,6 +533,16 @@ float:right; font-size:0.8em; } +button.close { +width:16px; +height:16px; +text-indent:-9999px; +padding:0; +border:0; +text-align:center; +font-weight:bold; +} + /* entity_profile */ .entity_profile { position:relative; @@ -1025,11 +1035,6 @@ margin-bottom:11px; position:absolute; top:0; right:0; -width:29px; -height:29px; -text-align:center; -font-weight:bold; -padding:0; } #jOverlayContent h1 { max-width:425px; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 89f682d73..40fdb255b 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -166,6 +166,13 @@ background-color:#F7E8E8; background-color:#EFF3DC; } +button.close { +background-image:url(../../base/images/icons/twotone/green/x.gif); +background-repeat:no-repeat; +background-position:0 47%; +background-color:transparent; +} + #anon_notice { background-color:#87B4C8; color:#FFFFFF; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index ec869212d..3b59652c4 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -166,6 +166,13 @@ background-color:#F7E8E8; background-color:#EFF3DC; } +button.close { +background-image:url(../../base/images/icons/twotone/green/x.gif); +background-repeat:no-repeat; +background-position:0 47%; +background-color:transparent; +} + #anon_notice { background-color:#87B4C8; color:#FFFFFF; -- cgit v1.2.3-54-g00ecf From c9f6c09af0e63a564a81ef5560de2892773a4fe2 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 2 Nov 2009 10:28:22 +0000 Subject: Updated button.close style --- theme/base/images/icons/icons-01.png | Bin 3260 -> 3422 bytes theme/base/images/icons/twotone/green/x.gif | Bin 0 -> 79 bytes theme/default/css/display.css | 8 +++----- theme/identica/css/display.css | 8 +++----- 4 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 theme/base/images/icons/twotone/green/x.gif (limited to 'theme') diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png index c4e371330..f83c30177 100644 Binary files a/theme/base/images/icons/icons-01.png and b/theme/base/images/icons/icons-01.png differ diff --git a/theme/base/images/icons/twotone/green/x.gif b/theme/base/images/icons/twotone/green/x.gif new file mode 100644 index 000000000..ffb2efea0 Binary files /dev/null and b/theme/base/images/icons/twotone/green/x.gif differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 40fdb255b..910f915a8 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -115,7 +115,8 @@ opacity:0; .notice-options .notice_delete, #new_group a, .pagination .nav_prev a, -.pagination .nav_next a { +.pagination .nav_next a, +button.close { background-image:url(../../base/images/icons/icons-01.png); background-repeat:no-repeat; background-color:transparent; @@ -167,10 +168,7 @@ background-color:#EFF3DC; } button.close { -background-image:url(../../base/images/icons/twotone/green/x.gif); -background-repeat:no-repeat; -background-position:0 47%; -background-color:transparent; +background-position:0 -1120px; } #anon_notice { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 3b59652c4..2aa087331 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -115,7 +115,8 @@ opacity:0; .notice-options .notice_delete, #new_group a, .pagination .nav_prev a, -.pagination .nav_next a { +.pagination .nav_next a, +button.close { background-image:url(../../base/images/icons/icons-01.png); background-repeat:no-repeat; background-color:transparent; @@ -167,10 +168,7 @@ background-color:#EFF3DC; } button.close { -background-image:url(../../base/images/icons/twotone/green/x.gif); -background-repeat:no-repeat; -background-position:0 47%; -background-color:transparent; +background-position:0 -1120px; } #anon_notice { -- cgit v1.2.3-54-g00ecf From d8e2d76ba93557f8c12f966b5d0afccf9fbdc83b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 2 Nov 2009 14:54:31 +0000 Subject: Typo: z-index should be 2 instead of 1 --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index fb630d58a..878662c56 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -693,7 +693,7 @@ top:34px; right:-1px; padding:1.795%; width:65%; -z-index:1; +z-index:2; border-radius:7px; -moz-border-radius:7px; -webkit-radius-border:7px; -- cgit v1.2.3-54-g00ecf From 85647719a3ed78a9b2c88e1c33f2f3bd995df03e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 6 Nov 2009 12:51:28 +0100 Subject: Updated styles for profile list re: commit 3c4ac05cde5a97594d3b0fa7e3f5dbbaf45e4c64 --- lib/profilelist.php | 3 ++- theme/base/css/display.css | 25 ++++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) (limited to 'theme') diff --git a/lib/profilelist.php b/lib/profilelist.php index 5f536e0f4..697713f8f 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -182,7 +182,8 @@ class ProfileListItem extends Widget { $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE); $this->out->elementStart('a', array('href' => $this->profile->profileurl, - 'class' => 'url')); + 'class' => 'url', + 'rel' => 'contact')); $this->out->element('img', array('src' => ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_STREAM_SIZE), 'class' => 'photo avatar', 'width' => AVATAR_STREAM_SIZE, diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 878662c56..09d92be7b 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -592,11 +592,11 @@ margin-left:0; font-size:1.1em; font-weight:bold; } -.entity_profile .entity_fn dd:before { +.entity_profile .fn:before { content: "("; font-weight:normal; } -.entity_profile .entity_fn dd:after { +.entity_profile .fn:after { content: ")"; font-weight:normal; } @@ -782,18 +782,21 @@ display:none; .profiles { list-style-type:none; } -.profile .entity_profile .entity_location { +.profile .entity_profile .url[rel=contact] { +margin-left:0; +display:inline; +} + +.profile .entity_profile .fn, +.profile .entity_profile .location { +margin-left:11px; +margin-bottom:4px; width:auto; clear:none; -margin-left:11px; } -.profile .entity_profile dl, -.profile .entity_profile dd { -display:inline; -float:none; -} -.profile .entity_profile .entity_note, -.profile .entity_profile .entity_url, + +.profile .entity_profile .note, +.profile .entity_profile .url, .profile .entity_profile .entity_tags, .profile .entity_profile .form_subscription_edit { margin-left:59px; -- cgit v1.2.3-54-g00ecf From febcdcb6a09afac4e82218d6971378d5302cd0b6 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 6 Nov 2009 13:35:21 +0100 Subject: Updated styles for profile list fn and nickname --- theme/base/css/display.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 09d92be7b..f9ed80aa9 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -600,6 +600,10 @@ font-weight:normal; content: ")"; font-weight:normal; } +.entity_profile .nickname:after, +.entity_profile .nickname:before { +content:""; +} .entity_profile dt, .entity_profile h2 { display:none; @@ -782,6 +786,7 @@ display:none; .profiles { list-style-type:none; } +.profile .entity_profile .fn.nickname, .profile .entity_profile .url[rel=contact] { margin-left:0; display:inline; -- cgit v1.2.3-54-g00ecf From 87543292d18409e7b4f3c4876172d414d39183fd Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 6 Nov 2009 15:26:13 +0100 Subject: Fixed some group list styles --- lib/grouplist.php | 2 +- theme/base/css/display.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/lib/grouplist.php b/lib/grouplist.php index 39a9b2d94..d9547acb9 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -105,7 +105,7 @@ class GroupList extends Widget 'alt' => ($this->group->fullname) ? $this->group->fullname : $this->group->nickname)); - $hasFN = ($this->group->fullname) ? 'nickname url' : 'fn org nickname url'; + $hasFN = ($this->group->fullname) ? 'nickname' : 'fn org nickname'; $this->out->elementStart('span', $hasFN); $this->out->raw($this->highlight($this->group->nickname)); $this->out->elementEnd('span'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f9ed80aa9..1bab7d965 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -787,7 +787,7 @@ display:none; list-style-type:none; } .profile .entity_profile .fn.nickname, -.profile .entity_profile .url[rel=contact] { +.profile .entity_profile .url[rel~=contact] { margin-left:0; display:inline; } -- cgit v1.2.3-54-g00ecf From 6687346dd0658e4e5a28c83b287adb09c602d086 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 16:41:38 +0100 Subject: Updated entity actions, notice options button styles --- theme/base/css/display.css | 22 +++++++++++++++++++--- theme/default/css/display.css | 31 ++++++++++++++++++++----------- theme/identica/css/display.css | 31 ++++++++++++++++++++----------- 3 files changed, 59 insertions(+), 25 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1bab7d965..ee94b9e5e 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -652,6 +652,15 @@ text-decoration:none; font-weight:bold; display:block; } +.entity_actions a, +.entity_actions input { +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +border-radius:4px; +-moz-border-radius:4px; +-webkit-border-radius:4px; +} .form_user_block input.submit, .form_user_unblock input.submit, @@ -700,7 +709,7 @@ width:65%; z-index:2; border-radius:7px; -moz-border-radius:7px; --webkit-radius-border:7px; +-webkit-border-radius:7px; border-width:1px; border-style:solid; } @@ -973,11 +982,11 @@ border:0; .notice-options .notice_reply, .notice-options .notice_delete { text-decoration:none; -padding-left:16px; } .notice-options form input.submit { width:16px; -padding:2px 0; +height:16px; +padding:0; } .notice-options .form_favor legend, .notice-options .form_disfavor legend { @@ -988,6 +997,13 @@ display:none; border:0; padding:0; } +.notice-options a { +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +width:16px; +height:16px; +} .notice .attachment { position:relative; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 910f915a8..8472fb079 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -40,16 +40,22 @@ background:none; input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, -.entity_remote_subscribe { +.entity_remote_subscribe, +.entity_actions a, +.entity_actions input, +.entity_actions p { background-color:#9BB43E; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } input:focus, textarea:focus, select:focus, -.form_notice.warning #notice_data-text { +.form_notice.warning #notice_data-text, +.form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_remote_subscribe { border-color:#9BB43E; -box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } input.submit, .entity_remote_subscribe { @@ -241,16 +247,16 @@ background-position:0 -394px; background:none; } .notice-options .notice_reply { -background-position:0 -589px; +background-position:0 -592px; } .notice-options form.form_favor input.submit { -background-position:0 -457px; +background-position:0 -460px; } .notice-options form.form_disfavor input.submit { -background-position:0 -523px; +background-position:0 -526px; } .notice-options .notice_delete { -background-position:0 -655px; +background-position:0 -658px; } .notices div.entry-content, @@ -261,9 +267,12 @@ opacity:0.4; .notices li:hover div.notice-options { opacity:1; } -div.notice-options a, -div.notice-options input { +.notice-options a, +.notice-options input { font-family:sans-serif; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } #content .notices li:hover { background-color:rgba(240, 240, 240, 0.2); diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 2aa087331..3647e21fd 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -40,16 +40,22 @@ background:none; input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, -.entity_remote_subscribe { +.entity_remote_subscribe, +.entity_actions a, +.entity_actions input, +.entity_actions p { background-color:#9BB43E; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } input:focus, textarea:focus, select:focus, -.form_notice.warning #notice_data-text { +.form_notice.warning #notice_data-text, +.form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_remote_subscribe { border-color:#9BB43E; -box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } input.submit, .entity_remote_subscribe { @@ -241,16 +247,16 @@ background-position:0 -394px; background:none; } .notice-options .notice_reply { -background-position:0 -589px; +background-position:0 -592px; } .notice-options form.form_favor input.submit { -background-position:0 -457px; +background-position:0 -460px; } .notice-options form.form_disfavor input.submit { -background-position:0 -523px; +background-position:0 -526px; } .notice-options .notice_delete { -background-position:0 -655px; +background-position:0 -658px; } .notices div.entry-content, @@ -261,9 +267,12 @@ opacity:0.4; .notices li:hover div.notice-options { opacity:1; } -div.notice-options a, -div.notice-options input { +.notice-options a, +.notice-options input { font-family:sans-serif; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } #content .notices li:hover { background-color:rgba(240, 240, 240, 0.2); -- cgit v1.2.3-54-g00ecf From 0f55135b523eaaca2ac0251f83d0f0066ce4b3ff Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 18:41:03 +0100 Subject: Updated the styles for action icons --- theme/base/css/display.css | 24 ++++------- theme/base/images/icons/icons-01.png | Bin 3422 -> 3930 bytes theme/base/images/icons/twotone/green/minus.gif | Bin 0 -> 90 bytes theme/base/images/icons/twotone/green/plus.gif | Bin 0 -> 74 bytes theme/default/css/display.css | 51 ++++++++++++++++++----- theme/identica/css/display.css | 52 ++++++++++++++++++------ 6 files changed, 89 insertions(+), 38 deletions(-) create mode 100644 theme/base/images/icons/twotone/green/minus.gif create mode 100644 theme/base/images/icons/twotone/green/plus.gif (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ee94b9e5e..abc3423ed 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -618,7 +618,7 @@ font-style:italic; .entity_actions { float:right; margin-left:2.35%; -max-width:25%; +width:22%; } .entity_actions h2 { display:none; @@ -627,7 +627,7 @@ display:none; list-style-type:none; } .entity_actions li { -margin-bottom:4px; +margin-bottom:7px; } .entity_actions li:first-child { border-top:0; @@ -662,23 +662,17 @@ border-radius:4px; -webkit-border-radius:4px; } -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_send-a-message a, -.entity_edit a, -.form_user_nudge input.submit, -.entity_nudge p, -.form_make_admin input.submit { +.entity_actions a, +.entity_actions input, +.entity_actions p { border:0; -padding-left:20px; +padding-left:23px; } .entity_edit a, .entity_send-a-message a, .entity_nudge p { -padding:4px 4px 4px 23px; +padding:4px 4px 4px 26px; } .entity_remote_subscribe { @@ -696,8 +690,8 @@ margin-bottom:18px; .entity_send-a-message button { position:absolute; -top:0; -right:0; +top:3px; +right:3px; } .entity_send-a-message .form_notice { diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png index f83c30177..c0f087a21 100644 Binary files a/theme/base/images/icons/icons-01.png and b/theme/base/images/icons/icons-01.png differ diff --git a/theme/base/images/icons/twotone/green/minus.gif b/theme/base/images/icons/twotone/green/minus.gif new file mode 100644 index 000000000..461cd8cb2 Binary files /dev/null and b/theme/base/images/icons/twotone/green/minus.gif differ diff --git a/theme/base/images/icons/twotone/green/plus.gif b/theme/base/images/icons/twotone/green/plus.gif new file mode 100644 index 000000000..4407d0b2d Binary files /dev/null and b/theme/base/images/icons/twotone/green/plus.gif differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 8472fb079..c1bc8a79f 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -37,19 +37,32 @@ border-color:#DDDDDD; background:none; } +input.submit, +.form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_remote_subscribe, +.entity_actions .form_notice input.submit { +background-color:#9BB43E; +} input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, .entity_remote_subscribe, .entity_actions a, .entity_actions input, -.entity_actions p { +.entity_actions p, +button.close { background-color:#9BB43E; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } - +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-color:transparent; +background-color:transparent; +} input:focus, textarea:focus, select:focus, .form_notice.warning #notice_data-text, .form_notice.warning #notice_text-count, @@ -58,7 +71,8 @@ input:focus, textarea:focus, select:focus, border-color:#9BB43E; } input.submit, -.entity_remote_subscribe { +.entity_remote_subscribe, +.entity_actions .form_notice input.submit { color:#FFFFFF; } @@ -72,7 +86,10 @@ div.notice-options input, .form_user_nudge input.submit, .entity_nudge p, .form_settings input.form_action-primary, -.form_make_admin input.submit { +.form_make_admin input.submit, +.entity_actions a, +.entity_actions input, +.entity_actions p { color:#002FA7; } @@ -122,7 +139,11 @@ opacity:0; #new_group a, .pagination .nav_prev a, .pagination .nav_next a, -button.close { +button.close, +.form_group_leave input.submit, +.form_user_unsubscribe input.submit, +.form_group_join input.submit, +.form_user_subscribe input.submit { background-image:url(../../base/images/icons/icons-01.png); background-repeat:no-repeat; background-color:transparent; @@ -201,7 +222,7 @@ background-position:0 1px; } .form_group_join input.submit, -.form_group_leave input.submit +.form_group_leave input.submit, .form_user_subscribe input.submit, .form_user_unsubscribe input.submit { background-color:#9BB43E; @@ -212,12 +233,20 @@ color:#FFFFFF; .form_user_authorization input.reject { background-color:#87B4C8; } +.form_group_leave input.submit, +.form_user_unsubscribe input.submit { +background-position:5px -1246px; +} +.form_group_join input.submit, +.form_user_subscribe input.submit { +background-position:5px -1181px; +} .entity_edit a { -background-position: 0 -718px; +background-position: 5px -718px; } .entity_send-a-message a { -background-position: 0 -849px; +background-position: 5px -849px; } .entity_send-a-message .form_notice { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); @@ -227,16 +256,16 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); .entity_nudge p, .form_user_nudge input.submit { -background-position: 0 -785px; +background-position: 5px -785px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-position: 0 -918px; +background-position: 5px -918px; } .form_make_admin input.submit { -background-position: 0 -983px; +background-position: 5px -983px; } /* NOTICES */ diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 3647e21fd..064653ae5 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -37,19 +37,31 @@ border-color:#DDDDDD; background:none; } +input.submit, +.form_notice.warning #notice_text-count, +.form_settings .form_note, +.entity_remote_subscribe, +.entity_actions .form_notice input.submit { +background-color:#9BB43E; +} input.submit, .form_notice.warning #notice_text-count, .form_settings .form_note, .entity_remote_subscribe, .entity_actions a, .entity_actions input, -.entity_actions p { -background-color:#9BB43E; +.entity_actions p, +button.close { box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } - +.entity_actions a, +.entity_actions input, +.entity_actions p { +border-color:transparent; +background-color:transparent; +} input:focus, textarea:focus, select:focus, .form_notice.warning #notice_data-text, .form_notice.warning #notice_text-count, @@ -58,7 +70,8 @@ input:focus, textarea:focus, select:focus, border-color:#9BB43E; } input.submit, -.entity_remote_subscribe { +.entity_remote_subscribe, +.entity_actions .form_notice input.submit { color:#FFFFFF; } @@ -72,7 +85,10 @@ div.notice-options input, .form_user_nudge input.submit, .entity_nudge p, .form_settings input.form_action-primary, -.form_make_admin input.submit { +.form_make_admin input.submit, +.entity_actions a, +.entity_actions input, +.entity_actions p { color:#002FA7; } @@ -122,7 +138,11 @@ opacity:0; #new_group a, .pagination .nav_prev a, .pagination .nav_next a, -button.close { +button.close, +.form_group_leave input.submit, +.form_user_unsubscribe input.submit, +.form_group_join input.submit, +.form_user_subscribe input.submit { background-image:url(../../base/images/icons/icons-01.png); background-repeat:no-repeat; background-color:transparent; @@ -201,7 +221,7 @@ background-position:0 1px; } .form_group_join input.submit, -.form_group_leave input.submit +.form_group_leave input.submit, .form_user_subscribe input.submit, .form_user_unsubscribe input.submit { background-color:#9BB43E; @@ -212,12 +232,20 @@ color:#FFFFFF; .form_user_authorization input.reject { background-color:#87B4C8; } +.form_group_leave input.submit, +.form_user_unsubscribe input.submit { +background-position:5px -1246px; +} +.form_group_join input.submit, +.form_user_subscribe input.submit { +background-position:5px -1181px; +} .entity_edit a { -background-position: 0 -718px; +background-position: 5px -718px; } .entity_send-a-message a { -background-position: 0 -849px; +background-position: 5px -849px; } .entity_send-a-message .form_notice { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); @@ -227,16 +255,16 @@ box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); .entity_nudge p, .form_user_nudge input.submit { -background-position: 0 -785px; +background-position: 5px -785px; } .form_user_block input.submit, .form_user_unblock input.submit, .form_group_block input.submit, .form_group_unblock input.submit { -background-position: 0 -918px; +background-position: 5px -918px; } .form_make_admin input.submit { -background-position: 0 -983px; +background-position: 5px -983px; } /* NOTICES */ -- cgit v1.2.3-54-g00ecf From 613078e467bb88e8feb9d5aa03e8ce1675696bf4 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:19:42 +0100 Subject: Updated pagination styles and removed notice option input roundness --- theme/base/css/display.css | 3 +++ theme/default/css/display.css | 5 ++++- theme/identica/css/display.css | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index abc3423ed..68b95b307 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -981,6 +981,9 @@ text-decoration:none; width:16px; height:16px; padding:0; +border-radius:0; +-moz-border-radius:0; +-webkit-border-radius:0; } .notice-options .form_favor legend, .notice-options .form_disfavor legend { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index c1bc8a79f..10c36ef9c 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -331,7 +331,10 @@ background-position:0 -1054px; .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; -border-color:#C8D1D5; +border-color:#DDDDDD; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } .pagination .nav_prev a { background-position:10% -187px; diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 064653ae5..8174795e3 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -330,7 +330,10 @@ background-position:0 -1054px; .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; -border-color:#CEE1E9; +border-color:#DDDDDD; +box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); } .pagination .nav_prev a { background-position:10% -187px; -- cgit v1.2.3-54-g00ecf From a580689d4083655b414c3585d7fca26afbe73f0e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:34:52 +0100 Subject: Updated subscribe/unsubscribe button styles --- theme/base/css/display.css | 3 ++- theme/default/css/display.css | 12 ++++-------- theme/identica/css/display.css | 12 ++++-------- 3 files changed, 10 insertions(+), 17 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 68b95b307..f2dc5f05d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -618,7 +618,8 @@ font-style:italic; .entity_actions { float:right; margin-left:2.35%; -width:22%; +margin-bottom:18px; +max-width:21%; } .entity_actions h2 { display:none; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 10c36ef9c..419a91d2f 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -29,7 +29,9 @@ input, textarea, select, border-color:#AAAAAA; } #filter_tags ul li, -.entity_send-a-message .form_notice { +.entity_send-a-message .form_notice, +.pagination .nav_prev a, +.pagination .nav_next a { border-color:#DDDDDD; } @@ -225,14 +227,9 @@ background-position:0 1px; .form_group_leave input.submit, .form_user_subscribe input.submit, .form_user_unsubscribe input.submit { -background-color:#9BB43E; +background-color:#AAAAAA; color:#FFFFFF; } -.form_user_unsubscribe input.submit, -.form_group_leave input.submit, -.form_user_authorization input.reject { -background-color:#87B4C8; -} .form_group_leave input.submit, .form_user_unsubscribe input.submit { background-position:5px -1246px; @@ -331,7 +328,6 @@ background-position:0 -1054px; .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; -border-color:#DDDDDD; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 8174795e3..9628ccac4 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -29,7 +29,9 @@ input, textarea, select, border-color:#AAAAAA; } #filter_tags ul li, -.entity_send-a-message .form_notice { +.entity_send-a-message .form_notice, +.pagination .nav_prev a, +.pagination .nav_next a { border-color:#DDDDDD; } @@ -224,14 +226,9 @@ background-position:0 1px; .form_group_leave input.submit, .form_user_subscribe input.submit, .form_user_unsubscribe input.submit { -background-color:#9BB43E; +background-color:#AAAAAA; color:#FFFFFF; } -.form_user_unsubscribe input.submit, -.form_group_leave input.submit, -.form_user_authorization input.reject { -background-color:#87B4C8; -} .form_group_leave input.submit, .form_user_unsubscribe input.submit { background-position:5px -1246px; @@ -330,7 +327,6 @@ background-position:0 -1054px; .pagination .nav_prev a, .pagination .nav_next a { background-repeat:no-repeat; -border-color:#DDDDDD; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -- cgit v1.2.3-54-g00ecf From bbfe29b9deb1543fce5138289ee6ecbde56d73e3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:40:54 +0100 Subject: Updated nudge styles --- theme/base/css/display.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index f2dc5f05d..4327fc45d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -654,7 +654,8 @@ font-weight:bold; display:block; } .entity_actions a, -.entity_actions input { +.entity_actions input, +.entity_actions p { box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -- cgit v1.2.3-54-g00ecf From a5d624f9a035f776cf5ca2e9db40a864594aeeda Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:43:10 +0100 Subject: Using fixed width for entity_actions --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 4327fc45d..fe3cf9cb4 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -619,7 +619,7 @@ font-style:italic; float:right; margin-left:2.35%; margin-bottom:18px; -max-width:21%; +width:21%; } .entity_actions h2 { display:none; -- cgit v1.2.3-54-g00ecf From 0d008ddab93c06ec22e04b9fbbe78ca6ac3f59b8 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:55:40 +0100 Subject: Removed some unnecessary styles --- theme/base/css/display.css | 2 +- theme/default/css/display.css | 10 +--------- theme/identica/css/display.css | 10 +--------- 3 files changed, 3 insertions(+), 19 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index fe3cf9cb4..a7e1faad6 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -647,7 +647,7 @@ text-align:left; width:100%; } .entity_actions a, -.entity_nudge p, +.entity_actions p, .entity_remote_subscribe { text-decoration:none; font-weight:bold; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 419a91d2f..369e393da 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -79,16 +79,8 @@ color:#FFFFFF; } a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, .form_settings input.form_action-primary, -.form_make_admin input.submit, +.notice-options input, .entity_actions a, .entity_actions input, .entity_actions p { diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 9628ccac4..06db5c325 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -78,16 +78,8 @@ color:#FFFFFF; } a, -div.notice-options input, -.form_user_block input.submit, -.form_user_unblock input.submit, -.form_group_block input.submit, -.form_group_unblock input.submit, -.entity_send-a-message a, -.form_user_nudge input.submit, -.entity_nudge p, .form_settings input.form_action-primary, -.form_make_admin input.submit, +.notice-options input, .entity_actions a, .entity_actions input, .entity_actions p { -- cgit v1.2.3-54-g00ecf From 91784c0dfc43f814e0dba144fd4da1953eb816bf Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 20:02:14 +0100 Subject: Fixed alignment for new entity_action buttons --- theme/base/css/display.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index a7e1faad6..220f2f03a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -671,9 +671,8 @@ border:0; padding-left:23px; } -.entity_edit a, -.entity_send-a-message a, -.entity_nudge p { +.entity_actions a, +.entity_actions p { padding:4px 4px 4px 26px; } -- cgit v1.2.3-54-g00ecf From 1b902bcc45e7b0adfc57a995a8d885e76ce2d44b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:05:07 +0000 Subject: Fixed alignment for entity action anchors and responses --- plugins/UserFlag/UserFlagPlugin.php | 2 +- theme/base/css/display.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php index fbe5fd351..6910ff332 100644 --- a/plugins/UserFlag/UserFlagPlugin.php +++ b/plugins/UserFlag/UserFlagPlugin.php @@ -102,7 +102,7 @@ class UserFlagPlugin extends Plugin $action->elementStart('li', 'entity_flag'); if (User_flag_profile::exists($profile->id, $user->id)) { - $action->element('span', array(), + $action->element('p', array(), _('Flagged for review')); } else { $form = new FlagProfileForm($action, $profile, diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 220f2f03a..7cc944082 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -673,7 +673,7 @@ padding-left:23px; .entity_actions a, .entity_actions p { -padding:4px 4px 4px 26px; +padding:4px 4px 1px 26px; } .entity_remote_subscribe { -- cgit v1.2.3-54-g00ecf From 2542305b2f4f793e44fa16e47165456fcb7460d5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 19:13:31 +0000 Subject: Removed entity_actions response style (i.e., doesn't look like a button) --- theme/base/css/display.css | 9 +-------- theme/default/css/display.css | 1 - theme/identica/css/display.css | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 7cc944082..091bc410f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -654,11 +654,7 @@ font-weight:bold; display:block; } .entity_actions a, -.entity_actions input, -.entity_actions p { -box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); +.entity_actions input { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; @@ -996,9 +992,6 @@ border:0; padding:0; } .notice-options a { -box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); --webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); width:16px; height:16px; } diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 369e393da..048b85fda 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -52,7 +52,6 @@ input.submit, .entity_remote_subscribe, .entity_actions a, .entity_actions input, -.entity_actions p, button.close { background-color:#9BB43E; box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 06db5c325..7d9f0ea2d 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -52,7 +52,6 @@ input.submit, .entity_remote_subscribe, .entity_actions a, .entity_actions input, -.entity_actions p, button.close { box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -- cgit v1.2.3-54-g00ecf From c2e6673b1777666ce60f645ba2fed9172115e145 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 20:18:39 +0000 Subject: Changed icons file to gif because of colour correction. Reduced file size also --- theme/base/images/icons/icons-01.gif | Bin 0 -> 2913 bytes theme/base/images/icons/icons-01.png | Bin 3930 -> 0 bytes theme/default/css/display.css | 2 +- theme/identica/css/display.css | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 theme/base/images/icons/icons-01.gif delete mode 100644 theme/base/images/icons/icons-01.png (limited to 'theme') diff --git a/theme/base/images/icons/icons-01.gif b/theme/base/images/icons/icons-01.gif new file mode 100644 index 000000000..f19d6a3f6 Binary files /dev/null and b/theme/base/images/icons/icons-01.gif differ diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png deleted file mode 100644 index c0f087a21..000000000 Binary files a/theme/base/images/icons/icons-01.png and /dev/null differ diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 048b85fda..87bd367e0 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -137,7 +137,7 @@ button.close, .form_user_unsubscribe input.submit, .form_group_join input.submit, .form_user_subscribe input.submit { -background-image:url(../../base/images/icons/icons-01.png); +background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 7d9f0ea2d..f93861819 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -136,7 +136,7 @@ button.close, .form_user_unsubscribe input.submit, .form_group_join input.submit, .form_user_subscribe input.submit { -background-image:url(../../base/images/icons/icons-01.png); +background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; } -- cgit v1.2.3-54-g00ecf From dc6b2d3ac8487c18715492629bddaabf4c86b092 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 20:31:29 +0000 Subject: Fixed subscribe button styles --- theme/identica/css/display.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index f93861819..0d09241f3 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -135,7 +135,8 @@ button.close, .form_group_leave input.submit, .form_user_unsubscribe input.submit, .form_group_join input.submit, -.form_user_subscribe input.submit { +.form_user_subscribe input.submit, +.entity_subscribe a { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -216,7 +217,8 @@ background-position:0 1px; .form_group_join input.submit, .form_group_leave input.submit, .form_user_subscribe input.submit, -.form_user_unsubscribe input.submit { +.form_user_unsubscribe input.submit, +.entity_subscribe a { background-color:#AAAAAA; color:#FFFFFF; } @@ -225,7 +227,8 @@ color:#FFFFFF; background-position:5px -1246px; } .form_group_join input.submit, -.form_user_subscribe input.submit { +.form_user_subscribe input.submit, +.entity_subscribe a { background-position:5px -1181px; } -- cgit v1.2.3-54-g00ecf From 2a8b6c49a165aa437d9e99b996d433531fa4d195 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 20:47:24 +0000 Subject: Minor alignment --- theme/base/css/display.css | 2 +- theme/default/css/display.css | 2 +- theme/identica/css/display.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 091bc410f..c3ff4d92c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -669,7 +669,7 @@ padding-left:23px; .entity_actions a, .entity_actions p { -padding:4px 4px 1px 26px; +padding:1px 4px 1px 26px; } .entity_remote_subscribe { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 87bd367e0..fee5316c1 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -234,7 +234,7 @@ background-position:5px -1181px; background-position: 5px -718px; } .entity_send-a-message a { -background-position: 5px -849px; +background-position: 5px -852px; } .entity_send-a-message .form_notice { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 0d09241f3..ae9cb2b19 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -236,7 +236,7 @@ background-position:5px -1181px; background-position: 5px -718px; } .entity_send-a-message a { -background-position: 5px -849px; +background-position: 5px -852px; } .entity_send-a-message .form_notice { box-shadow:3px 7px 5px rgba(194, 194, 194, 0.7); -- cgit v1.2.3-54-g00ecf From 9f9ae8c10becc6ba6b2dee9d80db4e73a83c1383 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 8 Nov 2009 20:53:11 +0000 Subject: entity_action responses look more inactive now --- theme/base/css/display.css | 1 - theme/default/css/display.css | 3 +-- theme/identica/css/display.css | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index c3ff4d92c..cdc17d67f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -647,7 +647,6 @@ text-align:left; width:100%; } .entity_actions a, -.entity_actions p, .entity_remote_subscribe { text-decoration:none; font-weight:bold; diff --git a/theme/default/css/display.css b/theme/default/css/display.css index fee5316c1..8799b0b09 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -81,8 +81,7 @@ a, .form_settings input.form_action-primary, .notice-options input, .entity_actions a, -.entity_actions input, -.entity_actions p { +.entity_actions input { color:#002FA7; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index ae9cb2b19..4e3bc5980 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -80,8 +80,7 @@ a, .form_settings input.form_action-primary, .notice-options input, .entity_actions a, -.entity_actions input, -.entity_actions p { +.entity_actions input { color:#002FA7; } -- cgit v1.2.3-54-g00ecf From ff81384ee35347b52360ef17e3537bd741a20568 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Mon, 9 Nov 2009 11:10:24 +0000 Subject: Fixed notice option alignment in IE --- theme/base/css/ie.css | 3 --- 1 file changed, 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css index 84bc1b1d6..4e50aadbe 100644 --- a/theme/base/css/ie.css +++ b/theme/base/css/ie.css @@ -27,11 +27,8 @@ padding:0 4px; } .notice-options input.submit { font-size:0; -margin-top:3px; -height:16px; text-align:right; text-indent:0; -width:24px; } .notice div.entry-content .timestamp a { margin-right:4px; -- cgit v1.2.3-54-g00ecf From 0d8e9faaa182c4923eec6d329773516e81c7edf9 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 11 Nov 2009 12:21:18 +0000 Subject: Added mark-top styles --- theme/base/css/display.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index cdc17d67f..1be66fe5a 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -839,6 +839,10 @@ margin-left:2%; width:98%; float:left; } +.mark-top { +border-top-width:1px; +border-top-style:solid; +} /* NOTICES */ #notices_primary { -- cgit v1.2.3-54-g00ecf From e8e0cdb4d6f2e35389092dd173104b064c14b12c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 13 Nov 2009 13:21:16 +0000 Subject: Added .processing styles for pagination --- theme/identica/css/display.css | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'theme') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 4e3bc5980..69f58bc21 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -330,3 +330,19 @@ background-position:10% -187px; .pagination .nav_next a { background-position:105% -252px; } +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +background-repeat:no-repeat; +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +outline:none; +} +.pagination .nav_next a.processing { +background-position:90% 47%; +} +.pagination .nav_prev a.processing { +background-position:10% 47%; +} + + -- cgit v1.2.3-54-g00ecf From 9a2a01c51e1fd9a344680087014329df00e74b5b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 13 Nov 2009 19:35:27 +0000 Subject: Rearranged selectors for processing style --- theme/identica/css/display.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 69f58bc21..94bef339f 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -178,6 +178,11 @@ background-color:rgba(255, 255, 255, 0.7); #site_nav_local_views .current a { text-shadow: rgba(194,194,194,0.5) 1px 1px 1px; } +.processing { +background-image:url(../../base/images/icons/icon_processing.gif); +background-repeat:no-repeat; +background-position:47% 47%; +} .error { background-color:#F7E8E8; @@ -332,7 +337,6 @@ background-position:105% -252px; } .pagination .nav .processing { background-image:url(../../base/images/icons/icon_processing.gif); -background-repeat:no-repeat; box-shadow:none; -moz-box-shadow:none; -webkit-box-shadow:none; @@ -345,4 +349,3 @@ background-position:90% 47%; background-position:10% 47%; } - -- cgit v1.2.3-54-g00ecf From a256aee9bf81f65bede97f53a22625f1ac42ffc5 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 14 Nov 2009 11:57:27 +0100 Subject: Removed list style from .xoxo --- theme/base/css/display.css | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1be66fe5a..a6a93c405 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -93,14 +93,17 @@ border-radius:4px; -webkit-border-radius:4px; margin-bottom:18px; } + +.xoxo li { +list-style-type:none; +} + form label.submit { display:none; } - .form_settings { clear:both; } - .form_settings fieldset { margin-bottom:29px; } -- cgit v1.2.3-54-g00ecf From b44f5753d523ea7aedfe64dc2bcbb027d81872f2 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Tue, 17 Nov 2009 21:48:00 +0000 Subject: Update form_settings layout --- theme/base/css/display.css | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index a6a93c405..96e169d6d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -120,16 +120,21 @@ float:left; .form_settings .form_data textarea, .form_settings .form_data select, .form_settings .form_data input { -margin-left:11px; +margin-left:1.795%; float:left; +width:39%; +} +.form_settings .form_data textarea { +width:63%; } + .form_settings .form_data input.submit { margin-left:0; } .form_settings label { margin-top:2px; -width:152px; +width:24%; } .form_actions label { @@ -166,7 +171,7 @@ display:none; .form_settings .form_data p.form_guide { clear:both; -margin-left:163px; +margin-left:26%; margin-bottom:0; } @@ -224,6 +229,10 @@ margin-left:29px; #form_search .submit { margin-left:11px; } +#form_search .form_data input { +width:auto; +} + address { float:left; @@ -1340,6 +1349,7 @@ display:block; #settings_design_color .form_data .swatch { padding:11px; margin-left:0; +width:auto; } .instructions ul { -- cgit v1.2.3-54-g00ecf From 12025f43252d5b689a8429c8e892fda4b67f0d8d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:06:46 +0000 Subject: Relaxed the CSS selector for design settings so it can be used in different forms. --- theme/base/css/display.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 96e169d6d..08f20ed95 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -1325,16 +1325,16 @@ clear:both; margin-bottom:0; } -#form_settings_design #settings_design_background-image img { +#settings_design_background-image img { max-width:480px; max-height:480px; } -#form_settings_design #settings_design_color .form_data, -#form_settings_design #color-picker { +#settings_design_color .form_data, +#color-picker { float:left; } -#form_settings_design #settings_design_color .form_data { +#settings_design_color .form_data { width:400px; margin-right:28px; } -- cgit v1.2.3-54-g00ecf From bbead9d71b75cfd1c7e7521c6649d38c9b92f3ab Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:21:52 +0000 Subject: Relaxed the width for form select --- theme/base/css/display.css | 3 +++ 1 file changed, 3 insertions(+) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 08f20ed95..bfd9b0b27 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -127,6 +127,9 @@ width:39%; .form_settings .form_data textarea { width:63%; } +.form_settings .form_data select { +width:auto; +} .form_settings .form_data input.submit { margin-left:0; -- cgit v1.2.3-54-g00ecf From c988161c3dcc1bf33c868a12f030e909604abdd1 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:23:06 +0000 Subject: Separated width selectors for form_data form controls --- theme/base/css/display.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index bfd9b0b27..1057572da 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -122,14 +122,13 @@ float:left; .form_settings .form_data input { margin-left:1.795%; float:left; +} +.form_settings .form_data input { width:39%; } .form_settings .form_data textarea { width:63%; } -.form_settings .form_data select { -width:auto; -} .form_settings .form_data input.submit { margin-left:0; -- cgit v1.2.3-54-g00ecf From 4fc99f8246e166da537b9a025e629677c3ae2ef3 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:47:04 +0000 Subject: Updated admin design form markup --- actions/designadminpanel.php | 11 +++++++++++ theme/base/css/display.css | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'theme') diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 6b40ae021..d1aadc8c2 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -401,6 +401,9 @@ class DesignAdminPanelForm extends Form $themes = array_combine($themes, $themes); + $this->out->elementStart('fieldset', array('id' => + 'settings_design_theme')); + $this->out->element('legend', null, _('Change theme')); $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li'); @@ -408,7 +411,14 @@ class DesignAdminPanelForm extends Form $themes, _('Theme for the site.'), false, $this->value('theme')); $this->out->elementEnd('li'); + $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); + + $this->out->elementStart('fieldset', array('id' => + 'settings_design_background-image')); + $this->out->element('legend', null, _('Change background image')); + $this->out->elementStart('ul', 'form_data'); $this->out->elementStart('li'); $this->out->element('label', array('for' => 'design_background-image_file'), _('Background')); @@ -474,6 +484,7 @@ class DesignAdminPanelForm extends Form } $this->out->elementEnd('ul'); + $this->out->elementEnd('fieldset'); $this->out->elementStart('fieldset', array('id' => 'settings_design_color')); $this->out->element('legend', null, _('Change colours')); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 1057572da..2df322f13 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -167,7 +167,8 @@ font-weight:bold; #form_password_recover legend, #form_password_change legend, .form_entity_block legend, -#form_filter_bytag legend { +#form_filter_bytag legend, +#settings_design_theme legend { display:none; } -- cgit v1.2.3-54-g00ecf From 9e756d6b152948d1a1df5da8b1eb5eb40e4cde0c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 09:56:52 +0000 Subject: Updated default theme to match identica theme --- theme/default/css/display.css | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 8799b0b09..6edc66ad2 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -135,7 +135,8 @@ button.close, .form_group_leave input.submit, .form_user_unsubscribe input.submit, .form_group_join input.submit, -.form_user_subscribe input.submit { +.form_user_subscribe input.submit, +.entity_subscribe a { background-image:url(../../base/images/icons/icons-01.gif); background-repeat:no-repeat; background-color:transparent; @@ -178,6 +179,12 @@ background-color:rgba(255, 255, 255, 0.7); #site_nav_local_views .current a { text-shadow: rgba(194,194,194,0.5) 1px 1px 1px; } +.processing { +background-image:url(../../base/images/icons/icon_processing.gif); +background-repeat:no-repeat; +background-position:47% 47%; +} + .error { background-color:#F7E8E8; @@ -216,7 +223,8 @@ background-position:0 1px; .form_group_join input.submit, .form_group_leave input.submit, .form_user_subscribe input.submit, -.form_user_unsubscribe input.submit { +.form_user_unsubscribe input.submit, +.entity_subscribe a { background-color:#AAAAAA; color:#FFFFFF; } @@ -225,7 +233,8 @@ color:#FFFFFF; background-position:5px -1246px; } .form_group_join input.submit, -.form_user_subscribe input.submit { +.form_user_subscribe input.submit, +.entity_subscribe a { background-position:5px -1181px; } @@ -328,3 +337,17 @@ background-position:10% -187px; .pagination .nav_next a { background-position:105% -252px; } +.pagination .nav .processing { +background-image:url(../../base/images/icons/icon_processing.gif); +box-shadow:none; +-moz-box-shadow:none; +-webkit-box-shadow:none; +outline:none; +} +.pagination .nav_next a.processing { +background-position:90% 47%; +} +.pagination .nav_prev a.processing { +background-position:10% 47%; +} + -- cgit v1.2.3-54-g00ecf From b5ed698bd24fa6587f9b841b49c09698504477ea Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 10:35:27 +0000 Subject: Setting the width to particular form_settings inputs to auto --- theme/base/css/display.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 2df322f13..ccac7af2c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -126,6 +126,11 @@ float:left; .form_settings .form_data input { width:39%; } +.form_settings .form_data input.submit, +.form_settings .form_data input.checkbox, +.form_settings .form_data input.radio { +width:auto; +} .form_settings .form_data textarea { width:63%; } @@ -561,7 +566,7 @@ font-weight:bold; /* entity_profile */ .entity_profile { position:relative; -width:74.702%; +width:73%; min-height:123px; float:left; margin-bottom:18px; @@ -632,9 +637,9 @@ font-style:italic; /*entity_actions*/ .entity_actions { float:right; -margin-left:2.35%; +margin-left:2%; margin-bottom:18px; -width:21%; +max-width:25%; } .entity_actions h2 { display:none; -- cgit v1.2.3-54-g00ecf From 1c1c9ccc2a553587115969b460e0e444ef33fe1e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 12:16:11 +0000 Subject: Settling on min-width for entity_actions because 1. better i18n 2. doesn't alter the width when the action is processed. --- theme/base/css/display.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index ccac7af2c..e5f5df68c 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -639,7 +639,7 @@ font-style:italic; float:right; margin-left:2%; margin-bottom:18px; -max-width:25%; +min-width:21%; } .entity_actions h2 { display:none; -- cgit v1.2.3-54-g00ecf From ad627ac45137cb11c9f5d961ac93cd192a2fc423 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Wed, 18 Nov 2009 16:08:11 +0000 Subject: Updated button styles. By default, all buttons will have a drop-shadow --- theme/default/css/display.css | 3 +-- theme/identica/css/display.css | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/default/css/display.css b/theme/default/css/display.css index 6edc66ad2..a4f03fbf1 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -52,8 +52,7 @@ input.submit, .entity_remote_subscribe, .entity_actions a, .entity_actions input, -button.close { -background-color:#9BB43E; +button { box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index 94bef339f..eb21ea65b 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -52,7 +52,7 @@ input.submit, .entity_remote_subscribe, .entity_actions a, .entity_actions input, -button.close { +button { box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3); -- cgit v1.2.3-54-g00ecf From 4d589e4c2d5c815fb798a6642f4d676b9fda8f7b Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 07:40:03 +0000 Subject: Updated markup and style for design admin fieldsets --- actions/designadminpanel.php | 6 +++--- theme/base/css/display.css | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'theme') diff --git a/actions/designadminpanel.php b/actions/designadminpanel.php index 156c3f1ab..7c71c032a 100644 --- a/actions/designadminpanel.php +++ b/actions/designadminpanel.php @@ -408,7 +408,7 @@ class DesignAdminPanelForm extends AdminForm function formData() { - $this->out->elementStart('fieldset', array('id' => 'settings_logo')); + $this->out->elementStart('fieldset', array('id' => 'settings_design_logo')); $this->out->element('legend', null, _('Change logo')); $this->out->elementStart('ul', 'form_data'); @@ -420,7 +420,7 @@ class DesignAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); - $this->out->elementStart('fieldset', array('id' => 'settings_theme')); + $this->out->elementStart('fieldset', array('id' => 'settings_design_theme')); $this->out->element('legend', null, _('Change theme')); $this->out->elementStart('ul', 'form_data'); @@ -458,7 +458,7 @@ class DesignAdminPanelForm extends AdminForm $this->out->elementEnd('ul'); $this->out->elementEnd('fieldset'); - $this->out->elementStart('fieldset', array('id' => 'settings_avatar')); + $this->out->elementStart('fieldset', array('id' => 'settings_design_avatar')); $this->out->element('legend', null, _('Avatar Settings')); $this->out->elementStart('ul', 'form_data'); diff --git a/theme/base/css/display.css b/theme/base/css/display.css index e5f5df68c..85683a91d 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -172,8 +172,7 @@ font-weight:bold; #form_password_recover legend, #form_password_change legend, .form_entity_block legend, -#form_filter_bytag legend, -#settings_design_theme legend { +#form_filter_bytag legend { display:none; } -- cgit v1.2.3-54-g00ecf From fae0f36b4d1e43e42637bced0b655ee6a25d6226 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 11:27:05 +0000 Subject: Updated .form_settings fieldset fieldset styles --- theme/base/css/display.css | 16 +++++++++++++++- theme/default/css/display.css | 11 ++++++++++- theme/identica/css/display.css | 11 ++++++++++- 3 files changed, 35 insertions(+), 3 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 85683a91d..7b7fd6269 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -107,6 +107,20 @@ clear:both; .form_settings fieldset { margin-bottom:29px; } +.form_settings fieldset fieldset { +margin-bottom:41px; +padding:3% 1.795% 1.795% 3%; +border-radius:11px; +-moz-border-radius:11px; +-webkit-border-radius:11px; +border-width:1px; +border-style:solid; +} +.form_settings fieldset fieldset legend { +line-height:0; +} + + .form_settings input.remove { margin-left:11px; } @@ -1343,7 +1357,7 @@ float:left; } #settings_design_color .form_data { width:400px; -margin-right:28px; +margin-right:1%; } #settings_design_color .form_data li { diff --git a/theme/default/css/display.css b/theme/default/css/display.css index a4f03fbf1..f4af07081 100644 --- a/theme/default/css/display.css +++ b/theme/default/css/display.css @@ -28,10 +28,19 @@ input, textarea, select, .entity_remote_subscribe { border-color:#AAAAAA; } + +.form_settings fieldset fieldset { +background:rgba(240, 240, 240, 0.2); +box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +} + #filter_tags ul li, .entity_send-a-message .form_notice, .pagination .nav_prev a, -.pagination .nav_next a { +.pagination .nav_next a, +.form_settings fieldset fieldset { border-color:#DDDDDD; } diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css index eb21ea65b..ff7311302 100644 --- a/theme/identica/css/display.css +++ b/theme/identica/css/display.css @@ -28,10 +28,19 @@ input, textarea, select, .entity_remote_subscribe { border-color:#AAAAAA; } + +.form_settings fieldset fieldset { +background:rgba(240, 240, 240, 0.2); +box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-moz-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +-webkit-box-shadow:3px 3px 7px rgba(194, 194, 194, 0.3); +} + #filter_tags ul li, .entity_send-a-message .form_notice, .pagination .nav_prev a, -.pagination .nav_next a { +.pagination .nav_next a, +.form_settings fieldset fieldset { border-color:#DDDDDD; } -- cgit v1.2.3-54-g00ecf From 209bc0456991b0e5bb9a7ecdbb3f72ecdb4bc90c Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 12:48:17 +0000 Subject: Updated layout for notice info and options --- theme/base/css/display.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 7b7fd6269..485479d15 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -952,7 +952,7 @@ clear:left; float:left; font-size:0.95em; margin-left:59px; -width:50%; +max-width:74%; } #showstream .notice div.entry-content, #shownotice .notice div.entry-content { @@ -974,7 +974,7 @@ position:relative; font-size:0.95em; width:90px; float:right; -margin-right:11px; +margin-right:7px; } .notice-options a { -- cgit v1.2.3-54-g00ecf From 269781280903d80141788225ec858fbf6501971d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 13:08:13 +0000 Subject: Notice option alignment --- theme/base/css/display.css | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 485479d15..d5917953f 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -974,7 +974,6 @@ position:relative; font-size:0.95em; width:90px; float:right; -margin-right:7px; } .notice-options a { @@ -984,18 +983,12 @@ float:left; .notice-options .notice_reply, .notice-options .form_favor, .notice-options .form_disfavor { -position:absolute; -top:0; +float:left; +margin-left:18px; } .notice-options .form_favor, .notice-options .form_disfavor { -left:0; -} -.notice-options .notice_reply { -left:29px; -} -.notice-options .notice_delete { -right:0; +margin-left:0; } .notice-options input, .notice-options a { -- cgit v1.2.3-54-g00ecf From 269ccca9d48335f41eb6584d759f5c70de6847ee Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 18:21:40 +0000 Subject: Updated max-width for profile and single notice page --- theme/base/css/display.css | 1 + 1 file changed, 1 insertion(+) (limited to 'theme') diff --git a/theme/base/css/display.css b/theme/base/css/display.css index d5917953f..e584fae43 100644 --- a/theme/base/css/display.css +++ b/theme/base/css/display.css @@ -957,6 +957,7 @@ max-width:74%; #showstream .notice div.entry-content, #shownotice .notice div.entry-content { margin-left:0; +max-width:82%; } .notice .notice-options a, -- cgit v1.2.3-54-g00ecf From 951e1c62044d620cf9aceb04b9f7955ca24d8d6d Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Thu, 19 Nov 2009 21:17:41 +0000 Subject: Added mobile logos for default and identica themes --- theme/default/mobilelogo.png | Bin 0 -> 2238 bytes theme/identica/mobilelogo.png | Bin 0 -> 2238 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 theme/default/mobilelogo.png create mode 100644 theme/identica/mobilelogo.png (limited to 'theme') diff --git a/theme/default/mobilelogo.png b/theme/default/mobilelogo.png new file mode 100644 index 000000000..b72f7aff5 Binary files /dev/null and b/theme/default/mobilelogo.png differ diff --git a/theme/identica/mobilelogo.png b/theme/identica/mobilelogo.png new file mode 100644 index 000000000..b72f7aff5 Binary files /dev/null and b/theme/identica/mobilelogo.png differ -- cgit v1.2.3-54-g00ecf