aboutsummaryrefslogtreecommitdiffstats
path: root/core/css
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2017-03-28 15:04:56 +0200
committerJulius Härtl <jus@bitgrid.net>2017-04-25 17:31:24 +0200
commit7548825743bd2f7a65105b224c4eabe325c893b5 (patch)
tree84276c2d62977bdfcd33646c21e9897e51a2fdeb /core/css
parent8ef25a7628d44465d4777686227407f9a2067700 (diff)
downloadnextcloud-server-7548825743bd2f7a65105b224c4eabe325c893b5.tar.gz
nextcloud-server-7548825743bd2f7a65105b224c4eabe325c893b5.zip
Responsive app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'core/css')
-rw-r--r--core/css/header.scss77
1 files changed, 23 insertions, 54 deletions
diff --git a/core/css/header.scss b/core/css/header.scss
index 93be1dba18b..3805dd493e7 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -191,17 +191,18 @@
/* NAVIGATION --------------------------------------------------------------- */
nav {
- margin-top: auto;
+ display: inline-block;
+ width: 44px;
+ height: 44px;
+ margin-left: -54px;
}
#navigation {
position: relative;
top: 45px;
left: -100%;
- width: 265px;
- max-height: 85%;
+ width: 160px;
margin-top: 0;
- padding-bottom: 10px;
background-color: $color-main-background;
box-shadow: 0 1px 10px $color-box-shadow;
border-radius: 3px;
@@ -242,12 +243,6 @@ nav {
margin-left: -10px;
}
-/* position of dropdown arrow */
-
-#navigation:after {
- left: 242px;
-}
-
#navigation {
box-sizing: border-box;
* {
@@ -258,18 +253,14 @@ nav {
}
a {
position: relative;
- width: 80px;
- height: 80px;
- display: inline-block;
- text-align: center;
- padding: 20px 0;
+ display: block;
+ padding: 10px 12px;
+ height:40px;
+ vertical-align: text-bottom;
span {
display: inline-block;
- font-size: 13px;
padding-bottom: 0;
- padding-left: 0;
- width: 80px;
- text-align: center;
+ padding-left: 10px;
color: $color-main-text;
white-space: nowrap;
overflow: hidden;
@@ -280,6 +271,9 @@ nav {
-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=50)';
opacity: .5;
}
+ svg {
+ margin-bottom: 2px;
+ }
&:hover svg,
&:focus svg,
&:hover span,
@@ -302,13 +296,12 @@ nav {
}
/* loading feedback for apps */
.app-loading {
- .icon-loading-dark {
+ .icon-loading-small-dark {
display: inline !important;
position: absolute;
- top: 20px;
- left: 24px;
- width: 32px;
- height: 32px;
+ left: 12px;
+ width: 16px;
+ height: 16px;
}
.app-icon {
-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)';
@@ -454,10 +447,13 @@ nav {
width: auto;
clear: both;
height: 44px;
- flex-shrink: 0;
li {
float: left;
+ display: inline-block;
+ position: relative;
+ vertical-align: top !important;
+ height: 45px;
cursor: pointer;
a {
@@ -472,10 +468,10 @@ nav {
}
}
+
li:hover a,
li a.active {
opacity: 1;
-
}
li img,
@@ -541,31 +537,4 @@ nav {
li.hidden {
display: none;
}
-
-}
-
-/* use popover menu on mobile and small screens */
-@media only screen and (max-width: 680px) {
-
- #header .header-appname-container {
- display: inline-block !important;
- }
-
- #appmenu {
- display: none;
- }
-
- #apps .in-header {
- display: inline-block;
- }
-
- #navigation {
- position: fixed;
- top: 45px;
- left: 10px;
- &:after {
- left: 214px;
- }
- }
-
-}
+} \ No newline at end of file