From 57d83703766a0e2071ef4b4ecdb6032091bf23cb Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 09:12:31 -0400 Subject: [PATCH 01/10] fix some stuff right away Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index d5e6826a8..1e28a8740 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -928,11 +928,16 @@ aside #viewcontacts { display: none; } #jot-preview-content { - background-color: #ffffe0; - border: 1px #aaaa00 solid; + background-color: #3e3f3e; + color: #eec; + border: 1px #eec solid; border-radius: 3px; padding: 3px 3px 6px 10px; } +#jot-preview-content .wall-item-outside-wrapper { + border: 0; + border-radius: 0px; +} /** From 62fe48f064127e39e705a1970e5715b7a0631f9f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:14:31 -0400 Subject: [PATCH 02/10] fix more stuff Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 1e28a8740..5a07218bf 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -80,7 +80,7 @@ mark { /* Redeclare monospace font family: h5bp.com/j */ pre, code, kbd, samp, .wall-item-body code { font-family: monospace, monospace; - _font-family: 'courier new', monospace; + _font-family: monospace; font-size: 1em; } /* Improve readability of pre-formatted text in all browsers */ @@ -667,8 +667,10 @@ aside #viewcontacts { text-align: right; } .aprofile dt { - box-shadow: 1px 1px 5px 0; - color: #666666; + background: #eec; + color: #2e2f2e; + font-weight: bold; + box-shadow: 1px 1px 5px 0 #000; margin: 15px 0 5px; padding-left: 5px; } @@ -1289,6 +1291,7 @@ section { border-style: solid; border-width: 1px 1px 1px 10px; background: #eee; + color: #2e2f2e; width: 95%; } @@ -1658,8 +1661,9 @@ div[id$="wrapper"] br { } .contact-photo-menu { width: auto; - border: 2px solid #444444; - background: #FFFFFF; + border: 2px solid #444; + background: #2e2f2e; + color: #eec; position: absolute; left: 0px; top: 90px; display: none; From fa0cb8514da3935d7780a70a38cf33b3096a914c Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:24:49 -0400 Subject: [PATCH 03/10] add some '@media handheld' types for dispys Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 8 +++++++- view/theme/dispy/style.css | 7 +++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 5a07218bf..8e59b151d 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -42,7 +42,7 @@ html { } body { margin: 0; - font-size: 16px; + font-size: 12pt; line-height: 1.1em; } body, button, input, select, textarea { @@ -2638,3 +2638,9 @@ footer { display: inline-block; } + +@media handheld { + body { + font-size: 15pt; + } +} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 1bee0396c..8081bfc28 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2643,3 +2643,10 @@ footer { display: inline-block; } + +@media handheld { + body { + font-size: 15pt; + } +} + From 467aa66d375eb2a6c626f4b3033dc3b552046a4a Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:25:39 -0400 Subject: [PATCH 04/10] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 258a8c0871083791eb5ec1d5f13b03e67248392d Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 10:29:12 -0400 Subject: [PATCH 05/10] screwed up on the font-size for screen last push Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 8e59b151d..805749b1c 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -42,7 +42,7 @@ html { } body { margin: 0; - font-size: 12pt; + font-size: 16px; line-height: 1.1em; } body, button, input, select, textarea { From 6e5f8376090be020b81f8793a2bed65ba9a879a5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 17:05:08 -0400 Subject: [PATCH 06/10] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From d9bee73edfc4c73a25d3b674f6d5caf09f1a8e66 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 11 Mar 2012 15:50:23 -0700 Subject: [PATCH 07/10] community meta tag renamed from "ika" --- boot.php | 2 +- mod/hcard.php | 2 +- mod/profile.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 1414adb06..b30f02c9f 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1277' ); +define ( 'FRIENDICA_VERSION', '2.3.1278' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1131 ); diff --git a/mod/hcard.php b/mod/hcard.php index 19e649dcb..6d2d9e2eb 100755 --- a/mod/hcard.php +++ b/mod/hcard.php @@ -21,7 +21,7 @@ function hcard_init(&$a) { profile_load($a,$which,$profile); if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) { - $a->page['htmlhead'] .= ''; + $a->page['htmlhead'] .= ''; } if(x($a->profile,'openidserver')) $a->page['htmlhead'] .= '' . "\r\n"; diff --git a/mod/profile.php b/mod/profile.php index 1a701f407..428679ffc 100755 --- a/mod/profile.php +++ b/mod/profile.php @@ -27,7 +27,7 @@ function profile_init(&$a) { profile_load($a,$which,$profile); if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) { - $a->page['htmlhead'] .= ''; + $a->page['htmlhead'] .= ''; } if(x($a->profile,'openidserver')) $a->page['htmlhead'] .= '' . "\r\n"; From e9b82bb5ee53040d6c1fe75949ec7785159be93d Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 20:36:16 -0400 Subject: [PATCH 08/10] fix dispys' css and layout Signed-off-by: Simon L'nu --- view/theme/dispy-dark/icons.png | Bin 29039 -> 19513 bytes view/theme/dispy-dark/nav.tpl | 6 +- view/theme/dispy-dark/style.css | 85 +++++++++------- view/theme/dispy-dark/theme.php | 3 + view/theme/dispy/nav.tpl | 6 +- view/theme/dispy/style.css | 174 ++++++++++++++++---------------- view/theme/dispy/theme.php | 3 + 7 files changed, 147 insertions(+), 130 deletions(-) diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png index f99ec29ee211b6ab448ed3502134dae0f109a623..eb84b8d8e7ad56e28ae5360cb13d4e98e352dbcc 100644 GIT binary patch literal 19513 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 IN5iiC4{1nb9RL6T literal 29039 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 diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index 4a030e7ae..f6e399ef5 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -1,5 +1,4 @@ +
+$langselector +
+ diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 805749b1c..7d7ff7f18 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -122,7 +122,6 @@ a { color: #88a9d2; text-decoration: none; margin-bottom: 1px; - text-decoration: none; } /*a:hover { */ /* text-decoration: none;*/ @@ -140,7 +139,6 @@ blockquote { } a:hover { color: #729fcf; - padding-bottom: 0; border-bottom: 1px dotted #729fcf; } .required { @@ -483,12 +481,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link height: 22px; overflow: hidden; margin: 0px; - background: transparent url(icons.png) -190px -60px no-repeat; + background: transparent url(icons.png) -190px -60px no-repeat; } .nav-ajax-update, .nav-ajax-left { width: 30px; height: 19px; - background: transparent url(notifications.svg) 0 0 no-repeat; + background: transparent url(notifications.png) 0 0 no-repeat; color: #222; font-weight: bold; font-size: 0.8em; @@ -519,14 +517,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } #lang-select-icon { cursor: pointer; - position: absolute; - left: 0; - top: 0; + position: fixed; + left: 28px; + bottom: 6px; } #language-selector { - position: absolute; - top: 0; - left: 16px; + position: fixed; + bottom: 2px; + left: 52px; } .menu-popup { position: absolute; @@ -946,7 +944,7 @@ aside #viewcontacts { * section */ section { - margin: 20px 6% 0 4%; + margin: 20px 8% 0 4%; font-size: 0.8em; padding-right: 230px; min-width: 475px; @@ -955,30 +953,31 @@ section { /** tabs **/ .tabs { list-style: none; - margin: 10px 0 10px; + margin: 10px 0; padding: 0; - border-bottom: 1px solid #729fcf; - font-size: 14px; } .tabs li { display: inline; } .tab { - padding: 0 5px; + border: 1px solid #729fcf; + padding: 4px; } .tab:hover { - background-color: #88a9d2; - color: #111; - border: 0px; + background: #88a9d2; + color: #2e2f2e; } .tab:active { - background-color: #88a9d2; - color: #111; - border: 0px; + background: #88a9d2; + color: #2e2f2e; } .tab.active { - background-color: #88a9d2; - color: #111; + background: #88a9d2; + color: #2e2f2e; +} +.tab a { + border: 0; + text-decoration: none; } /** @@ -1005,6 +1004,9 @@ section { .shiny { background: #2e3436; } +.heart { + color: red; +} .wall-item-content { overflow-x: auto; } @@ -1548,8 +1550,7 @@ div[id$="wrapper"] br { .view-contact-wrapper, .contact-entry-wrapper { float: left; - margin-right: 5px; - margin-bottom: 40px; + margin: 0 5px 40px 0; width: 120px; height: 120px; padding: 3px; @@ -1712,17 +1713,20 @@ div[id$="wrapper"] br { clear: both; } -#register-form label, -#profile-edit-form label { - width: 300px; - float: left; -} +/*#register-form label, */ +/*#profile-edit-form label {*/ +/* width: 300px; */ +/* float: left; */ +/*} */ -#register-form span, -#profile-edit-form span { - color:#555753; - display:block; - margin-bottom:20px; +/*#register-form span, */ +/*#profile-edit-form span {*/ +/* color: #555753; */ +/* display: block; */ +/* margin-bottom: 20px; */ +/*} */ +#profile-edit-marital-label span { + margin: -4px; } .settings-submit-wrapper, .profile-edit-submit-wrapper { @@ -1944,7 +1948,12 @@ div[id$="wrapper"] br { */ .directory-item { float: left; - margin: 50px 50px 0px 0px; + /*margin: 50px 50px 0px 0px;*/ + margin: 0 5px 4px 0; + padding: 3px; + width: 180px; + height: 250px; + position: relative; } @@ -1956,8 +1965,8 @@ div[id$="wrapper"] br { } .group-selected, .nets-selected { padding: 3px; - border: 1px solid #f8f8f8; - background: #2e302e; + color: #2e2f2e; + background: #88a9d2; font-weight: bold; } .groupsideedit { diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php index c72884f1a..a7aec1c1a 100644 --- a/view/theme/dispy-dark/theme.php +++ b/view/theme/dispy-dark/theme.php @@ -72,3 +72,6 @@ $(document).ready(function() { }); EOT; + +$a->page['footer'] .= << -$langselector @@ -112,11 +111,14 @@ works --> {{ endif }} - +
+$langselector +
+ diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 8081bfc28..24fa39f77 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -79,7 +79,7 @@ mark { /* Redeclare monospace font family: h5bp.com/j */ pre, code, kbd, samp, .wall-item-body code { font-family: monospace, monospace; - _font-family: 'courier new', monospace; + _font-family: monospace; font-size: 1em; } /* Improve readability of pre-formatted text in all browsers */ @@ -127,6 +127,7 @@ a:hover img { } blockquote { background: #eee; + color: #111; text-indent: 5px; padding: 5px; border: 1px #aaa solid; @@ -134,7 +135,6 @@ blockquote { } a:hover { color: #729fcf; - padding-bottom: 0; border-bottom: 1px dotted #729fcf; } .required { @@ -462,6 +462,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link right: 1%; padding: 5px; background: #2e3436; + color: transparent; border-radius: 5px; z-index: 100; } @@ -511,14 +512,14 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } #lang-select-icon { cursor: pointer; - position: absolute; - left: 0; - top: 0; + position: fixed; + left: 28px; + bottom: 6px; } #language-selector { - position: absolute; - top: 0; - left: 16px; + position: fixed; + bottom: 2px; + left: 52px; } .menu-popup { position: absolute; @@ -633,8 +634,24 @@ aside { .vcard #profile-photo-wrapper { margin: 20px; } +/* http://css-tricks.com/snippets/css/css-box-shadow/ + * box-shadow: + * 1. The horizontal offset of the shadow, positive means + * the shadow will be on the right of the box, a negative + * offset will put the shadow on the left of the box. + * 2. The vertical offset of the shadow, a negative one + * means the box-shadow will be above the box, a + * positive one means the shadow will be below the box. + * 3. The blur radius (optional), if set to 0 the shadow + * will be sharp, the higher the number, the more blurred + * it will be. + * 4. The spread radius (optional), positive values increase + * the size of the shadow, negative values decrease the size. + * Default is 0 (the shadow is same size as blur). + * 5. Colo[u]r + */ .vcard #profile-photo-wrapper img { - box-shadow: 3px 3px 10px 0; + box-shadow: 3px 3px 10px 0 #000; } aside h4 { font-size: 1.2em; @@ -643,8 +660,10 @@ aside #viewcontacts { text-align: right; } .aprofile dt { - box-shadow: 1px 1px 5px 0; color: #666666; + background: transparent; + font-weight: bold; + box-shadow: 1px 1px 5px 0 #000; margin: 15px 0 5px; padding-left: 5px; } @@ -707,51 +726,11 @@ aside #viewcontacts { } #jot #jot-tools span a { display: block; - /*color: #cccccc; */ - /*width: 100%; */ - /*height: 40px; */ - /*text-align: center;*/ - /*line-height: 40px; */ - /*overflow: hidden;*/ } -/*#jot #jot-tools li:hover {*/ - /*background-color: #364e59;*/ -/*}*/ #jot #jot-tools .perms { float: right; width: 40px; } -/*#jot #jot-tools .perms a.unlock {*/ -/* width: 30px; */ -/* border-left: 10px solid #cccccc;*/ -/* background-color: #cccccc; */ -/*}*/ -/*#jot #jot-tools .perms a.lock {*/ -/* width: 30px; */ -/* border-left: 10px solid #666666;*/ -/* background-color: #666666; */ -/*}*/ -/*#jot #jot-tools li.submit { */ -/* float: right; */ -/* background-color: #cccccc; */ -/* border-bottom: 2px solid #cccccc; */ -/* border-right: 1px solid #666666; */ -/* border-left: 1px solid #666666; */ -/*} */ -/*#jot #jot-tools li.submit input { */ -/* border: 0px; */ -/* margin: 0px; */ -/* padding: 0px; */ -/* background-color: #cccccc; */ -/* color: #666666; */ -/* width: 80px; */ -/* height: 40px; */ -/* line-height: 40px; */ -/*} */ -/*#jot #jot-tools li.submit input:hover {*/ -/* background-color: #bdcdd4; */ -/* color: #666666; */ -/*} */ #jot #jot-tools li.loading { float: right; background-color: #ffffff; @@ -945,17 +924,22 @@ aside #viewcontacts { } #jot-preview-content { background-color: #ffffe0; - border: 1px #aaaa00 solid; + color: #111; + border: 1px #aa0 solid; border-radius: 3px; padding: 3px 3px 6px 10px; } +#jot-preview-content .wall-item-outside-wrapper { + border: 0; + border-radius: 0px; +} /** * section */ section { - margin: 20px 6% 0 4%; + margin: 20px 8% 0 4%; font-size: 0.8em; padding-right: 230px; min-width: 475px; @@ -964,28 +948,32 @@ section { /** tabs **/ .tabs { list-style: none; - margin: 10px 0 10px; + margin: 10px 0; padding: 0; - border-bottom: 1px solid #729fcf; - font-size: 14px; } .tabs li { display: inline; } .tab { - padding: 0 5px; + border: 1px solid #729fcf; + padding: 4px; } .tab:hover { - background-color: #729fcf; + background: #729fcf; color: #eeeeec; - border: 0px; } .tab:active { - background-color: #729fcf; + background: #729fcf; color: #eeeeec; - border: 0px; } - +.tab.active { + background: #729fcf; + color: #eeeeec; +} +.tab a { + border: 0; + text-decoration: none; +} /** * items @@ -1011,6 +999,9 @@ section { .shiny { background: #efefdf; } +.heart { + color: red; +} .wall-item-content { overflow-x: auto; } @@ -1297,6 +1288,7 @@ section { border-style: solid; border-width: 1px 1px 1px 10px; background: #eee; + color: #444; width: 95%; } @@ -1553,8 +1545,7 @@ div[id$="wrapper"] br { .view-contact-wrapper, .contact-entry-wrapper { float: left; - margin-right: 5px; - margin-bottom: 40px; + margin: 0 5px 40px 0; width: 120px; height: 120px; padding: 3px; @@ -1666,8 +1657,9 @@ div[id$="wrapper"] br { } .contact-photo-menu { width: auto; - border: 2px solid #444444; - background: #FFFFFF; + border: 2px solid #444; + background: #eee; + color: #111; position: absolute; left: 0px; top: 90px; display: none; @@ -1706,6 +1698,7 @@ div[id$="wrapper"] br { -moz-border-radius: 5px; border-radius: 5px; padding: 5px; + color: #111; } #settings-default-perms { margin-bottom: 20px; @@ -1715,17 +1708,20 @@ div[id$="wrapper"] br { clear: both; } -#register-form label, -#profile-edit-form label { - width: 300px; - float: left; -} +/*#register-form label, */ +/*#profile-edit-form label {*/ +/* width: 300px; */ +/* float: left; */ +/*} */ -#register-form span, -#profile-edit-form span { - color:#555753; - display:block; - margin-bottom:20px; +/*#register-form span, */ +/*#profile-edit-form span {*/ +/* color: #555753; */ +/* display: block; */ +/* margin-bottom: 20px; */ +/*} */ +#profile-edit-marital-label span { + margin: -4px; } .settings-submit-wrapper, .profile-edit-submit-wrapper { @@ -1742,17 +1738,19 @@ div[id$="wrapper"] br { float: left; margin: 20px 20px 0px 0px; } - #profile-edit-links ul { margin: 20px 0; padding: 0; list-style: none; } - #register-sitename { display: inline; font-weight: bold; } +#advanced-expire-popup { +/* background: #2e2f2e; + color: #eec;*/ +} /** * contacts selector @@ -1945,7 +1943,12 @@ div[id$="wrapper"] br { */ .directory-item { float: left; - margin: 50px 50px 0px 0px; + /*margin: 50px 50px 0px 0px;*/ + margin: 0 5px 4px 0; + padding: 3px; + width: 180px; + height: 250px; + position: relative; } @@ -1957,6 +1960,7 @@ div[id$="wrapper"] br { } .group-selected, .nets-selected { padding: 3px; + color: #111; border: 1px solid #CCCCCC; background: #F8F8F8; font-weight: bold; @@ -2132,6 +2136,7 @@ div[id$="wrapper"] br { padding: 5px; background: #eee; vertical-align: middle; + color: #111; } .field input, input[type="text"] { width: 250px; @@ -2172,7 +2177,7 @@ div[id$="wrapper"] br { display:none !important; } .field.radio .field_help { - margin-left: 0; + margin-left: 297px; } @@ -2182,8 +2187,8 @@ div[id$="wrapper"] br { .popup { width: 100%; height: 100%; - top:0px; - left:0px; + top: 0px; + left: 0px; position: absolute; display: none; } @@ -2298,12 +2303,6 @@ div[id$="wrapper"] br { .icon.drophide, .icon.delete { float: left; } -/*.icon.s22 { - display: block; - background: url(icons.png) no-repeat; - width: 22px; - height: 22px; -}*/ .icon.s22.delete { display: block; background-position: -110px 0; @@ -2649,4 +2648,3 @@ footer { font-size: 15pt; } } - diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index c72884f1a..a7aec1c1a 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -72,3 +72,6 @@ $(document).ready(function() { }); EOT; + +$a->page['footer'] .= << Date: Sun, 11 Mar 2012 21:33:06 -0400 Subject: [PATCH 09/10] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 9f52e3df8d4d92b66a190194ac96b6bd31386263 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 11 Mar 2012 21:34:51 -0400 Subject: [PATCH 10/10] fix dispy-dark photo album stuff Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 7d7ff7f18..7a57628b9 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -537,9 +537,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link list-style: none; border: 3px solid #364e59; z-index: 100000; - -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); - box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -webkit-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7); + -moz-box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7); + box-shadow: 3px 3px 10px 0 rgba(0, 0, 0, 0.7); } .menu-popup a { display: block; @@ -587,24 +587,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link /** sysmsg **/ #sysmsg_info { - position:fixed; - bottom:0; - -moz-box-shadow:0 0 5px #888; - -webkit-box-shadow:0 0 5px #888; - box-shadow:0 0 5px #888; + position: fixed; + bottom: 0; + -moz-box-shadow: 3px 3px 3px 10px 0 #000; + -webkit-box-shadow: 3px 3px 10px 0 #000; + box-shadow: 3px 3px 10px 0 #000; padding: 10px; - background-color:#fcaf3e; + background-color: #fcaf3e; border:2px solid #f8911b; - border-bottom:0; + border-bottom: 0; padding-bottom: 50px; z-index: 1000; } #sysmsg { position: fixed; bottom: 0; - -moz-box-shadow: 0 0 5px #888; - -webkit-box-shadow: 0 0 5px #888; - box-shadow: 0 0 5px #888; + -moz-box-shadow: 3px 3px 10px 0 #000; + -webkit-box-shadow: 3px 3px 10px 0 #000; + box-shadow: 3px 3px 10px 0 #000; padding: 10px; background-color: #fcaf3e; border: 2px solid #f8911b; @@ -1330,10 +1330,11 @@ div[id$="wrapper"] br { .photo-album-image-wrapper, .photo-top-image-wrapper { float: left; - -moz-box-shadow: 0 0 5px #888; - -webkit-box-shadow: 0 0 5px #888; - box-shadow: 0 0 5px #888; - background-color: #eee; + -moz-box-shadow: 3px 3px 10px 0 #000; + -webkit-box-shadow: 3px 3px 10px 0 #000; + box-shadow: 3px 3px 10px 0 #000; + background-color: #222; + color: #2e2f2e; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px;