diff options
author | Michael Vogel <icarus@dabo.de> | 2012-05-19 14:04:24 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-05-19 14:04:24 +0200 |
commit | 9a940786c18c1c2bd772aec93f1828f67dc45667 (patch) | |
tree | 54114a005e74c8a6d8bad8a490e1d1e41bc4178f /view/theme/dispy/light | |
parent | f2c0c40f6e488f1a8e62bda9449b28115f343cac (diff) | |
parent | 513ef2410d9b892c8ebcb7ceac96b97023c3b5a5 (diff) | |
download | volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.gz volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.tar.bz2 volse-hubzilla-9a940786c18c1c2bd772aec93f1828f67dc45667.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/light')
-rw-r--r-- | view/theme/dispy/light/style.css | 6 | ||||
-rw-r--r-- | view/theme/dispy/light/style.less | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index e89ee7d24..1099f0913 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -55,9 +55,9 @@ h6{font-size:xx-small;} .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #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 a,#profile-listing-desc a{color:#eeeeec;font-size:smaller;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;} +.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;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 51ffbd1f2..4e1b85031 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -283,27 +283,27 @@ h6 { } .button, #profile-listing-desc { - .box(25%, auto); - background: @menu_bg_colour; - color: @bg_colour; - .borders(2px, outset, darken(@menu_bg_colour, 20%)); - .rounded_corners; + // .box(25%, auto); + // background: @menu_bg_colour; + color: @main_colour; + // .borders(2px, outset, darken(@menu_bg_colour, 20%)); + // .rounded_corners; padding: 5px; - font-size: smaller; + // font-size: smaller; cursor: pointer; &.active { .box_shadow(4px, 4px, 7px); } a { color: @bg_colour; - font-size: smaller; + // font-size: smaller; font-weight: bold; } } [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); |