From cfdb2979cb5caac7806d993f63844c1314e2cdfa Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 27 Mar 2012 00:54:47 -0400 Subject: [PATCH 1/3] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: @-completion bug qcomment enhancements theme description with preview (non-translatable unfortunately) preparation for some possibly killer features translate br with extra elements revup Fixed regions for Germany, Bulgaria, Republic of Ireland, Scotland, Northern Ireland, Spain, and the UK. * master: From 6cd56e0f3320f34c46eb83cf08dce05da798088b Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 27 Mar 2012 03:57:47 -0400 Subject: [PATCH 2/3] add dispy-dark snapshot; fix toolbar Signed-off-by: Simon L'nu --- view/theme/dispy-dark/snapshot.jpg | Bin 0 -> 39101 bytes view/theme/dispy-dark/style.css | 149 ++++++++++++++++----------- view/theme/dispy/style.css | 157 +++++++++++++++++++---------- 3 files changed, 197 insertions(+), 109 deletions(-) create mode 100644 view/theme/dispy-dark/snapshot.jpg diff --git a/view/theme/dispy-dark/snapshot.jpg b/view/theme/dispy-dark/snapshot.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ada60ca61e31af0e46e1f0c26d658743c2cb9e67 GIT binary patch literal 39101 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

=S&5}{WqK7xbqnaHMg?8-IHx2a(jV@<Qg=ZM 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 literal 0 HcmV?d00001 diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 5dba6b94c..dd0ce356d 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -48,8 +48,7 @@ body { body, button, input, select, textarea { font-family: sans-serif; color: #eec; - /*background-color: #2e3436;*/ - background-color: #2e2f2e; + background-color: #2e2f2e; } select { border: 1px #555 dotted; @@ -212,16 +211,47 @@ input[type=submit] { /** * login */ +#login-extra-links { + overflow: auto; + padding-top: 140px !important; + width: 100%; +} #login-extra-links a { margin-right: 20px; } +#login_standard { + display: block; + float: none; + height: 100px; + position: absolute; + width: 100%; +} +#login_standard .field label { + width: 200px; +} +#login_standard input, #login_standard input[type="text"] { + margin: 0 0 8px; + width: 210px; +} +#login-submit-wrapper { + margin: 0; +} +#login-submit-button { + margin-left: 0px !important; +} +#login_openid #id_openid_url { + width: 200px; +} +#login_openid label { + width: 208px; +} /** * nav */ nav { - height: 80px; + height: 85px; display: block; background-color: #1d1f1d; color: #eeeeec; @@ -251,25 +281,6 @@ nav #banner #logo-text a { font-weight: bold; margin-left: 3px; } -nav #user-menu { - display: block; - width: auto; - float: right; - margin: 3px 68px 0 0; - position: relative; - background-color: #555753; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; - clear: both; -} -nav #user-menu-label { - float: left; - font-size: 12px; - padding: 3px 20px 9px 5px; - height: 10px; -} ul#user-menu-popup { display: none; position: absolute; @@ -298,14 +309,6 @@ ul#user-menu-popup li a:hover { ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; } -#nav-buttons { - clear: both; - list-style: none; - padding: 0px; -} -#nav-buttons li { - padding: 0; -} nav .nav-link { float: right; display: block; @@ -413,13 +416,6 @@ nav .nav-link { .icon, .hover, .focus, .pointer { cursor: pointer; } -#notifications { - height: 20px; - width: 100%; - position: absolute; - top: -19px; - left: 0; -} /* popup notifications */ div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; @@ -468,6 +464,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link .show { display: block; } +#notifications { + height: 20px; + width: 170px; + position: absolute; + top: -19px; + left: 4px; +} #nav-floater { position: fixed; top: 20px; @@ -477,12 +480,23 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: transparent; border-radius: 5px; z-index: 100; + width: 28%; + height: 80px; +} +#nav-buttons { + clear: both; + list-style: none; + padding: 0px; + height: 25px; +} +#nav-buttons li { + padding: 0; } .floaterflip { display: block; position: fixed; z-index: 110; - top: 53px; + top: 56px; right: 19px; width: 22px; height: 22px; @@ -492,18 +506,37 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } .search-box { display: inline-block; - height: 40px; - margin: 12px 0 0 -3px; + height: 20px; + margin: 0; position: relative; - right: -12px; - top: 17px; - width: 0; + left: 7px; + top: 5px; + /*width: 210px;*/ } #search-text { border: 1px #eec solid; background: #2e2f2e; color: #eec; } +nav #user-menu { + display: block; + width: 75%; + margin: 3px 0 0 0; + position: relative; + background-color: #555753; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; + clear: both; + top: 12px; + left: 7px; +} +nav #user-menu-label { + font-size: 12px; + padding: 3px 20px 9px 5px; + height: 10px; +} .nav-ajax-update, .nav-ajax-left { width: 30px; height: 19px; @@ -710,7 +743,7 @@ aside #viewcontacts { } #netsearch-box { margin: 20px 0px 30px; - width: 150px; + width: 150px; } #netsearch-box #search-submit { margin: 5px 5px 0px 0px; @@ -719,7 +752,6 @@ aside #viewcontacts { margin: 0px 0px 0px 0px; } - /** * contacts block */ @@ -1005,7 +1037,7 @@ section { border: 1px solid #729fcf; padding: 4px; } -.tab:hover { +.tab:hover, .tab.active:hover { background: #88a9d2; color: #2e2f2e; } @@ -1017,6 +1049,9 @@ section { background: #88a9d2; color: #2e2f2e; } +.tab.active a { + color: #2e2f2e; +} .tab a { border: 0; text-decoration: none; @@ -1742,8 +1777,10 @@ div[id$="wrapper"] br { /** * register, settings & profile forms */ -#id_openid_url, .openid { + +} +#id_openid_url { background:url(login-bg.gif) no-repeat; background-position:0 50%; padding-left:18px; @@ -1785,16 +1822,7 @@ div[id$="wrapper"] br { margin: 30px 0px; } .profile-edit-side-div { - /*background: #111; - border-radius: 5px 5px 0px 0px; - margin: 0px 0px 0px 0px; - width: 100px; - height: 25px; - position: absolute;*/ display: none; - /*left: 35%; - top: 41%; - cursor: pointer;*/ } /*.profile-edit-side-div:hover { display: block; @@ -2204,6 +2232,13 @@ div[id$="wrapper"] br { .nets-all { margin-left: 0px; } +#netsearch-box { + margin-top: 20px; + width: 150px; +} +#netsearch-box #search-submit { + margin: 5px 0px 0px 0px; +} /** @@ -2293,7 +2328,7 @@ div[id$="wrapper"] br { .field { /*margin-bottom: 10px;*/ /*padding-bottom: 10px;*/ - overflow: auto; + /*overflow: auto;*/ width: 100%; } .field label, label { diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index c591152c2..77b22d65f 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -59,6 +59,9 @@ option { padding: 3px; vertical-align: middle; } +li { + padding: 0 0 0 2px; +} /* remember to define focus styles! */ :focus { outline: 0; @@ -208,16 +211,47 @@ input[type=submit] { /** * login */ +#login-extra-links { + overflow: auto; + padding-top: 140px !important; + width: 100%; +} #login-extra-links a { margin-right: 20px; } +#login_standard { + display: block; + float: none; + height: 100px; + position: absolute; + width: 100%; +} +#login_standard .field label { + width: 200px; +} +#login_standard input, #login_standard input[type="text"] { + margin: 0 0 8px; + width: 210px; +} +#login-submit-wrapper { + margin: 0; +} +#login-submit-button { + margin-left: 0px !important; +} +#login_openid #id_openid_url { + width: 200px; +} +#login_openid label { + width: 208px; +} /** * nav */ nav { - height: 80px; + height: 85px; display: block; background-color: #2e3436; color: #eeeeec; @@ -247,25 +281,6 @@ nav #banner #logo-text a { font-weight: bold; margin-left: 3px; } -nav #user-menu { - display: block; - width: auto; - float: right; - margin: 3px 68px 0 0; - position: relative; - background-color: #555753; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; - clear: both; -} -nav #user-menu-label { - float: left; - font-size: 12px; - padding: 3px 20px 9px 5px; - height: 10px; -} ul#user-menu-popup { display: none; position: absolute; @@ -294,14 +309,6 @@ ul#user-menu-popup li a:hover { ul#user-menu-popup li a.nav-sep { border-top: 1px solid #eeeeec; } -#nav-buttons { - clear: both; - list-style: none; - padding: 0px; -} -#nav-buttons li { - padding: 0; -} nav .nav-link { float: right; display: block; @@ -409,13 +416,6 @@ nav .nav-link { .icon, .hover, .focus, .pointer { cursor: pointer; } -#notifications { - height: 20px; - width: 100%; - position: absolute; - top: -19px; - left: 0; -} /* popup notifications */ div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; @@ -464,6 +464,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link .show { display: block; } +#notifications { + height: 20px; + width: 170px; + position: absolute; + top: -19px; + left: 4px; +} #nav-floater { position: fixed; top: 20px; @@ -473,12 +480,23 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: transparent; border-radius: 5px; z-index: 100; + width: 28%; + height: 80px; +} +#nav-buttons { + clear: both; + list-style: none; + padding: 0px; + height: 25px; +} +#nav-buttons li { + padding: 0; } .floaterflip { display: block; position: fixed; z-index: 110; - top: 53px; + top: 56px; right: 19px; width: 22px; height: 22px; @@ -488,18 +506,37 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } .search-box { display: inline-block; - height: 40px; - margin: 12px 0 0 -3px; + height: 20px; + margin: 0; position: relative; - right: -12px; - top: 17px; - width: 0; + left: 7px; + top: 5px; + /*width: 210px;*/ } #search-text { border: 1px #eec solid; background: #2e3436; color: #eec; } +nav #user-menu { + display: block; + width: 75%; + margin: 3px 0 0 0; + position: relative; + background-color: #555753; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; + clear: both; + top: 12px; + left: 7px; +} +nav #user-menu-label { + font-size: 12px; + padding: 3px 20px 9px 5px; + height: 10px; +} .nav-ajax-update, .nav-ajax-left { width: 30px; height: 19px; @@ -705,7 +742,11 @@ aside #viewcontacts { padding:.2em .5em; } #netsearch-box { - margin: 30px 0px; + margin: 20px 0px 30px; + width: 150px; +} +#netsearch-box #search-submit { + margin: 5px 5px 0px 0px; } .ttright { margin: 0px 0px 0px 0px; @@ -964,7 +1005,7 @@ aside #viewcontacts { background-color: #ffffe0; color: #111; border: 1px #aa0 solid; - border-radius: 3px; + border-radius: 5px; padding: 3px 3px 6px 10px; } #jot-preview-content .wall-item-outside-wrapper { @@ -1007,6 +1048,9 @@ section { .tab.active { background: #729fcf; color: #eeeeec; +} +.tab.active a { + } .tab a { border: 0; @@ -1037,6 +1081,9 @@ section { .shiny { background: #efefdf; } +.wall-outside-wrapper .shiny { + border-radius: 5px; +} .heart { color: red; } @@ -1730,8 +1777,10 @@ div[id$="wrapper"] br { /** * register, settings & profile forms */ -#id_openid_url, .openid { + +} +#id_openid_url { background:url(login-bg.gif) no-repeat; background-position:0 50%; padding-left:18px; @@ -1827,10 +1876,12 @@ div[id$="wrapper"] br { * contacts selector */ .group-delete-wrapper { - margin: -31px 122px 0 0; + margin: -31px 50px 0 0; float: right; } - +/*.group-delete-icon { + margin: 0 0 0 10px; +}*/ #group-edit-submit-wrapper { margin: 0 0 10px 0; display: inline; @@ -1870,6 +1921,7 @@ div[id$="wrapper"] br { display: none; } + /** * profile */ @@ -2188,6 +2240,7 @@ div[id$="wrapper"] br { margin: 5px 0px 0px 0px; } + /** * ADMIN */ @@ -2275,7 +2328,7 @@ div[id$="wrapper"] br { .field { /*margin-bottom: 10px;*/ /*padding-bottom: 10px;*/ - overflow: auto; + /*overflow: auto;*/ width: 100%; } .field label, label { @@ -2287,7 +2340,7 @@ div[id$="wrapper"] br { margin: 0 10px 0.5em 0; border: 1px #999 solid; padding: 5px; - background: #eee; + background: #ccc; vertical-align: middle; color: #111; } @@ -2591,9 +2644,9 @@ div[id$="wrapper"] br { } .border, .border:hover { border: 1px solid #babdb6; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; } .attachtype { display: block; @@ -2720,7 +2773,7 @@ footer { vertical-align: middle; } #acl-wrapper a:hover { - text-decoration:none; + text-decoration: none; color: #000; border: 0; } From c3388ad81336d45a40a66b69096f504ffa7e34cb Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 27 Mar 2012 04:40:31 -0400 Subject: [PATCH 3/3] more fixes for dispys Signed-off-by: Simon L'nu --- view/theme/dispy-dark/communityhome.tpl | 9 +++++++-- .../dispy-dark/{snapshot.jpg => screenshot.jpg} | Bin view/theme/dispy-dark/style.css | 5 ++--- view/theme/dispy/communityhome.tpl | 9 +++++++-- view/theme/dispy/style.css | 7 +++---- view/theme/dispy/theme.php | 7 ++++++- 6 files changed, 25 insertions(+), 12 deletions(-) rename view/theme/dispy-dark/{snapshot.jpg => screenshot.jpg} (100%) diff --git a/view/theme/dispy-dark/communityhome.tpl b/view/theme/dispy-dark/communityhome.tpl index 0838fc757..dfc0467f7 100644 --- a/view/theme/dispy-dark/communityhome.tpl +++ b/view/theme/dispy-dark/communityhome.tpl @@ -1,4 +1,9 @@ {{ if $page }} -

PostIt to Friendica

-
Post to Friendica from anywhere by bookmarking this Link.
+
$page
+{{ endif }} + +

PostIt to Friendica

+
+Post to Friendica from anywhere by bookmarking this Link. +
{{ endif }} diff --git a/view/theme/dispy-dark/snapshot.jpg b/view/theme/dispy-dark/screenshot.jpg similarity index 100% rename from view/theme/dispy-dark/snapshot.jpg rename to view/theme/dispy-dark/screenshot.jpg diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index dd0ce356d..8be441c8b 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 170px; position: absolute; top: -19px; - left: 4px; + left: 15px; } #nav-floater { position: fixed; @@ -2328,7 +2328,7 @@ div[id$="wrapper"] br { .field { /*margin-bottom: 10px;*/ /*padding-bottom: 10px;*/ - /*overflow: auto;*/ + overflow: auto; width: 100%; } .field label, label { @@ -2336,7 +2336,6 @@ div[id$="wrapper"] br { width: 275px; display: block; font-size: 1.077em; - /*font-weight: bold;*/ margin: 0 10px 0.5em 0; border: 1px #2e2f2e solid; padding: 5px; diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index 0838fc757..dfc0467f7 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -1,4 +1,9 @@ {{ if $page }} -

PostIt to Friendica

-
Post to Friendica from anywhere by bookmarking this Link.
+
$page
+{{ endif }} + +

PostIt to Friendica

+
+Post to Friendica from anywhere by bookmarking this Link. +
{{ endif }} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 77b22d65f..74a7809a1 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -469,7 +469,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 170px; position: absolute; top: -19px; - left: 4px; + left: 15px; } #nav-floater { position: fixed; @@ -1037,7 +1037,7 @@ section { border: 1px solid #729fcf; padding: 4px; } -.tab:hover { +.tab:hover, .tab.active:hover { background: #729fcf; color: #eeeeec; } @@ -1050,7 +1050,7 @@ section { color: #eeeeec; } .tab.active a { - + color: #729fcf; } .tab a { border: 0; @@ -2336,7 +2336,6 @@ div[id$="wrapper"] br { width: 275px; display: block; font-size: 1.077em; - /*font-weight: bold;*/ margin: 0 10px 0.5em 0; border: 1px #999 solid; padding: 5px; diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 9db77d7f3..db8cf5ccd 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -6,7 +6,7 @@ * Version: 1.0 * Author: unknown * Maintainer: Simon - * Screenshot: Screenshot + * Screenshot: Screenshot */ @@ -154,3 +154,8 @@ function dispy_community_info() { $a->page['aside'] = replace_macros($tpl, $aside); } +//right_aside at profile pages +if ($a->argv[0] === "profile") { + // COMMUNITY + dispy_community_info(); +}