aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-16 13:55:00 -0700
committerfriendica <info@friendica.com>2012-05-16 13:55:00 -0700
commitf5f345d388c9f1f0a47bad75c933d1bfe723773d (patch)
tree2d9555171267adc0c624ff52c33adb9103c4ef48
parent6744b5975c054563426d6b43a8a8b68c8684d83c (diff)
parent296c84d822b2cba49cb32c8f988a4ecfab13871b (diff)
downloadvolse-hubzilla-f5f345d388c9f1f0a47bad75c933d1bfe723773d.tar.gz
volse-hubzilla-f5f345d388c9f1f0a47bad75c933d1bfe723773d.tar.bz2
volse-hubzilla-f5f345d388c9f1f0a47bad75c933d1bfe723773d.zip
Merge https://github.com/friendica/friendica into pull
-rw-r--r--view/theme/dispy/light/style.css2
-rw-r--r--view/theme/dispy/light/style.less2
2 files changed, 2 insertions, 2 deletions
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index 3b1c6fd71..f6336c55b 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -55,7 +55,7 @@ h6{font-size:xx-small;}
.action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;}
-.button,#profile-listing-desc{color:#eeeeec;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,#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;}
[class$="-desc"],[id$="-desc"]{color:#eeeeec;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;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 399578ba7..d2f72520f 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -285,7 +285,7 @@ h6 {
#profile-listing-desc {
// .box(25%, auto);
// background: @menu_bg_colour;
- color: @bg_colour;
+ color: @main_colour;
// .borders(2px, outset, darken(@menu_bg_colour, 20%));
// .rounded_corners;
padding: 5px;