From 9472ba8d2031183cc9d573f27e02511c1c5a3050 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 1 Apr 2012 18:59:53 -0400 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: slight improvement in handling of plaintext feeds css-fixes add new messages-layout in diabook fix the display of community-plugin in diabook-themes that didn't quite work out document tinymce fixes/workarounds various bugfixes and css-fixes qcomment overflow try slightly better detection of html in feeds send unverified private mail using zrl * master: From 922d690d1e2aa0923040b8d18b10319655e544f3 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 4 Apr 2012 02:19:39 -0400 Subject: [PATCH 2/2] latest changes are the popup menu for notifs, fixes Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 29 +++++++++++++++++++---------- view/theme/dispy/style.css | 29 +++++++++++++++++++---------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 5f9b38f8c..2b9354fcc 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -444,10 +444,10 @@ div.jGrowl div.info { padding-left: 58px; } #nav-notifications-menu { - margin: 30px 0 0 -45px; - width: 300px; - max-height: 400px; - overflow: auto; + margin: 30px 0 0 -20px; + width: 275px; + max-height: 300px; + overflow-y: auto; font-size: 9pt; } #nav-notifications-menu .contactname { @@ -762,12 +762,20 @@ aside #viewcontacts { list-style: none; } #dfrn-request-link { - background:#3465A4 url(connect.png) no-repeat 95% center; - border-radius:5px 5px 5px 5px; - color:#fff; - display:block; - font-size:1.2em; - padding:.2em .5em; + background: #3465A4 url(connect.png) no-repeat 95% center; + border-radius: 5px 5px 5px 5px; + color: #eec; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; +} +#wallmessage-link { + /*background: #3465A4 url(connect.png) no-repeat 95% center;*/ + /*border-radius: 5px 5px 5px 5px;*/ + color: #eee; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; } #netsearch-box { margin: 20px 0px 30px; @@ -1113,6 +1121,7 @@ section { } .shiny { background: #2e3436; + border-radius: 5px; } .wall-outside-wrapper .shiny { border-radius: 5px; diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 49148eed4..f4c080182 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -444,10 +444,10 @@ div.jGrowl div.info { padding-left: 58px; } #nav-notifications-menu { - margin: 30px 0 0 -45px; - width: 300px; - max-height: 400px; - overflow: auto; + margin: 30px 0 0 -20px; + width: 275px; + max-height: 300px; + overflow-y: auto; font-size: 9pt; } #nav-notifications-menu .contactname { @@ -762,12 +762,20 @@ aside #viewcontacts { list-style: none; } #dfrn-request-link { - background:#3465A4 url(connect.png) no-repeat 95% center; - border-radius:5px 5px 5px 5px; - color:#fff; - display:block; - font-size:1.2em; - padding:.2em .5em; + background: #3465A4 url(connect.png) no-repeat 95% center; + border-radius: 5px 5px 5px 5px; + color: #fff; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; +} +#wallmessage-link { + /*background: #3465A4 url(connect.png) no-repeat 95% center;*/ + /*border-radius: 5px 5px 5px 5px;*/ + color: #eee; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; } #netsearch-box { margin: 20px 0px 30px; @@ -1113,6 +1121,7 @@ section { } .shiny { background: #efefdf; + border-radius: 5px; } .wall-outside-wrapper .shiny { border-radius: 5px;