diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-06 14:52:55 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-06 14:52:55 +0200 |
| commit | 933c05566e21c27e4f2d4b4e9c2d54e7b363d304 (patch) | |
| tree | 415fb2d7261273fd655afaf65e169e87e8af5e4d /core/css | |
| parent | 1a519b851d3a867d13c9fc25b0cff6ec9cb29642 (diff) | |
| parent | ecdfea241f7e6837189549686fe3401888a27b77 (diff) | |
| download | nextcloud-server-933c05566e21c27e4f2d4b4e9c2d54e7b363d304.tar.gz nextcloud-server-933c05566e21c27e4f2d4b4e9c2d54e7b363d304.zip | |
Merge pull request #8922 from owncloud/design-controls-transparency
Bugfixes for mobile
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/mobile.css | 27 | ||||
| -rw-r--r-- | core/css/styles.css | 12 |
2 files changed, 22 insertions, 17 deletions
diff --git a/core/css/mobile.css b/core/css/mobile.css index 98033528210..2e515957c80 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -40,11 +40,6 @@ display: none; } -/* don’t require a minimum width for controls bar */ -#controls { - min-width: initial !important; -} - /* position share dropdown */ #dropdown { margin-right: 10% !important; @@ -109,12 +104,19 @@ opacity: 1; } -/* fix controls bar for apps which don't use the standard */ -#body-user .app-files #controls, -#user-controls { + +/* controls bar for mobile */ +#controls { + min-width: initial !important; left: 0 !important; - padding-left: 44px !important; + padding-left: 0; + padding-right: 0 !important; +} +/* position controls for apps with app-navigation */ +#app-navigation+#app-content #controls { + padding-left: 44px; } + /* .viewer-mode is when text editor, PDF viewer, etc is open */ #body-user .app-files.viewer-mode #controls { padding-left: 0 !important; @@ -134,11 +136,8 @@ table.multiselect thead { /* fix controls bar jumping when navigation is slid out */ -.snapjs-left #app-navigation-toggle { - top: 0; -} -.snapjs-left .app-files #controls, -.snapjs-left #user-controls { +.snapjs-left #app-navigation-toggle, +.snapjs-left #controls { top: 0; } .snapjs-left table.multiselect thead { diff --git a/core/css/styles.css b/core/css/styles.css index 5ad9796137d..6e8f6868b1d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -243,14 +243,14 @@ input[type="submit"].enabled { -webkit-box-sizing: border-box; box-sizing: border-box; position: fixed; - top:45px; + top: 45px; right: 0; - left:0; + left: 0; height: 44px; width: 100%; padding: 0; margin: 0; - background: #eee; + background-color: rgba(235, 235, 235, .85); border-bottom: 1px solid #e7e7e7; z-index: 50; -webkit-user-select: none; @@ -258,6 +258,12 @@ input[type="submit"].enabled { -ms-user-select: none; user-select: none; } +/* position controls for apps with app-navigation */ +#app-navigation+#app-content #controls { + left: 250px; + padding-right: 250px; +} + #controls .button, #controls button, #controls input[type='submit'], |