friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #299 from simonlnu/master 

get rid of the monstrosity for .button. need to find alternate solution
This commit is contained in:
Simon 2012-05-16 02:33:10 -07:00
parent a65bd73bf3 7eb73bc600
commit 423864dc23
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/theme/dispy/dark/style.css
View File

@ -55,8 +55,8 @@ h6{font-size:xx-small;}
.action{margin:5px 0;} .action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;} .tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;} #articlemain{width:100%;height:100%;margin:0 auto;}
.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeecc;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;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-size:smaller;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:#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;}

15
view/theme/dispy/dark/style.less
View File

@ -282,20 +282,20 @@ h6 {
} }
.button, .button,
#profile-listing-desc { #profile-listing-desc {
.box(25%, auto); // .box(25%, auto);
background: @menu_bg_colour; // background: @menu_bg_colour;
color: @main_colour; color: @main_colour;
.borders(2px, outset, darken(@menu_bg_colour, 20%)); // .borders(2px, outset, darken(@menu_bg_colour, 20%));
.rounded_corners; // .rounded_corners;
padding: 5px; padding: 5px;
font-size: smaller; // font-size: smaller;
cursor: pointer; cursor: pointer;
&.active { &.active {
.box_shadow(4px, 4px, 7px); .box_shadow(4px, 4px, 7px);
} }
a { a {
color: @main_colour; color: @main_colour;
font-size: smaller; // font-size: smaller;
font-weight: bold; font-weight: bold;
} }
} }
@ -568,6 +568,9 @@ div.jGrowl div {
padding-left: 58px; padding-left: 58px;
margin-top: 50px; margin-top: 50px;
} }
// &.jGrowl-message {
// }
} }
#nav-notifications-menu { #nav-notifications-menu {
margin: 30px 0 0 -20px; margin: 30px 0 0 -20px;

4
view/theme/dispy/light/style.css
View File

@ -55,8 +55,8 @@ h6{font-size:xx-small;}
.action{margin:5px 0;} .action{margin:5px 0;}
.tool{margin:5px 0;list-style:none;} .tool{margin:5px 0;list-style:none;}
#articlemain{width:100%;height:100%;margin:0 auto;} #articlemain{width:100%;height:100%;margin:0 auto;}
.button,#profile-listing-desc{width:25%;height:auto;background:#555753;color:#eeeeec;border:2px outset #222321;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;font-size:smaller;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:#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 a,#profile-listing-desc a{color:#eeeeec;font-size:smaller;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;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;}

12
view/theme/dispy/light/style.less
View File

@ -283,20 +283,20 @@ h6 {
} }
.button, .button,
#profile-listing-desc { #profile-listing-desc {
.box(25%, auto); // .box(25%, auto);
background: @menu_bg_colour; // background: @menu_bg_colour;
color: @bg_colour; color: @bg_colour;
.borders(2px, outset, darken(@menu_bg_colour, 20%)); // .borders(2px, outset, darken(@menu_bg_colour, 20%));
.rounded_corners; // .rounded_corners;
padding: 5px; padding: 5px;
font-size: smaller; // font-size: smaller;
cursor: pointer; cursor: pointer;
&.active { &.active {
.box_shadow(4px, 4px, 7px); .box_shadow(4px, 4px, 7px);
} }
a { a {
color: @bg_colour; color: @bg_colour;
font-size: smaller; // font-size: smaller;
font-weight: bold; font-weight: bold;
} }
} }