From 13f696e5721236429689372bb450012264225684 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Fri, 15 Jul 2022 18:46:36 +0200 Subject: [PATCH] Include scss sheets in js bundle Signed-off-by: Richard Steinmetz --- css/Properties/Properties.scss | 4 +- css/SettingsSection.scss | 2 - css/contacts.scss | 3 +- css/icons.scss | 80 ------------------------------- lib/Controller/PageController.php | 1 - src/main.js | 3 ++ 6 files changed, 6 insertions(+), 87 deletions(-) delete mode 100644 css/icons.scss diff --git a/css/Properties/Properties.scss b/css/Properties/Properties.scss index 788a3c81..3c225e0c 100644 --- a/css/Properties/Properties.scss +++ b/css/Properties/Properties.scss @@ -143,7 +143,7 @@ $property-ext-padding-right: 8px; &__value { flex: 1 1; - textarea& { + textarea { align-self: flex-start; min-height: 2 * $grid-height-unit - 2*$grid-input-margin; max-height: 5 * $grid-height-unit - 2*$grid-input-margin; @@ -153,7 +153,7 @@ $property-ext-padding-right: 8px; &:read-only { border-color: var(--color-border-dark); } - input&--with-ext { + &--with-ext { // ext icon width + 8px padding padding-right: 24px; } diff --git a/css/SettingsSection.scss b/css/SettingsSection.scss index 0074aa01..47f738ab 100644 --- a/css/SettingsSection.scss +++ b/css/SettingsSection.scss @@ -74,8 +74,6 @@ padding-right: 24px !important; background-repeat: no-repeat; background-position: right 4px center; - - @include icon-color('triangle-s', 'actions', $color-black, 1, true); } &__content-wrapper { bottom: unset !important; diff --git a/css/contacts.scss b/css/contacts.scss index 3cd78404..76c3bc28 100644 --- a/css/contacts.scss +++ b/css/contacts.scss @@ -20,7 +20,7 @@ * along with this program. If not, see . * */ - + $grid-height-unit: 40px; $grid-input-padding: 7px; $grid-input-margin: 3px; @@ -37,7 +37,6 @@ $grid-input-height-with-margin: $grid-height-unit - $grid-input-margin * 2; // various @import 'animations'; -@import 'icons'; // global design overrides diff --git a/css/icons.scss b/css/icons.scss deleted file mode 100644 index fcc5cafc..00000000 --- a/css/icons.scss +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @copyright Copyright (c) 2018 John Molakvoæ - * - * @author John Molakvoæ - * - * @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 . - * - */ - - -@include icon-black-white('social', 'contacts', 1); -@include icon-black-white('qrcode', 'contacts', 1); -@include icon-black-white('address-book', 'contacts', 1); -@include icon-black-white('phone', 'contacts', 1); -@include icon-black-white('eye', 'contacts', 1); -@include icon-black-white('up', 'contacts', 1); -@include icon-black-white('no-calendar', 'contacts', 1); -@include icon-black-white('language', 'contacts', 2); -@include icon-black-white('clone', 'contacts', 2); -@include icon-black-white('sync', 'contacts', 2); -@include icon-black-white('recent-actors', 'contacts', 1); -@include icon-black-white('circles', 'contacts', 1); - -.icon-contacts { - &-dark { - @include icon-color('contacts', 'contacts', $color-black); - } - &-white { - @include icon-color('contacts', 'contacts', $color-white); - } -} - -// social network icons: -@include icon-black-white('facebook', 'contacts', 2); // “facebook (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/facebook?style=brands) -@include icon-black-white('instagram', 'contacts', 2); // “instagram (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/instagram?style=brands) -@include icon-black-white('mastodon', 'contacts', 2); // “mastodon (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/mastodon?style=brands) -@include icon-black-white('tumblr', 'contacts', 2); // “tumblr (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/tumblr?style=brands) -@include icon-black-white('twitter', 'contacts', 2); // “twitter (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/twitter?style=brands) -@include icon-black-white('diaspora', 'contacts', 2); // “diaspora (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/diaspora?style=brands) -@include icon-black-white('xing', 'contacts', 2); // “xing (fab)” by fontawesome.com is licensed under CC BY 4.0. (https://fontawesome.com/icons/xing?style=brands) -@include icon-black-white('gravatar', 'contacts', 2); // “gravatar (fab)” by svgrepo.com is licensed under public domain CCO 1.0. (https://www.svgrepo.com/page/licensing) - -.icon-up-force-white { - // using #fffffe to trick the accessibility dark theme icon invert - @include icon-color('up', 'contacts', '#fffffe', 1); -} - -.icon-history-force-white { - // using #fffffe to trick the accessibility dark theme icon invert - @include icon-color('history', 'actions', '#fffffe', 1, true); -} - -.icon-delete-force-white { - // using #fffffe to trick the accessibility dark theme icon invert - @include icon-color('delete', 'actions', '#fffffe', 1, true); -} - -.icon-download-force-white { - // using #fffffe to trick the accessibility dark theme icon invert - @include icon-color('download', 'actions', '#fffffe', 1, true); -} - -.icon-picture-force-white { - // using #fffffe to trick the accessibility dark theme icon invert - @include icon-color('picture', 'places', '#fffffe', 1, true); -} - diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index d54d519d..fcfee915 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -116,7 +116,6 @@ class PageController extends Controller { $this->initialStateService->provideInitialState(Application::APP_ID, 'isCirclesEnabled', $isCirclesEnabled && $isCircleVersionCompatible); Util::addScript(Application::APP_ID, 'contacts-main'); - Util::addStyle(Application::APP_ID, 'contacts'); return new TemplateResponse(Application::APP_ID, 'main'); } diff --git a/src/main.js b/src/main.js index 51a2b45c..e3122e08 100644 --- a/src/main.js +++ b/src/main.js @@ -34,6 +34,9 @@ import logger from './services/logger' import ClickOutside from 'vue-click-outside' import VTooltip from '@nextcloud/vue/dist/Directives/Tooltip' +// Global scss sheets +import '../css/contacts.scss' + // Dialogs css import '@nextcloud/dialogs/styles/toast.scss'