From f48de791813a914d7ce2e1ec00ba041657f3f8ac Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 19 May 2012 18:53:57 -0400 Subject: [PATCH 1/2] Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: Darkzero, another missing part of "everything" Diabook-dark - some more cleaning up Okay, so maybe not *everything* Give Darkzero some loving. backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ sql script to ccnvert all tables to innodb * master: From 2ac55c9f21f859e626da94fd6c87015c066603ee Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 20 May 2012 14:37:20 -0400 Subject: [PATCH 2/2] fix dispy light Signed-off-by: Simon L'nu --- view/theme/dispy/light/style.css | 2 +- view/theme/dispy/light/style.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 1099f0913..eb6abee71 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -56,7 +56,7 @@ h6{font-size:xx-small;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} .button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;} -.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;} +.button a,#profile-listing-desc a{color:#111111;font-weight:bold;} [class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 4e1b85031..ed9dfdd69 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -295,7 +295,7 @@ h6 { .box_shadow(4px, 4px, 7px); } a { - color: @bg_colour; + color: @main_colour; // font-size: smaller; font-weight: bold; }