Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
a49bd0a686
4 changed files with 5 additions and 5 deletions
|
@ -57,7 +57,7 @@ h6{font-size:xx-small;}
|
||||||
#articlemain{width:100%;height:100%;margin:0 auto;}
|
#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,#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;}
|
.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;}
|
#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-approve-as-friend-desc{margin-top:10px;}
|
||||||
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
||||||
|
|
|
@ -301,8 +301,8 @@ h6 {
|
||||||
}
|
}
|
||||||
[class$="-desc"],
|
[class$="-desc"],
|
||||||
[id$="-desc"] {
|
[id$="-desc"] {
|
||||||
color: @bg_colour;
|
color: @main_colour;
|
||||||
// background: @main_colour;
|
background: @bg_colour;
|
||||||
.borders(1px, outset, @main_colour);
|
.borders(1px, outset, @main_colour);
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
// .box_shadow(3px, 3px, 5px);
|
// .box_shadow(3px, 3px, 5px);
|
||||||
|
|
|
@ -57,7 +57,7 @@ h6{font-size:xx-small;}
|
||||||
#articlemain{width:100%;height:100%;margin:0 auto;}
|
#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,#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:#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;}
|
#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-approve-as-friend-desc{margin-top:10px;}
|
||||||
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
.intro-desc{margin-bottom:20px;font-weight:bold;}
|
||||||
|
|
|
@ -303,7 +303,7 @@ h6 {
|
||||||
[class$="-desc"],
|
[class$="-desc"],
|
||||||
[id$="-desc"] {
|
[id$="-desc"] {
|
||||||
color: @bg_colour;
|
color: @bg_colour;
|
||||||
// background: @main_colour;
|
background: @main_colour;
|
||||||
.borders(1px, outset, @bg_colour);
|
.borders(1px, outset, @bg_colour);
|
||||||
.rounded_corners;
|
.rounded_corners;
|
||||||
// .box_shadow(3px, 3px, 5px);
|
// .box_shadow(3px, 3px, 5px);
|
||||||
|
|
Loading…
Reference in a new issue