summaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2014-05-16 17:11:51 +0200
committerJan-Christoph Borchardt <hey@jancborchardt.net>2014-06-04 14:29:46 +0200
commite27a4092871482fcaffef5672d5623f2f9f9e881 (patch)
tree49da17217533bdf4d5ce8b7f4050ce9230a95a90 /core/css
parent19d7d8796461a36dc9f73f3fe2e55df9c87bb1f7 (diff)
downloadnextcloud-server-e27a4092871482fcaffef5672d5623f2f9f9e881.tar.gz
nextcloud-server-e27a4092871482fcaffef5672d5623f2f9f9e881.zip
show appname next to logo for better hint at navigation
Diffstat (limited to 'core/css')
-rw-r--r--core/css/header.css34
-rw-r--r--core/css/mobile.css5
-rw-r--r--core/css/styles.css3
3 files changed, 34 insertions, 8 deletions
diff --git a/core/css/header.css b/core/css/header.css
index 65afdf55706..45489038320 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -1,16 +1,34 @@
+/* display logo so appname can be shown next to it */
+#header .logo-wide {
+ display: inline-block;
+}
+/* show appname next to logo */
+.header-appname {
+ display: inline-block;
+ position: relative;
+ color: #fff;
+ font-size: 26px;
+ opacity: .4;
+ margin-left: 5px;
+}
/* 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;
+#header .icon-caret {
+ display: inline-block;
+ width: 12px;
+ height: 14px;
+}
+.header-appname,
+#header .icon-caret {
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=45)";
+ filter: alpha(opacity=45);
+ opacity: .45;
}
/* 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;
+#body-public #header .icon-caret {
+ display: none;
}
+
/* toggle navigation */
#content-wrapper {
padding-left: 0;
diff --git a/core/css/mobile.css b/core/css/mobile.css
index 9cea0dddc8f..49bc6a21952 100644
--- a/core/css/mobile.css
+++ b/core/css/mobile.css
@@ -4,6 +4,11 @@
padding-top: 10px;
}
+/* don’t show appname next to logo on narrow screens */
+.header-appname {
+ display: none;
+}
+
#body-login .wrapper {
display: -webkit-box;
-webkit-box-orient: horizontal;
diff --git a/core/css/styles.css b/core/css/styles.css
index 595b5532674..9b70d6fe090 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -59,6 +59,9 @@ body {
left: 0;
padding: 6px;
padding-bottom: 0;
+ height: 45px; /* header height */
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
/* info part on the right, used e.g. for info on who shared something */