diff options
author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-05-15 14:52:36 +0200 |
---|---|---|
committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2014-06-04 14:29:46 +0200 |
commit | 35308f5b09eca93b5908b4649a73dee5ab0dc915 (patch) | |
tree | 1a805d378a900c27fdbeaaa2378a6738928c44b5 | |
parent | b5f0a179187bb3f10a939518c6eba72593c1f7a5 (diff) | |
download | nextcloud-server-35308f5b09eca93b5908b4649a73dee5ab0dc915.tar.gz nextcloud-server-35308f5b09eca93b5908b4649a73dee5ab0dc915.zip |
hide navigation by default, not only on small screens, first step
-rw-r--r-- | core/css/header.css | 74 | ||||
-rw-r--r-- | core/css/mobile.css | 80 | ||||
-rw-r--r-- | lib/base.php | 1 |
3 files changed, 75 insertions, 80 deletions
diff --git a/core/css/header.css b/core/css/header.css new file mode 100644 index 00000000000..65afdf55706 --- /dev/null +++ b/core/css/header.css @@ -0,0 +1,74 @@ +/* show caret indicator next to logo to make clear it is tappable */ +#owncloud.menutoggle { + background-image: url('../img/actions/caret.svg'); + background-repeat: no-repeat; + background-position: right 26px; + padding-right: 16px !important; +} +/* do not show menu toggle on public share links as there is no menu */ +#body-public #owncloud.menutoggle { + background-image: none; + padding-right: 0 !important; +} + +/* toggle navigation */ +#content-wrapper { + padding-left: 0; +} + +#navigation { + top: 45px; + bottom: initial; + width: 255px; + max-height: 90%; + margin-top: 0; + top: 45px; + background-color: rgba(36, 40, 47, .97); + overflow-x: initial; + border-bottom-right-radius: 7px; + border-bottom: 1px #333 solid; + border-right: 1px #333 solid; + box-shadow: 0 0 7px rgba(29,45,68,.97); + display: none; +} +#navigation, #navigation * { + box-sizing:border-box; -moz-box-sizing:border-box; +} +#navigation li { + display: inline-block; +} +#navigation a { + width: 80px; + height: 80px; + display: inline-block; + text-align: center; + padding: 20px 0; +} +#navigation a span { + display: inline-block; + font-size: 13px; + padding-bottom: 0; + padding-left: 0; + width: 80px; +} +#navigation .icon { + margin: 0 auto; + padding: 0; +} +#navigation li:first-child .icon { + padding-top: 0; +} +/* Apps management as sticky footer */ +#navigation .wrapper { + min-height: initial; + margin: 0; +} +#apps-management, #navigation .push { + height: initial; +} + +/* shift to account for missing navigation */ +#body-user #controls, +#body-settings #controls { + padding-left: 0; +}
\ No newline at end of file diff --git a/core/css/mobile.css b/core/css/mobile.css index 025bee6415a..9cea0dddc8f 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -21,19 +21,6 @@ box-align: center; } -/* show caret indicator next to logo to make clear it is tappable */ -#owncloud.menutoggle { - background-image: url('../img/actions/caret.svg'); - background-repeat: no-repeat; - background-position: right 26px; - padding-right: 16px !important; -} -/* do not show menu toggle on public share links as there is no menu */ -#body-public #owncloud.menutoggle { - background-image: none; - padding-right: 0 !important; -} - /* compress search box on mobile, expand when focused */ .searchbox input[type="search"] { width: 15%; @@ -53,73 +40,6 @@ display: none; } -/* toggle navigation */ -#content-wrapper { - padding-left: 0; -} - -#navigation { - top: 45px; - bottom: initial; - width: 255px; - max-height: 90%; - margin-top: 0; - top: 45px; - background-color: rgba(36, 40, 47, .97); - overflow-x: initial; - border-bottom-right-radius: 7px; - border-bottom: 1px #333 solid; - border-right: 1px #333 solid; - box-shadow: 0 0 7px rgba(29,45,68,.97); - display: none; -} -#navigation, #navigation * { - box-sizing:border-box; -moz-box-sizing:border-box; -} -#navigation li { - display: inline-block; -} -#navigation a { - width: 80px; - height: 80px; - display: inline-block; - text-align: center; - padding: 20px 0; -} -#navigation a span { - display: inline-block; - font-size: 13px; - padding-bottom: 0; - padding-left: 0; - width: 80px; -} -#navigation .icon { - margin: 0 auto; - padding: 0; -} -#navigation li:first-child .icon { - padding-top: 0; -} -/* Apps management as sticky footer */ -#navigation .wrapper { - min-height: initial; - margin: 0; -} -#apps-management, #navigation .push { - height: initial; -} - - - -/* shift to account for missing app list */ -#body-user #controls, -#body-settings #controls { - padding-left: 0; -} -#body-user .app-files #controls { - left: 230px !important; /* sidebar only */ -} - /* don’t require a minimum width for controls bar */ #controls { min-width: initial !important; diff --git a/lib/base.php b/lib/base.php index 376bb6c1d0a..639aac83558 100644 --- a/lib/base.php +++ b/lib/base.php @@ -344,6 +344,7 @@ class OC { } OC_Util::addStyle("styles"); + OC_Util::addStyle("header"); OC_Util::addStyle("mobile"); OC_Util::addStyle("icons"); OC_Util::addStyle("fonts"); |