From e7c4a2c8e14b1b52114d16fe9756131f007aaddf Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 13 Dec 2012 00:12:21 +0100 Subject: ungreenify new & upload buttons --- apps/files/css/files.css | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 9bd92c92580..afc72916e09 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -8,15 +8,9 @@ #new { height:17px; margin:0 0 0 1em; z-index:1010; float:left; - background-color:#5bb75b; - border:1px solid; border-color:#51a351 #419341 #387038; - -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; - -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; - box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; } -#new:hover, #upload:hover { background-color:#4b964b; } #new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; } -#new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; } +#new>a { padding:.5em 1.2em .3em; } #new>ul { display:none; position:fixed; min-width:7em; z-index:-1; padding:.5em; margin-top:0.075em; margin-left:-.5em; @@ -31,15 +25,11 @@ #upload { height:27px; padding:0; margin-left:0.2em; overflow:hidden; - color:#fff; text-shadow:0 1px 0 #51a351; - border-color:#51a351 #419341 #387038; - box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; - background-color:#5bb75b; } #upload a { position:relative; display:block; width:100%; height:27px; cursor:pointer; z-index:1000; - background-image:url('%webroot%/core/img/actions/upload-white.svg'); + background-image:url('%webroot%/core/img/actions/upload.svg'); background-repeat:no-repeat; background-position:7px 6px; } -- cgit v1.2.3 From 7881bf1d4d792f23353d84de1df05c540c31c201 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 13 Dec 2012 12:49:59 +0100 Subject: improve general button coloring --- core/css/styles.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index d5b0a348ee1..a790fa296bb 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -51,11 +51,13 @@ textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:# input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; - background:#f8f8f8; font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid #ddd; cursor:pointer; + background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid rgba(180,180,180,.5); cursor:pointer; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; } -input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { background:#fff; color:#333; } +input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { + background:rgba(255,255,255,.5); color:#333; +} input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } -- cgit v1.2.3 From 2c41ae437287a2f151936916f942f5447e5015b4 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 13 Dec 2012 12:51:45 +0100 Subject: small code reordering of inputs and buttons --- core/css/styles.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index a790fa296bb..032556cbb57 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -48,7 +48,12 @@ input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active, input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active, .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active, textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } +input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } +input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } +#quota { cursor:default; } + +/* BUTTONS */ input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid rgba(180,180,180,.5); cursor:pointer; @@ -59,12 +64,8 @@ input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hov background:rgba(255,255,255,.5); color:#333; } input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } -input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; } -input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; } -#quota { cursor:default; } - -/* PRIMARY ACTION BUTTON, use sparingly */ +/* Primary action button, use sparingly */ .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary { border:1px solid #1d2d44; background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0; -- cgit v1.2.3