diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-08-26 16:54:48 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2015-08-26 16:54:48 +0200 |
| commit | 0bf7b0d738e5caefe42db35d4efd658ebf7ec1c6 (patch) | |
| tree | 8a5e3170f6279e1af42ed95891f071a961391e3d | |
| parent | 062fd37f7425d803c270878d0e2c7d89d50518f7 (diff) | |
| parent | 5a6b10ae6fd5a50e2f3dde7f28d5e24faa51383d (diff) | |
| download | nextcloud-server-0bf7b0d738e5caefe42db35d4efd658ebf7ec1c6.tar.gz nextcloud-server-0bf7b0d738e5caefe42db35d4efd658ebf7ec1c6.zip | |
Merge pull request #18573 from owncloud/search-style
only show search icon on desktop, like on mobile
| -rw-r--r-- | core/css/header.css | 2 | ||||
| -rw-r--r-- | core/css/mobile.css | 23 | ||||
| -rw-r--r-- | core/css/styles.css | 19 |
3 files changed, 14 insertions, 30 deletions
diff --git a/core/css/header.css b/core/css/header.css index 466022e9f76..5630f96953f 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -294,7 +294,7 @@ } #expand { display: block; - padding: 7px 30px 6px 22px; + padding: 7px 30px 6px 10px; cursor: pointer; } #expand * { diff --git a/core/css/mobile.css b/core/css/mobile.css index 9008e39b89c..29507a0faa9 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -26,35 +26,12 @@ display: none; } -/* compress search box on mobile, expand when focused */ -.searchbox input[type="search"] { - width: 0; - cursor: pointer; - background-color: transparent; - -webkit-transition: all 100ms; - -moz-transition: all 100ms; - -o-transition: all 100ms; - transition: all 100ms; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; - opacity: .7; -} -.searchbox input[type="search"]:focus, -.searchbox input[type="search"]:active { - width: 155px; - max-width: 50%; - cursor: text; - background-color: #112; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; - opacity: 1; -} - /* do not show display name on mobile when profile picture is present */ #header .avatardiv.avatardiv-shown + #expandDisplayName { display: none; } #header #expand { display: block; - padding: 7px 30px 6px 7px; } /* do not show update notification on mobile */ diff --git a/core/css/styles.css b/core/css/styles.css index b196b4f1b3f..8b89837bcec 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -258,21 +258,28 @@ input:disabled+label, input:disabled:hover+label, input:disabled:focus+label { font-size: 1.2em; padding: 3px; padding-left: 25px; - background: #112 url('../img/actions/search-white.svg') no-repeat 6px center; + background: transparent url('../img/actions/search-white.svg') no-repeat 6px center; color: #fff; border: 0; border-radius: 3px; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; - opacity: .3; margin-top: 9px; float: right; + width: 0; + cursor: pointer; + -webkit-transition: all 100ms; + -moz-transition: all 100ms; + -o-transition: all 100ms; + transition: all 100ms; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + opacity: .7; } -.searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active { - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; - opacity: .7; color: #fff; + width: 155px; + max-width: 50%; + cursor: text; + background-color: #112; } input[type="submit"].enabled { |