aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-20 18:30:52 -0700
committerfriendica <info@friendica.com>2012-05-20 18:30:52 -0700
commit71fe34332454e6dab239f8af27a1dcac3ba4b2e5 (patch)
tree2e6646412d4c2f78ec32b0eff1bbc5dbbdd7d715
parentafaf9ec74fe0662de76deabd11d630f871802579 (diff)
parent34423e4b3281434ceccfea132fb3e3bbc7169d00 (diff)
downloadvolse-hubzilla-71fe34332454e6dab239f8af27a1dcac3ba4b2e5.tar.gz
volse-hubzilla-71fe34332454e6dab239f8af27a1dcac3ba4b2e5.tar.bz2
volse-hubzilla-71fe34332454e6dab239f8af27a1dcac3ba4b2e5.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 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;
}