aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/files/css/files.scss6
-rw-r--r--apps/files/css/upload.scss8
-rw-r--r--apps/files/js/fileactions.js2
-rw-r--r--apps/files/js/filelist.js2
-rw-r--r--core/css/css-variables.scss1
-rw-r--r--core/css/jquery.ocdialog.scss23
-rw-r--r--core/css/mobile.scss2
-rw-r--r--core/css/styles.scss10
-rw-r--r--core/css/variables.scss3
-rw-r--r--lib/composer/composer/autoload_classmap.php1
-rw-r--r--lib/composer/composer/autoload_static.php1
-rw-r--r--lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php55
12 files changed, 95 insertions, 19 deletions
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index c41255b9868..bd57f1907f5 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -52,10 +52,6 @@
min-width: 500px;
}
-#filestable tbody tr {
- height: 51px;
-}
-
/* fit app list view heights */
.app-files #app-content>.viewcontainer {
min-height: 0%;
@@ -132,7 +128,7 @@
#filestable tbody tr {
transition: background-color 0.3s ease;
- height: 40px;
+ height: 51px;
}
#filestable tbody tr:hover,
#filestable tbody tr:focus,
diff --git a/apps/files/css/upload.scss b/apps/files/css/upload.scss
index 0df2e39a613..00c77100a23 100644
--- a/apps/files/css/upload.scss
+++ b/apps/files/css/upload.scss
@@ -172,12 +172,14 @@
.oc-dialog .fileexists #allfiles + span{
vertical-align: bottom;
}
+
.oc-dialog .oc-dialog-buttonrow {
width:100%;
text-align:right;
-}
-.oc-dialog .oc-dialog-buttonrow .cancel {
- float:left;
+
+ .cancel {
+ float:left;
+ }
}
.highlightUploaded {
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 8ce8eddb0b0..4fcb290ca8b 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -662,7 +662,7 @@
if (permissions & OC.PERMISSION_UPDATE) {
actions = OC.dialogs.FILEPICKER_TYPE_COPY_MOVE;
}
- OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) {
+ OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
if (type === OC.dialogs.FILEPICKER_TYPE_COPY) {
context.fileList.copy(filename, targetPath, false, context.dir);
}
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 8fb8a021811..154209ca975 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -849,7 +849,7 @@
};
var actions = this.isSelectedMovable() ? OC.dialogs.FILEPICKER_TYPE_COPY_MOVE : OC.dialogs.FILEPICKER_TYPE_COPY;
- OC.dialogs.filepicker(t('files', 'Target folder'), function(targetPath, type) {
+ OC.dialogs.filepicker(t('files', 'Choose target folder'), function(targetPath, type) {
self.fileMultiSelectMenu.toggleLoading('copyMove', true);
if (type === OC.dialogs.FILEPICKER_TYPE_COPY) {
self.copy(files, targetPath, disableLoadingState);
diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
index b1b7df3115f..058e018b415 100644
--- a/core/css/css-variables.scss
+++ b/core/css/css-variables.scss
@@ -34,6 +34,7 @@
--color-border: $color-border;
--color-border-dark: $color-border-dark;
--border-radius: $border-radius;
+ --border-radius-large: $border-radius-large;
--font-face: $font-face;
}
diff --git a/core/css/jquery.ocdialog.scss b/core/css/jquery.ocdialog.scss
index 0a0222497bc..b5ae27034af 100644
--- a/core/css/jquery.ocdialog.scss
+++ b/core/css/jquery.ocdialog.scss
@@ -1,8 +1,8 @@
.oc-dialog {
background: var(--color-main-background);
color: var(--color-text-light);
- border-radius: var(--border-radius);
- box-shadow: 0 0 7px var(--color-box-shadow);
+ border-radius: var(--border-radius-large);
+ box-shadow: 0 0 30px var(--color-box-shadow);
padding: 15px;
z-index: 10000;
font-size: 100%;
@@ -25,8 +25,8 @@
background: transparent;
right: 0;
bottom: 0;
- padding: 10px;
- padding-bottom: 0;
+ padding: 0;
+ padding-top: 10px;
box-sizing: border-box;
width: 100%;
background-image: linear-gradient(rgba(255, 255, 255, 0.0), var(--color-main-background));
@@ -41,6 +41,12 @@
&.twobuttons.aside {
justify-content: flex-end;
}
+
+ button {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
}
.oc-dialog-close {
@@ -49,6 +55,13 @@
right: 0;
padding: 25px;
background: url('../img/actions/close.svg') no-repeat center;
+ opacity: .5;
+
+ &:hover,
+ &:focus,
+ &:active {
+ opacity: 1;
+ }
}
.oc-dialog-dim {
@@ -76,4 +89,4 @@
display: none;
}
}
-} \ No newline at end of file
+}
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index e4a4f53367b..f7f3827eba5 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -123,7 +123,7 @@
display: none;
}
#oc-dialog-filepicker-content .filelist .filename {
- max-width: 80%;
+ max-width: 100%;
}
.snapjs-left table.multiselect thead {
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 2d6df4c3932..dc217fb8f22 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -700,8 +700,10 @@ code {
#oc-dialog-filepicker-content {
.dirtree {
- width: 92%;
+ width: 96%;
flex-wrap: wrap;
+ padding-left: 12px;
+
div:first-child a {
background-image: url('../img/places/home.svg?v=1');
background-repeat: no-repeat;
@@ -725,8 +727,9 @@ code {
display: inline-block;
overflow-y: auto;
height: 100%;
- /** overflow under the button row */
+ /* overflow under the button row */
width: 100%;
+ overflow-x: hidden;
}
.emptycontent {
color: var(--color-text-details);
@@ -1007,6 +1010,9 @@ div.crumb {
white-space: nowrap;
overflow: hidden;
flex: 0 0 auto;
+ // Some sane max-width for each folder name
+ max-width: 200px;
+
&.icon-home {
// Hide home text
text-indent: -9999px;
diff --git a/core/css/variables.scss b/core/css/variables.scss
index 3bfc37484c4..f5b97c9b879 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -66,13 +66,14 @@ $image-login-background: url('../img/background.png?v=2') !default;
$color-loading-light: #ccc !default;
$color-loading-dark: #777 !default;
-$color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.75) !default;
+$color-box-shadow: rgba(nc-darken($color-main-background, 70%), 0.5) !default;
// light border like file table or app-content list
$color-border: nc-darken($color-main-background, 7%) !default;
// darker border like inputs or very visible elements
$color-border-dark: nc-darken($color-main-background, 14%) !default;
$border-radius: 3px !default;
+$border-radius-large: 20px;
$font-face: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif !default;
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index d77cc6797fc..121f52998e5 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -73,6 +73,7 @@ return array(
'OCP\\Authentication\\TwoFactorAuth\\IDeactivatableByAdmin' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php',
'OCP\\Authentication\\TwoFactorAuth\\IProvider' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/IProvider.php',
'OCP\\Authentication\\TwoFactorAuth\\IProvidesCustomCSP' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php',
+ 'OCP\\Authentication\\TwoFactorAuth\\IProvidesIcons' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php',
'OCP\\Authentication\\TwoFactorAuth\\IRegistry' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/IRegistry.php',
'OCP\\Authentication\\TwoFactorAuth\\RegistryEvent' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/RegistryEvent.php',
'OCP\\Authentication\\TwoFactorAuth\\TwoFactorException' => $baseDir . '/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 06899d408ec..ae5b70380f3 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -103,6 +103,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
'OCP\\Authentication\\TwoFactorAuth\\IDeactivatableByAdmin' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php',
'OCP\\Authentication\\TwoFactorAuth\\IProvider' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/IProvider.php',
'OCP\\Authentication\\TwoFactorAuth\\IProvidesCustomCSP' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/IProvidesCustomCSP.php',
+ 'OCP\\Authentication\\TwoFactorAuth\\IProvidesIcons' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php',
'OCP\\Authentication\\TwoFactorAuth\\IRegistry' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/IRegistry.php',
'OCP\\Authentication\\TwoFactorAuth\\RegistryEvent' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/RegistryEvent.php',
'OCP\\Authentication\\TwoFactorAuth\\TwoFactorException' => __DIR__ . '/../../..' . '/lib/public/Authentication/TwoFactorAuth/TwoFactorException.php',
diff --git a/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php b/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php
new file mode 100644
index 00000000000..4c9c809ae42
--- /dev/null
+++ b/lib/public/Authentication/TwoFactorAuth/IProvidesIcons.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @author 2018 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCP\Authentication\TwoFactorAuth;
+
+/**
+ * Interface for two-factor providers that provide dark and light provider
+ * icons
+ *
+ * @since 15.0.0
+ */
+interface IProvidesIcons extends IProvider {
+
+ /**
+ * Get the path to the light (white) icon of this provider
+ *
+ * @return String
+ *
+ * @since 15.0.0
+ */
+ public function getLightIcon(): String;
+
+ /**
+ * Get the path to the dark (black) icon of this provider
+ *
+ * @return String
+ *
+ * @since 15.0.0
+ */
+ public function getDarkIcon(): String;
+
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-22 23:28:52 +0000