From 3ab7132b640933fa5247d7783c958e3a95e6410b Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 5 Mar 2012 10:17:34 -0500 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: $name appearing on testbubble items testbubble notifications * master: From 65b6ec79ed0891a4622cbb5d8ec934e4bd8caef2 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 5 Mar 2012 10:55:26 -0500 Subject: [PATCH 2/2] hopefully fix the overflow issue everywhere this time Signed-off-by: Simon L'nu --- view/theme/dispy/style.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index a9d680d94..01c7fe664 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -414,8 +414,8 @@ div.jGrowl div.info { padding-left: 58px; } #nav-notifications-menu { - margin-top: 30px; - width: 255px; + margin: 30px 0 0 -45px; + width: 300px; max-height: 400px; overflow: auto; font-size: 9pt; @@ -1021,6 +1021,7 @@ section { /*border: 1px #aaa solid;*/ /*border-radius: 5px;*/ padding: 0px; + overflow-x: auto; } .wall-item-photo-menu { display: none;