summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/css/header.scss43
-rw-r--r--core/css/mobile.scss11
-rw-r--r--core/css/styles.scss14
-rw-r--r--core/js/js.js4
-rw-r--r--lib/private/App/AppStore/Fetcher/AppFetcher.php2
-rw-r--r--settings/ajax/navigationdetect.php28
-rw-r--r--settings/js/apps.js6
-rw-r--r--settings/routes.php2
8 files changed, 42 insertions, 68 deletions
diff --git a/core/css/header.scss b/core/css/header.scss
index b1141476a0e..8e520957889 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -49,7 +49,7 @@
left: 0;
right: 0;
z-index: 2000;
- height: 45px;
+ height: 50px;
background-color: $color-primary;
box-sizing: border-box;
justify-content: space-between;
@@ -57,10 +57,8 @@
/* LOGO and APP NAME -------------------------------------------------------- */
#nextcloud {
- padding: 5px;
- padding-bottom: 0;
- height: 45px;
- /* header height */
+ padding: 8px 12px;
+ height: 100%;
box-sizing: border-box;
opacity: 1;
&:focus {
@@ -82,8 +80,8 @@
position: absolute;
max-width: 350px;
max-height: 280px;
- right: 0;
- top: 44px;
+ right: 5px;
+ top: 50px;
margin: 0;
&:not(.popovermenu) {
@@ -100,7 +98,7 @@
width: 0;
position: absolute;
pointer-events: none;
- right: 12px;
+ right: 10px;
}
}
.logo {
@@ -161,13 +159,14 @@
.header-right {
> div,
> form {
+ height: 100%;
position: relative;
> .menutoggle {
display: flex;
justify-content: center;
align-items: center;
- width: 44px;
- height: 44px;
+ width: 50px;
+ height: 100%;
cursor: pointer;
opacity: 0.6;
padding: 0;
@@ -225,14 +224,14 @@
/* NAVIGATION --------------------------------------------------------------- */
nav[role='navigation'] {
display: inline-block;
- width: 44px;
- height: 44px;
- margin-left: -44px;
+ width: 50px;
+ height: 50px;
+ margin-left: -50px;
}
.header-left #navigation {
position: relative;
- left: 22px; /* half the togglemenu */
+ left: 25px; /* half the togglemenu */
transform: translateX(-50%);
width: 160px;
}
@@ -340,14 +339,15 @@ nav[role='navigation'] {
#settings {
display: inline-block;
+ height: 100%;
color: rgba($color-primary-text, 0.7);
cursor: pointer;
- margin-right: 13px;
flex: 0 0 auto;
/* User menu on the right */
#expand {
opacity: 1; /* override icon opacity */
+ padding-right: 12px;
img {
opacity: .7;
@@ -407,6 +407,9 @@ nav[role='navigation'] {
}
#expanddiv {
+ &.menu {
+ right: 17px;
+ }
a {
display: inline-flex;
align-items: center;
@@ -439,23 +442,24 @@ nav[role='navigation'] {
#appmenu {
display: inline-block;
width: auto;
+ min-width: 50px;
+ height: 100%;
clear: both;
- min-width: 88px;
li {
float: left;
display: inline-block;
position: relative;
vertical-align: top !important;
- height: 45px;
+ height: 100%;
cursor: pointer;
a {
position: relative;
display: inline-block;
margin: 0;
- padding: 12px;
- height: 21px;
+ padding: 15px 15px;
+ height: 20px;
text-align: center;
vertical-align: top !important;
opacity: .6;
@@ -496,7 +500,6 @@ nav[role='navigation'] {
border-radius: $border-radius;
border-top-left-radius: 0;
border-top-right-radius: 0;
- margin-top: 0;
color: rgba($color-main-text, .7);
width: auto;
left: 50%;
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index ebc7e094cdb..cfc8c002e17 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -134,10 +134,8 @@ table.multiselect thead {
@media only screen and (max-width: 480px) {
#header .header-right .menu {
- max-width: calc(100vw - 26px);
+ max-width: calc(100vw - 10px);
position: fixed;
- right: 13px;
- top: 45px;
&::after {
display: none !important;
}
@@ -158,9 +156,14 @@ table.multiselect thead {
width: 0;
position: absolute;
pointer-events: none;
- right: 13px;
+ right: 15px;
z-index: 2001;
display: none;
}
+
+ /* settings need a different offset, since they have a right padding */
+ &#settings::after {
+ right: 27px;
+ }
}
}
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 0b15718eefd..0bbd89f075b 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -184,17 +184,18 @@ body {
padding: 3px;
padding-left: 25px;
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;
border: 0;
border-radius: $border-radius;
- margin-top: 3px;
+ margin-top: 9px;
width: 0;
cursor: pointer;
-webkit-transition: all 100ms;
transition: all 100ms;
opacity: .6;
&:focus, &:active, &:valid {
+ background-position-x: 6px;
color: $color-primary-text;
width: 155px;
cursor: text;
@@ -207,10 +208,11 @@ body {
& ~ .icon-close-white {
display: inline;
position: absolute;
- width: 15px;
- height: 32px;
- right: 3px;
+ width: 30px;
+ height: 100%;
+ right: 0;
top: 0;
+ margin: 0;
&, &:focus, &:active, &:hover {
border: none;
background-color: transparent;
@@ -287,7 +289,7 @@ body {
width: 100%;
overflow-x: hidden;
/* prevent horizontal scrollbar */
- padding-top: 45px;
+ padding-top: 50px;
box-sizing: border-box;
}
diff --git a/core/js/js.js b/core/js/js.js
index 26dbbdb6e63..3d5f489895d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1553,10 +1553,6 @@ function initCore() {
if(appList.length-1-appCount >= 1) {
appCount--;
}
- // show at least one icon
- if(appCount < 1) {
- appCount = 1;
- }
$('#more-apps a').removeClass('active');
var lastShownApp;
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
index a8fd9349343..6c6fa68429f 100644
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -133,7 +133,7 @@ class AppFetcher extends Fetcher {
/**
* @param string $version
- * @param string $filename
+ * @param string $fileName
*/
public function setVersion(string $version, string $fileName = 'apps.json') {
parent::setVersion($version);
diff --git a/settings/ajax/navigationdetect.php b/settings/ajax/navigationdetect.php
deleted file mode 100644
index 35cc25f19ff..00000000000
--- a/settings/ajax/navigationdetect.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Robin Appelman <robin@icewind.nl>
- * @author Robin McCorkell <robin@mccorkell.me.uk>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-OC_Util::checkAdminUser();
-\OC_JSON::callCheck();
-
-$navigation = \OC::$server->getNavigationManager()->getAll();
-
-\OC_JSON::success(['nav_entries' => $navigation]);
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 0e5d7308e40..05514a10de2 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -597,10 +597,10 @@ OC.Settings.Apps = OC.Settings.Apps || {
},
rebuildNavigation: function() {
- $.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php')).done(function(response){
- if(response.status === 'success') {
+ $.getJSON(OC.linkToOCS('core/navigation', 2) + 'apps?format=json').done(function(response){
+ if(response.ocs.meta.status === 'ok') {
var addedApps = {};
- var navEntries = response.nav_entries;
+ var navEntries = response.ocs.data;
var container = $('#apps ul');
// remove disabled apps
diff --git a/settings/routes.php b/settings/routes.php
index ecf68791a27..df49f0af859 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -106,8 +106,6 @@ $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
->actionInclude('settings/ajax/updateapp.php');
$this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php')
->actionInclude('settings/ajax/uninstallapp.php');
-$this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
- ->actionInclude('settings/ajax/navigationdetect.php');
// admin
$this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
->actionInclude('settings/ajax/excludegroups.php');
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 18:14:50 +0000