From 172aff1c2bb52f07e107bff2abbeea40a12aa5ae Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 20 Apr 2012 20:16:06 -0400 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: diabook-themes: add diabook-dark diabook-themes: add diabook-green and some minor css/bug-fixes rev update escape email template var names. fix bug n385. * master: From 7a14f459042d923aaa441d783ac84709b555a4d4 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Fri, 20 Apr 2012 20:18:47 -0400 Subject: [PATCH 2/2] fix checkbox/radio buttons for some browsers Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 2 ++ view/theme/dispy/style.css | 2 ++ 2 files changed, 4 insertions(+) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index 100748ac4..1c7bf8f40 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -2546,6 +2546,8 @@ input[type="search"] { input[type="checkbox"], input[type="radio"] { border: 1px #999 solid; margin: 0 0 0 0; + height: 15px; + width: 15px; } input[type="submit"], input[type="button"] { background-color: #eee; diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 9af91bba6..8823bc81a 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -2547,6 +2547,8 @@ input[type="search"] { input[type="checkbox"], input[type="radio"] { border: 1px #999 solid; margin: 0 0 0 0; + height: 15px; + width: 15px; } input[type="submit"], input[type="button"] { background-color: #555753;