Merge https://github.com/friendica/friendica into pull

diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 1147697274d402e33102125f8e759b4eadf2eaab..3bb30be83058d7d931ea0f1f0d0f62358c905f45 100644 (file)
--- 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 f2714b717d3efacc656d8541d2bce8d7e12e6b08..4967ac9c2cad6b8807f7cf88554ba5999917fbc5 100644 (file)
--- 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 f6336c55baeb694cf083721dd68f31097bcdfab7..1099f0913b2af53a46ad765aa95c3bca6eba7bc8 100644 (file)
--- 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 d2f72520fb2f792c9e09b02eb62a99e4d6f94969..4e1b85031215bc8237ae4029ded9b50d9d24f538 100644 (file)
--- 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);