diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 12:43:07 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-15 12:43:07 +0200 |
| commit | e292b1fcdbe15d3a048c89f1825cb9ae8831edbb (patch) | |
| tree | a310b840389eff1f324b68c3ed3a002b0bb963e7 /core/css/styles.css | |
| parent | e256ac8791eedcb3dcab1ade0927f1831e24d2e2 (diff) | |
| parent | a6a8e2c553bd2ba82c3d50f147a49793ed62b6f5 (diff) | |
| download | nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.tar.gz nextcloud-server-e292b1fcdbe15d3a048c89f1825cb9ae8831edbb.zip | |
fix merge conflicts
Diffstat (limited to 'core/css/styles.css')
| -rw-r--r-- | core/css/styles.css | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index 5cc15f4b5b6..5e3bbfcf182 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -49,7 +49,7 @@ input[type="checkbox"] { width:auto; } #body-login input[type="text"], #body-login input[type="password"] { width: 13em; } #body-login input.login { width: auto; float: right; } #remember_login { margin:.8em .2em 0 1em; } -.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:3em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; opacity:.3; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; } +.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.4em; right:3em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; } input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; } @@ -106,8 +106,9 @@ label.infield { cursor: text !important; } #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } -.action, .selectedActions a, #logout { opacity:.5; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } +.action, .selectedActions a { opacity:.5; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; } .action { width: 16px; height: 16px; } +#logout { opacity:.8; } .action:hover, .selectedActions a:hover, #logout:hover { opacity:1; } table:not(.nostyle) tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; } |