aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-19 00:46:49 -0700
committerfriendica <info@friendica.com>2012-05-19 00:46:49 -0700
commita49bd0a6866a911d9d3c7a6df9a2cd23827a804f (patch)
treea0dfab92807017e0c8d1e6a4cd0e1f76e7e21b99
parent668e03d4e52c118cc0e28508cceb1c8ec2b1eabf (diff)
parentec858255091c710b4e00dc62cfeb71648cb0a82d (diff)
downloadvolse-hubzilla-a49bd0a6866a911d9d3c7a6df9a2cd23827a804f.tar.gz
volse-hubzilla-a49bd0a6866a911d9d3c7a6df9a2cd23827a804f.tar.bz2
volse-hubzilla-a49bd0a6866a911d9d3c7a6df9a2cd23827a804f.zip
Merge https://github.com/friendica/friendica into pull
-rw-r--r--view/theme/dispy/dark/style.css2
-rw-r--r--view/theme/dispy/dark/style.less4
-rw-r--r--view/theme/dispy/light/style.css2
-rw-r--r--view/theme/dispy/light/style.less2
4 files changed, 5 insertions, 5 deletions
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 114769727..3bb30be83 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -57,7 +57,7 @@ h6{font-size:xx-small;}
#articlemain{width:100%;height:100%;margin:0 auto;}
.button,#profile-listing-desc{color:#eeeecc;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:#eeeecc;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#2e2f2e;border:1px outset #eeeecc;-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;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-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;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index f2714b717..4967ac9c2 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -301,8 +301,8 @@ h6 {
}
[class$="-desc"],
[id$="-desc"] {
- color: @bg_colour;
- // background: @main_colour;
+ color: @main_colour;
+ background: @bg_colour;
.borders(1px, outset, @main_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index f6336c55b..1099f0913 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -57,7 +57,7 @@ h6{font-size:xx-small;}
#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;}
-[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;}
+[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;}
.intro-desc{margin-bottom:20px;font-weight:bold;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index d2f72520f..4e1b85031 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -303,7 +303,7 @@ h6 {
[class$="-desc"],
[id$="-desc"] {
color: @bg_colour;
- // background: @main_colour;
+ background: @main_colour;
.borders(1px, outset, @bg_colour);
.rounded_corners;
// .box_shadow(3px, 3px, 5px);