mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix app menu, popovers and searchbox 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2018-03-28 10:41:00 +02:00
parent bb37bdbfc4
commit 4a3538bbd8
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/css/header.scss
View File

@ -80,7 +80,7 @@
position: absolute; position: absolute;
max-width: 350px; max-width: 350px;
max-height: 280px; max-height: 280px;
right: 12px; right: 5px;
top: 50px; top: 50px;
margin: 0; margin: 0;
@ -98,7 +98,7 @@
width: 0; width: 0;
position: absolute; position: absolute;
pointer-events: none; pointer-events: none;
right: 12px; right: 10px;
} }
} }
.logo { .logo {
@ -159,17 +159,17 @@
.header-right { .header-right {
> div, > div,
> form { > form {
height: 100%;
position: relative; position: relative;
> .menutoggle { > .menutoggle {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 44px; width: 50px;
height: 100%; height: 100%;
cursor: pointer; cursor: pointer;
opacity: 0.6; opacity: 0.6;
padding: 0; padding: 0;
padding-right: 12px;
margin: 0; margin: 0;
} }
} }
@ -224,14 +224,14 @@
/* NAVIGATION --------------------------------------------------------------- */ /* NAVIGATION --------------------------------------------------------------- */
nav[role='navigation'] { nav[role='navigation'] {
display: inline-block; display: inline-block;
width: 44px; width: 50px;
height: 44px; height: 50px;
margin-left: -44px; margin-left: -50px;
} }
.header-left #navigation { .header-left #navigation {
position: relative; position: relative;
left: 22px; /* half the togglemenu */ left: 25px; /* half the togglemenu */
transform: translateX(-50%); transform: translateX(-50%);
width: 160px; width: 160px;
} }
@ -347,6 +347,7 @@ nav[role='navigation'] {
/* User menu on the right */ /* User menu on the right */
#expand { #expand {
opacity: 1; /* override icon opacity */ opacity: 1; /* override icon opacity */
padding-right: 12px;
img { img {
opacity: .7; opacity: .7;
@ -438,7 +439,7 @@ nav[role='navigation'] {
#appmenu { #appmenu {
display: inline-block; display: inline-block;
width: auto; width: auto;
min-width: 88px; min-width: 50px;
height: 100%; height: 100%;
clear: both; clear: both;
@ -447,14 +448,14 @@ nav[role='navigation'] {
display: inline-block; display: inline-block;
position: relative; position: relative;
vertical-align: top !important; vertical-align: top !important;
height: 45px; height: 100%;
cursor: pointer; cursor: pointer;
a { a {
position: relative; position: relative;
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 15px 12px; padding: 15px 15px;
height: 20px; height: 20px;
text-align: center; text-align: center;
vertical-align: top !important; vertical-align: top !important;
@ -496,7 +497,6 @@ nav[role='navigation'] {
border-radius: $border-radius; border-radius: $border-radius;
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
margin-top: 5px;
color: rgba($color-main-text, .7); color: rgba($color-main-text, .7);
width: auto; width: auto;
left: 50%; left: 50%;

5
core/css/styles.scss
View File

@ -184,17 +184,18 @@ body {
padding: 3px; padding: 3px;
padding-left: 25px; padding-left: 25px;
padding-right: 20px; padding-right: 20px;
background: transparent url('../img/actions/search-white.svg?v=1') no-repeat 6px center; background: transparent url('../img/actions/search-white.svg?v=1') no-repeat center center;
color: $color-primary-text; color: $color-primary-text;
border: 0; border: 0;
border-radius: $border-radius; border-radius: $border-radius;
margin-top: 3px; margin-top: 9px;
width: 0; width: 0;
cursor: pointer; cursor: pointer;
-webkit-transition: all 100ms; -webkit-transition: all 100ms;
transition: all 100ms; transition: all 100ms;
opacity: .6; opacity: .6;
&:focus, &:active, &:valid { &:focus, &:active, &:valid {
background-position-x: 6px;
color: $color-primary-text; color: $color-primary-text;
width: 155px; width: 155px;
cursor: text; cursor: text;

4
core/js/js.js
View File

@ -1553,10 +1553,6 @@ function initCore() {
if(appList.length-1-appCount >= 1) { if(appList.length-1-appCount >= 1) {
appCount--; appCount--;
} }
// show at least one icon
if(appCount < 1) {
appCount = 1;
}
$('#more-apps a').removeClass('active'); $('#more-apps a').removeClass('active');
var lastShownApp; var lastShownApp;