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

Merge pull request #314 from simonlnu/master 

update dark a bit. i messed up some buttons
This commit is contained in:
Simon 2012-05-24 16:29:29 -07:00
parent f0ddcb979b 2a32917e3a
commit e54b649c98
4 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,9 +213,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:smaller;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#eeeecc;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;}
.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;}
.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
.wall-item-location>br{display:none;}
@ -397,9 +396,8 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
#sidebar-group-ul{padding-left:0;}
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
.sidebar-group-element a{border:0;text-decoration:none;}
.sidebar-group-element.group-selected{color:#2e2f2e;}
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;}
#peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{}

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

@ -1419,7 +1419,9 @@ nav #nav-notifications-linkmenu {
color: @main_colour;
line-height: 1;
display: inline-block;
font-size: smaller;
font-size: x-small;
margin: 0.5em auto;
font-weight: bold;
}
.comment-edit-preview {
width: auto;
@ -1430,12 +1432,6 @@ nav #nav-notifications-linkmenu {
font-size: smaller;
}
}
.wall-item-author,
.wall-item-actions-author {
margin: 0.5em auto 0;
font-size: 0.75em;
font-weight: bold;
}
.wall-item-location {
margin-top: 2em;
width: 6em;
@ -2377,14 +2373,15 @@ div {
// .borders(1px, solid, @link_colour);
.multibutton_active;
}
// .group-selected:hover,
// .nets-selected:hover,
// .fileas-selected:hover {
.categories-selected:hover,
.group-selected:hover,
.nets-selected:hover,
.fileas-selected:hover {
// padding: 4px;
// color: @link_colour;
// color: @bg_colour;
// background: @bg_colour;
// .borders(1px, solid, @link_colour);
// }
}
.groupsideedit {
margin-right: 10px;
}
@ -2404,10 +2401,6 @@ div {
.sidebar-group-element {
.multibutton;
.rounded_corners;
color: @main_colour;
&.group-selected {
color: @bg_colour;
}
}
#sidebar-new-group {
margin: auto;

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

@ -213,9 +213,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;}
.wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;}
.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:smaller;}
.wall-item-author,.wall-item-actions-author,.wall-item-ago{color:#111111;line-height:1;display:inline-block;font-size:x-small;margin:0.5em auto;font-weight:bold;}
.comment-edit-preview{width:auto;margin:auto auto auto -2em;}.comment-edit-preview.wall-item-author,.comment-edit-preview.wall-item-actions-author,.comment-edit-preview.wall-item-ago{font-size:smaller;}
.wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;}
.wall-item-location{margin-top:2em;width:6em;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;}
.wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;}
.wall-item-location>br{display:none;}
@ -391,15 +390,14 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;}
.fc-state-highlight{background:#eeeeec;color:#111111;}
.directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;}
#group-sidebar{margin-bottom:10px;}
.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#eeeeec;background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#111111;background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;}
.groupsideedit{margin-right:10px;}
#sidebar-group-ul{padding-left:0;}
#sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;}
#sidebar-group-list .icon{display:inline-block;width:12px;height:12px;}
.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#111111;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;}
.sidebar-group-element a{border:0;text-decoration:none;}
.sidebar-group-element.group-selected{color:#eeeeec;}
#sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;}
#peoplefind-sidebar form{margin-bottom:10px;}
#sidebar-new-group:hover{}

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

@ -1420,7 +1420,9 @@ nav #nav-notifications-linkmenu {
color: @main_colour;
line-height: 1;
display: inline-block;
font-size: smaller;
font-size: x-small;
margin: 0.5em auto;
font-weight: bold;
}
.comment-edit-preview {
width: auto;
@ -1431,12 +1433,6 @@ nav #nav-notifications-linkmenu {
font-size: smaller;
}
}
.wall-item-author,
.wall-item-actions-author {
margin: 0.5em auto 0;
font-size: 0.75em;
font-weight: bold;
}
.wall-item-location {
margin-top: 2em;
width: 6em;
@ -2373,19 +2369,20 @@ div {
.nets-selected,
.fileas-selected {
// padding: 4px;
color: @bg_colour;
color: @main_colour;
// background: @dk_bg_colour;
// .borders(1px, solid, @hover_colour);
.multibutton_active;
}
// .group-selected:hover,
// .nets-selected:hover,
// .fileas-selected:hover {
.categories-selected:hover,
.group-selected:hover,
.nets-selected:hover,
.fileas-selected:hover {
// padding: 4px;
// color: @link_colour;
// color: @link_colour;
// background: @bg_colour;
// .borders(1px, solid, @link_colour);
// }
}
.groupsideedit {
margin-right: 10px;
}
@ -2405,10 +2402,6 @@ div {
.sidebar-group-element {
.multibutton;
.rounded_corners;
color: @main_colour;
&.group-selected {
color: @bg_colour;
}
}
#sidebar-new-group {
margin: auto;