From d98ca8e127eca8cee1953012e0bda5f3fee16672 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 12:19:43 -0500 Subject: [PATCH 1/6] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: revup * master: From 5f77aff48692d7fbf286b5a1b5476c652a1b608f Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 12:21:08 -0500 Subject: [PATCH 2/6] more tweakage. stylesheet and jot-header Signed-off-by: Simon L'nu --- view/theme/dispy/jot-header.tpl | 56 ++++++++++++++++----------------- view/theme/dispy/style.css | 5 ++- 2 files changed, 32 insertions(+), 29 deletions(-) diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 23883036b..93df84aae 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -104,34 +104,6 @@ function initEditor(cb) { $(".jothidden").show(); if (typeof cb!="undefined") { cb(); } - - // character count part deux - // - // get # of chars - var textlen = $('#profile-jot-text').val().length(); - $('#character-counter').html(textlen); - - $('#profile-jot-text').keyup(function() { - $('#character-counter').removeClass('jothidden'); - if(textlen <= 140) { - $('#character-counter').removeClass('red'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('grey'); - } - if((textlen > 140) && (textlen <= 420)) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('red'); - $('#character-counter').addClass('orange'); - } - if(textlen > 420) { - $('#character-counter').removeClass('grey'); - $('#character-counter').removeClass('orange'); - $('#character-counter').addClass('red'); - } - // get new len - $('#character-counter').html($(this).val().length); - }); - }); } }); @@ -146,10 +118,38 @@ function initEditor(cb) { } } +function charCounter() { + // character count part deux + $('#profile-jot-text').keyup(function(event) { + var textlen = $(this).val().length(); + var maxLen1 = 140; + var maxLen2 = 420; + + $('#character-counter').removeClass('jothidden'); + if(textlen <= maxLen1) { + $('#character-counter').removeClass('red'); + $('#character-counter').removeClass('orange'); + $('#character-counter').addClass('grey'); + } + if((textlen > maxLen1) && (textlen <= maxLen2)) { + $('#character-counter').removeClass('grey'); + $('#character-counter').removeClass('red'); + $('#character-counter').addClass('orange'); + } + if(textlen > maxLen2) { + $('#character-counter').removeClass('grey'); + $('#character-counter').removeClass('orange'); + $('#character-counter').addClass('red'); + } + $('#character-counter').html($(this).val().length); + }); +} + function enableOnUser(){ if (editor) return; $(this).val(""); initEditor(); + charCounter(); } diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 4d5f51eb2..95bc1c6f7 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -918,9 +918,12 @@ aside #viewcontacts { #acl-deny-text-end { clear: both; } -#jot-title-desc, #profile-jot-desc { +#jot-title-desc { color: #cccccc; } +#profile-jot-desc { + color: #a00; +} #jot-title-wrapper { margin-bottom: 5px; } From e3ad02d0ddcfa5789f859167737a1f64920ca682 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 14:53:57 -0500 Subject: [PATCH 3/6] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 25510453bfb00b56ba8f4dd7f78c9a04542fafee Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 14:55:09 -0500 Subject: [PATCH 4/6] fix up toolbar so the notifications line up better together Signed-off-by: Simon L'nu --- view/theme/dispy/nav.tpl | 9 ++++--- view/theme/dispy/style.css | 50 +++++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 67a263519..867751310 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -11,6 +11,10 @@ works --> {{ if $nav.help }} $nav.help.1 {{ endif }} + {{ if $nav.community }} + $nav.community.1 + {{ endif }} {{ if $nav.apps }} $nav.apps.1 {{ endif }} @@ -28,10 +32,6 @@ works -->
  • $emptynotifications
    • {{ endif }} - {{ if $nav.community }} - $nav.community.1 - {{ endif }} {{ if $nav.network }} $nav.network.1 @@ -106,6 +106,7 @@ works --> {{ endif }} + diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 95bc1c6f7..08db11033 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -81,17 +81,18 @@ mark { font-weight: bold; } /* Redeclare monospace font family: h5bp.com/j */ -pre, code, kbd, samp { +pre, code, kbd, samp, .wall-item-body code { font-family: monospace, monospace; _font-family: 'courier new', monospace; font-size: 1em; } /* Improve readability of pre-formatted text in all browsers */ -pre { +pre, .wall-item-body code { white-space: pre; white-space: pre-wrap; word-wrap: break-word; } + q { quotes: none; } @@ -287,6 +288,11 @@ ul#user-menu-popup li a.nav-sep { } #nav-buttons { clear: both; + list-style: none; + padding: 0px; +} +#nav-buttons li { + padding: 0; } nav .nav-link { float: right; @@ -469,17 +475,18 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 30px; height: 19px; background: transparent url(notifications.png) 0 0 no-repeat; - color: #fff; + color: #222; font-weight: bold; font-size: 0.8em; padding-top: 0.2em; text-align: center; float: left; - margin-right: -4px; - display: none; + margin: 0 -1px 0 3px; + display: block; + visibility: hidden; } .nav-ajax-update.show, .nav-ajax-left.show { - display: block; + visibility: visible; } #net-update { background-position: 0px 0px; @@ -1431,6 +1438,37 @@ div[id$="wrapper"] br { #photos-upload-perms-menu { text-align: right; } +#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { + float: left; + margin-bottom: 25px; +} +#photo-edit-link-wrap { + margin-bottom: 15px; +} +#photo-edit-caption { + width: 100%; +} +#photo-edit-newtag { + width: 100%; +} +#photo-like-div { + margin-bottom: 25px; +} +#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end { + clear: both; +} +#photo-edit-delete-button { + margin-left: 200px; +} +#photo-edit-end { + margin-bottom: 35px; +} +#photo-caption { + font-size: 110%; + font-weight: bold; + margin-top: 15px; + margin-bottom: 15px; +} /** * message From 6b8cb80ea3320babcfa8c697c2f99e3d3811b199 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 15:27:10 -0500 Subject: [PATCH 5/6] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: * master: From 2441babbe92a804d9d1803a0c7c224cd0a4722da Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 4 Mar 2012 15:52:50 -0500 Subject: [PATCH 6/6] removed extra padding/border on tread-wrapper (heh, tea read :P) Signed-off-by: Simon L'nu --- view/theme/dispy/style.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 08db11033..23f0539d0 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -956,9 +956,10 @@ aside #viewcontacts { * section */ section { - margin: 20px 9% 0 9%; + margin: 20px 8% 0 6%; font-size: 0.8em; padding-right: 250px; + min-width: 475px; } /** tabs **/ @@ -1014,10 +1015,10 @@ section { overflow-x: auto; } [id^="tread-wrapper"], [class^="tread-wrapper"] { - margin: 5px 0; - border: 1px #aaa solid; - border-radius: 5px; - padding: 10px; + margin: 15px 0 0 0; + /*border: 1px #aaa solid;*/ + /*border-radius: 5px;*/ + padding: 0px; } .wall-item-photo-menu { display: none;