Merge pull request #855 from owncloud/ungreenify

ungreenify new & upload buttons
This commit is contained in:
blizzz 2012-12-13 04:19:38 -08:00
commit 77c16b2933
2 changed files with 15 additions and 22 deletions

View file

@ -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;
}

View file

@ -48,21 +48,24 @@ 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="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;
-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"] 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 */
/* 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;
-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:rgba(255,255,255,.5); color:#333;
}
input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
/* 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;