Merge pull request #22111 from nextcloud/enh/unified-search-filters

nextcloud · Sep 3, 2020 · 6a3b649 · 6a3b649
2 parents 39cc193 + 9682194
commit 6a3b649
Show file tree

Hide file tree

Showing 76 changed files with 476 additions and 272 deletions.
diff --git a/apps/accessibility/css/dark.scss b/apps/accessibility/css/dark.scss
@@ -5,6 +5,9 @@ $color-main-background: #181818;
 $color-background-dark: lighten($color-main-background, 4%);
 $color-background-darker: lighten($color-main-background, 8%);
 
+$color-placeholder-light: lighten($color-main-background, 10%);
+$color-placeholder-dark: lighten($color-main-background, 20%);
+
 $color-text-maxcontrast: darken($color-main-text, 30%);
 $color-text-light: darken($color-main-text, 10%);
 $color-text-lighter: darken($color-main-text, 20%);

diff --git a/apps/accessibility/css/highcontrast.scss b/apps/accessibility/css/highcontrast.scss
@@ -5,6 +5,9 @@ $color-main-background: #fff;
 $color-background-dark: darken($color-main-background, 30%);
 $color-background-darker: darken($color-main-background, 30%);
 
+$color-placeholder-light: darken($color-main-background, 30%);
+$color-placeholder-dark: darken($color-main-background, 45%);
+
 $color-text-maxcontrast: $color-main-text;
 $color-text-light: $color-main-text;
 $color-text-lighter: $color-main-text;

diff --git a/apps/dashboard/js/dashboard.js b/apps/dashboard/js/dashboard.js
diff --git a/apps/dashboard/js/dashboard.js.map b/apps/dashboard/js/dashboard.js.map
diff --git a/apps/files/js/dist/files-app-settings.js b/apps/files/js/dist/files-app-settings.js
diff --git a/apps/files/js/dist/files-app-settings.js.map b/apps/files/js/dist/files-app-settings.js.map
diff --git a/apps/files/js/dist/personal-settings.js b/apps/files/js/dist/personal-settings.js
diff --git a/apps/files/js/dist/personal-settings.js.map b/apps/files/js/dist/personal-settings.js.map
diff --git a/apps/files/js/dist/sidebar.js b/apps/files/js/dist/sidebar.js
diff --git a/apps/files/js/dist/sidebar.js.map b/apps/files/js/dist/sidebar.js.map
diff --git a/apps/files_sharing/js/dist/additionalScripts.js b/apps/files_sharing/js/dist/additionalScripts.js
diff --git a/apps/files_sharing/js/dist/collaboration.js b/apps/files_sharing/js/dist/collaboration.js
diff --git a/apps/files_sharing/js/dist/collaboration.js.map b/apps/files_sharing/js/dist/collaboration.js.map
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
diff --git a/apps/files_sharing/js/dist/personal-settings.js b/apps/files_sharing/js/dist/personal-settings.js
diff --git a/apps/files_sharing/js/dist/personal-settings.js.map b/apps/files_sharing/js/dist/personal-settings.js.map
diff --git a/apps/settings/js/vue-0.js b/apps/settings/js/vue-0.js
diff --git a/apps/settings/js/vue-0.js.map b/apps/settings/js/vue-0.js.map
diff --git a/apps/settings/js/vue-5.js b/apps/settings/js/vue-5.js
diff --git a/apps/settings/js/vue-5.js.map b/apps/settings/js/vue-5.js.map
diff --git a/apps/settings/js/vue-6.js b/apps/settings/js/vue-6.js
diff --git a/apps/settings/js/vue-6.js.map b/apps/settings/js/vue-6.js.map
diff --git a/apps/settings/js/vue-7.js b/apps/settings/js/vue-7.js
diff --git a/apps/settings/js/vue-7.js.map b/apps/settings/js/vue-7.js.map
diff --git a/apps/settings/js/vue-8.js b/apps/settings/js/vue-8.js
diff --git a/apps/settings/js/vue-8.js.map b/apps/settings/js/vue-8.js.map
diff --git a/apps/settings/js/vue-settings-admin-security.js b/apps/settings/js/vue-settings-admin-security.js
diff --git a/apps/settings/js/vue-settings-admin-security.js.map b/apps/settings/js/vue-settings-admin-security.js.map
diff --git a/apps/settings/js/vue-settings-apps-users-management.js b/apps/settings/js/vue-settings-apps-users-management.js
diff --git a/apps/settings/js/vue-settings-apps-users-management.js.map b/apps/settings/js/vue-settings-apps-users-management.js.map
diff --git a/apps/settings/js/vue-settings-personal-security.js b/apps/settings/js/vue-settings-personal-security.js
diff --git a/apps/settings/js/vue-settings-personal-security.js.map b/apps/settings/js/vue-settings-personal-security.js.map
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js b/apps/settings/js/vue-settings-personal-webauthn.js
diff --git a/apps/settings/js/vue-settings-personal-webauthn.js.map b/apps/settings/js/vue-settings-personal-webauthn.js.map
diff --git a/apps/updatenotification/js/updatenotification.js b/apps/updatenotification/js/updatenotification.js
diff --git a/apps/updatenotification/js/updatenotification.js.map b/apps/updatenotification/js/updatenotification.js.map
diff --git a/apps/user_status/js/dashboard.js b/apps/user_status/js/dashboard.js
diff --git a/apps/user_status/js/dashboard.js.map b/apps/user_status/js/dashboard.js.map
diff --git a/apps/user_status/js/user-status-menu.js b/apps/user_status/js/user-status-menu.js
diff --git a/apps/user_status/js/user-status-menu.js.map b/apps/user_status/js/user-status-menu.js.map
diff --git a/apps/weather_status/js/weather-status.js b/apps/weather_status/js/weather-status.js
diff --git a/apps/weather_status/js/weather-status.js.map b/apps/weather_status/js/weather-status.js.map
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
diff --git a/core/css/css-variables.scss b/core/css/css-variables.scss
@@ -11,6 +11,9 @@
  --color-background-dark: $color-background-dark;
  --color-background-darker: $color-background-darker;
 
+ --color-placeholder-light: $color-placeholder-light;
+ --color-placeholder-dark: $color-placeholder-dark;
+
  --color-primary: $color-primary;
  --color-primary-light: $color-primary-light;
  --color-primary-text: $color-primary-text;

diff --git a/core/css/icons.scss b/core/css/icons.scss
@@ -307,6 +307,7 @@ audio, canvas, embed, iframe, img, input, object, video {
 @include icon-black-white('upload', 'actions', 1, true);
 @include icon-black-white('user', 'actions', 1, true);
 @include icon-black-white('group', 'actions', 1, true);
+@include icon-black-white('filter', 'actions', 1, true);
 
 @include icon-black-white('video', 'actions', 2, true);
 .icon-video-white {

diff --git a/core/css/variables.scss b/core/css/variables.scss
@@ -40,6 +40,9 @@ $color-background-hover: nc-darken($color-main-background, 4%) !default;
 $color-background-dark: nc-darken($color-main-background, 7%) !default;
 $color-background-darker: nc-darken($color-main-background, 14%) !default;
 
+$color-placeholder-light: nc-darken($color-main-background, 10%) !default;
+$color-placeholder-dark: nc-darken($color-main-background, 20%) !default;
+
 $color-primary: #0082c9 !default;
 $color-primary-light: mix($color-primary, $color-main-background, 10%) !default;
 $color-primary-text: #ffffff !default;

diff --git a/core/img/actions/filter.svg b/core/img/actions/filter.svg
diff --git a/core/js/dist/files_client.js b/core/js/dist/files_client.js
diff --git a/core/js/dist/files_client.js.map b/core/js/dist/files_client.js.map
diff --git a/core/js/dist/files_fileinfo.js b/core/js/dist/files_fileinfo.js
diff --git a/core/js/dist/files_fileinfo.js.map b/core/js/dist/files_fileinfo.js.map
diff --git a/core/js/dist/files_iedavclient.js b/core/js/dist/files_iedavclient.js
diff --git a/core/js/dist/files_iedavclient.js.map b/core/js/dist/files_iedavclient.js.map
diff --git a/core/js/dist/install.js b/core/js/dist/install.js
diff --git a/core/js/dist/install.js.map b/core/js/dist/install.js.map
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map