From 74b237d46d9472a125315e35d77bf2d0fdabaa7e Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 17 Apr 2012 15:36:45 -0400 Subject: [PATCH 01/30] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: diabook-themes: theme-settings: "wide"-option and new screenshots * master: From af3e37ce20f6b69fdaa9f7f106573999f7473107 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 18 Apr 2012 05:59:50 -0400 Subject: [PATCH 02/30] fix alignment issues with toolbar Signed-off-by: Simon L'nu --- view/theme/dispy-dark/nav.tpl | 76 +++++++++++++++++---------------- view/theme/dispy-dark/style.css | 36 ++++++++++++---- view/theme/dispy/nav.tpl | 76 +++++++++++++++++---------------- view/theme/dispy/style.css | 9 ++-- 4 files changed, 113 insertions(+), 84 deletions(-) diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl index b58ae7e3aa..a7beb63fce 100644 --- a/view/theme/dispy-dark/nav.tpl +++ b/view/theme/dispy-dark/nav.tpl @@ -2,48 +2,52 @@ -