From f805f0d1ef5333f4ae53b4d38d85afaa56643939 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 19 Mar 2021 11:28:35 +0100 Subject: [PATCH] Move sass files into src and closer to the relevant components --- src/converse.js | 4 +++- src/modals/base.js | 2 ++ {sass => src/modals/styles}/_modal.scss | 5 +++++ src/shared/autocomplete/index.js | 2 ++ .../shared/autocomplete/styles}/_autocomplete.scss | 0 src/shared/chat/emoji-picker.js | 2 ++ {sass => src/shared/chat/styles}/_emoji.scss | 6 ++++++ {sass => src/shared/styles}/_bookmarks.scss | 0 {sass => src/shared/styles}/_chatbox.scss | 0 {sass => src/shared/styles}/_chatrooms.scss | 0 {sass => src/shared/styles}/_controlbox.scss | 0 {sass => src/shared/styles}/_core.scss | 0 {sass => src/shared/styles}/_forms.scss | 0 {sass => src/shared/styles}/_headline.scss | 0 {sass => src/shared/styles}/_lists.scss | 0 {sass => src/shared/styles}/_messages.scss | 0 {sass => src/shared/styles}/_minimized_chats.scss | 0 {sass => src/shared/styles}/_roster.scss | 0 {sass => src/shared/styles}/_toolbar.scss | 0 {sass => src/shared/styles}/_variables.scss | 0 {sass => src/shared/styles}/font-awesome.scss | 0 sass/converse.scss => src/shared/styles/index.scss | 8 ++------ {sass => src/shared/styles}/webfonts/baumans.ttf | Bin .../shared/styles}/webfonts/fa-brands-400.eot | Bin .../shared/styles}/webfonts/fa-brands-400.svg | 0 .../shared/styles}/webfonts/fa-brands-400.ttf | Bin .../shared/styles}/webfonts/fa-brands-400.woff | Bin .../shared/styles}/webfonts/fa-brands-400.woff2 | Bin .../shared/styles}/webfonts/fa-regular-400.eot | Bin .../shared/styles}/webfonts/fa-regular-400.svg | 0 .../shared/styles}/webfonts/fa-regular-400.ttf | Bin .../shared/styles}/webfonts/fa-regular-400.woff | Bin .../shared/styles}/webfonts/fa-regular-400.woff2 | Bin .../shared/styles}/webfonts/fa-solid-900.eot | Bin .../shared/styles}/webfonts/fa-solid-900.svg | 0 .../shared/styles}/webfonts/fa-solid-900.ttf | Bin .../shared/styles}/webfonts/fa-solid-900.woff | Bin .../shared/styles}/webfonts/fa-solid-900.woff2 | Bin {sass => src/shared/styles}/webfonts/muli.ttf | Bin {sass => src/shared/styles}/website.scss | 0 webpack.prod.js | 3 +-- 41 files changed, 23 insertions(+), 9 deletions(-) rename {sass => src/modals/styles}/_modal.scss (94%) rename {sass => src/shared/autocomplete/styles}/_autocomplete.scss (100%) rename {sass => src/shared/chat/styles}/_emoji.scss (98%) rename {sass => src/shared/styles}/_bookmarks.scss (100%) rename {sass => src/shared/styles}/_chatbox.scss (100%) rename {sass => src/shared/styles}/_chatrooms.scss (100%) rename {sass => src/shared/styles}/_controlbox.scss (100%) rename {sass => src/shared/styles}/_core.scss (100%) rename {sass => src/shared/styles}/_forms.scss (100%) rename {sass => src/shared/styles}/_headline.scss (100%) rename {sass => src/shared/styles}/_lists.scss (100%) rename {sass => src/shared/styles}/_messages.scss (100%) rename {sass => src/shared/styles}/_minimized_chats.scss (100%) rename {sass => src/shared/styles}/_roster.scss (100%) rename {sass => src/shared/styles}/_toolbar.scss (100%) rename {sass => src/shared/styles}/_variables.scss (100%) rename {sass => src/shared/styles}/font-awesome.scss (100%) rename sass/converse.scss => src/shared/styles/index.scss (88%) rename {sass => src/shared/styles}/webfonts/baumans.ttf (100%) rename {sass => src/shared/styles}/webfonts/fa-brands-400.eot (100%) rename {sass => src/shared/styles}/webfonts/fa-brands-400.svg (100%) rename {sass => src/shared/styles}/webfonts/fa-brands-400.ttf (100%) rename {sass => src/shared/styles}/webfonts/fa-brands-400.woff (100%) rename {sass => src/shared/styles}/webfonts/fa-brands-400.woff2 (100%) rename {sass => src/shared/styles}/webfonts/fa-regular-400.eot (100%) rename {sass => src/shared/styles}/webfonts/fa-regular-400.svg (100%) rename {sass => src/shared/styles}/webfonts/fa-regular-400.ttf (100%) rename {sass => src/shared/styles}/webfonts/fa-regular-400.woff (100%) rename {sass => src/shared/styles}/webfonts/fa-regular-400.woff2 (100%) rename {sass => src/shared/styles}/webfonts/fa-solid-900.eot (100%) rename {sass => src/shared/styles}/webfonts/fa-solid-900.svg (100%) rename {sass => src/shared/styles}/webfonts/fa-solid-900.ttf (100%) rename {sass => src/shared/styles}/webfonts/fa-solid-900.woff (100%) rename {sass => src/shared/styles}/webfonts/fa-solid-900.woff2 (100%) rename {sass => src/shared/styles}/webfonts/muli.ttf (100%) rename {sass => src/shared/styles}/website.scss (100%) diff --git a/src/converse.js b/src/converse.js index 1f3f9a41b..45c8a851e 100644 --- a/src/converse.js +++ b/src/converse.js @@ -4,10 +4,13 @@ * @license Mozilla Public License (MPLv2) */ + import "@converse/headless/headless"; import "i18n"; import "shared/registry.js"; +import 'shared/styles/index.scss'; + /* START: Removable components * -------------------- * Any of the following components may be removed if they're not needed. @@ -33,7 +36,6 @@ import "./plugins/singleton.js"; /* END: Removable components */ import "./components/converse.js"; -import "../sass/converse.scss"; import { _converse, converse } from "@converse/headless/core"; import { CustomElement } from 'components/element'; diff --git a/src/modals/base.js b/src/modals/base.js index cdd8316b0..b6de20967 100644 --- a/src/modals/base.js +++ b/src/modals/base.js @@ -5,6 +5,8 @@ import { View } from '@converse/skeletor/src/view.js'; import { api, converse } from "@converse/headless/core"; import { render } from 'lit-html'; +import './styles/_modal.scss'; + const { sizzle } = converse.env; const u = converse.env.utils; diff --git a/sass/_modal.scss b/src/modals/styles/_modal.scss similarity index 94% rename from sass/_modal.scss rename to src/modals/styles/_modal.scss index 73c3c3c0b..e178832f3 100644 --- a/sass/_modal.scss +++ b/src/modals/styles/_modal.scss @@ -1,4 +1,9 @@ +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/mixins"; + #conversejs { + @import "bootstrap/scss/modal"; #converse-modals { .modal { diff --git a/src/shared/autocomplete/index.js b/src/shared/autocomplete/index.js index 1dd65cc47..4a80fc0d7 100644 --- a/src/shared/autocomplete/index.js +++ b/src/shared/autocomplete/index.js @@ -3,6 +3,8 @@ import AutoComplete from './autocomplete.js'; import { FILTER_CONTAINS, FILTER_STARTSWITH } from './utils.js'; import { _converse } from '@converse/headless/core'; +import './styles/_autocomplete.scss'; + _converse.FILTER_CONTAINS = FILTER_CONTAINS; _converse.FILTER_STARTSWITH = FILTER_STARTSWITH; _converse.AutoComplete = AutoComplete; diff --git a/sass/_autocomplete.scss b/src/shared/autocomplete/styles/_autocomplete.scss similarity index 100% rename from sass/_autocomplete.scss rename to src/shared/autocomplete/styles/_autocomplete.scss diff --git a/src/shared/chat/emoji-picker.js b/src/shared/chat/emoji-picker.js index dcb0bc7a7..ac3a4671d 100644 --- a/src/shared/chat/emoji-picker.js +++ b/src/shared/chat/emoji-picker.js @@ -9,6 +9,8 @@ import { html } from "lit-element"; import { tpl_emoji_picker } from "./templates/emoji-picker.js"; import { until } from 'lit-html/directives/until.js'; +import './styles/_emoji.scss'; + const u = converse.env.utils; diff --git a/sass/_emoji.scss b/src/shared/chat/styles/_emoji.scss similarity index 98% rename from sass/_emoji.scss rename to src/shared/chat/styles/_emoji.scss index 9db10a503..e3332dc52 100644 --- a/sass/_emoji.scss +++ b/src/shared/chat/styles/_emoji.scss @@ -1,4 +1,10 @@ +@import "bootstrap/scss/functions"; +@import "bootstrap/scss/variables"; +@import "bootstrap/scss/mixins"; + #conversejs { + @import "bootstrap/scss/media"; + .chatbox { img.emoji { height: 1.2em; diff --git a/sass/_bookmarks.scss b/src/shared/styles/_bookmarks.scss similarity index 100% rename from sass/_bookmarks.scss rename to src/shared/styles/_bookmarks.scss diff --git a/sass/_chatbox.scss b/src/shared/styles/_chatbox.scss similarity index 100% rename from sass/_chatbox.scss rename to src/shared/styles/_chatbox.scss diff --git a/sass/_chatrooms.scss b/src/shared/styles/_chatrooms.scss similarity index 100% rename from sass/_chatrooms.scss rename to src/shared/styles/_chatrooms.scss diff --git a/sass/_controlbox.scss b/src/shared/styles/_controlbox.scss similarity index 100% rename from sass/_controlbox.scss rename to src/shared/styles/_controlbox.scss diff --git a/sass/_core.scss b/src/shared/styles/_core.scss similarity index 100% rename from sass/_core.scss rename to src/shared/styles/_core.scss diff --git a/sass/_forms.scss b/src/shared/styles/_forms.scss similarity index 100% rename from sass/_forms.scss rename to src/shared/styles/_forms.scss diff --git a/sass/_headline.scss b/src/shared/styles/_headline.scss similarity index 100% rename from sass/_headline.scss rename to src/shared/styles/_headline.scss diff --git a/sass/_lists.scss b/src/shared/styles/_lists.scss similarity index 100% rename from sass/_lists.scss rename to src/shared/styles/_lists.scss diff --git a/sass/_messages.scss b/src/shared/styles/_messages.scss similarity index 100% rename from sass/_messages.scss rename to src/shared/styles/_messages.scss diff --git a/sass/_minimized_chats.scss b/src/shared/styles/_minimized_chats.scss similarity index 100% rename from sass/_minimized_chats.scss rename to src/shared/styles/_minimized_chats.scss diff --git a/sass/_roster.scss b/src/shared/styles/_roster.scss similarity index 100% rename from sass/_roster.scss rename to src/shared/styles/_roster.scss diff --git a/sass/_toolbar.scss b/src/shared/styles/_toolbar.scss similarity index 100% rename from sass/_toolbar.scss rename to src/shared/styles/_toolbar.scss diff --git a/sass/_variables.scss b/src/shared/styles/_variables.scss similarity index 100% rename from sass/_variables.scss rename to src/shared/styles/_variables.scss diff --git a/sass/font-awesome.scss b/src/shared/styles/font-awesome.scss similarity index 100% rename from sass/font-awesome.scss rename to src/shared/styles/font-awesome.scss diff --git a/sass/converse.scss b/src/shared/styles/index.scss similarity index 88% rename from sass/converse.scss rename to src/shared/styles/index.scss index 9ff5f66e4..43799d0ef 100644 --- a/sass/converse.scss +++ b/src/shared/styles/index.scss @@ -2,7 +2,7 @@ * Converse.js (Web-based XMPP instant messaging client) * https://conversejs.org * - * Copyright (c) 2013-2018, JC Brand + * Copyright (c) 2013-2021, JC Brand * Licensed under the Mozilla Public License */ @import "bootstrap/scss/functions"; @@ -29,13 +29,12 @@ @import "bootstrap/scss/media"; @import "bootstrap/scss/list-group"; @import "bootstrap/scss/close"; - @import "bootstrap/scss/modal"; @import "bootstrap/scss/tooltip"; @import "bootstrap/scss/popover"; @import "bootstrap/scss/utilities"; } -@import "font-awesome"; +@import "./font-awesome.scss"; @import "variables"; @import "core"; @@ -43,7 +42,6 @@ @import "toolbar"; @import "chatbox"; @import "controlbox"; -@import "modal"; @import "roster"; @import "lists"; @import "chatrooms"; @@ -51,5 +49,3 @@ @import "messages"; @import "minimized_chats"; @import "bookmarks"; -@import "autocomplete"; -@import "emoji"; diff --git a/sass/webfonts/baumans.ttf b/src/shared/styles/webfonts/baumans.ttf similarity index 100% rename from sass/webfonts/baumans.ttf rename to src/shared/styles/webfonts/baumans.ttf diff --git a/sass/webfonts/fa-brands-400.eot b/src/shared/styles/webfonts/fa-brands-400.eot similarity index 100% rename from sass/webfonts/fa-brands-400.eot rename to src/shared/styles/webfonts/fa-brands-400.eot diff --git a/sass/webfonts/fa-brands-400.svg b/src/shared/styles/webfonts/fa-brands-400.svg similarity index 100% rename from sass/webfonts/fa-brands-400.svg rename to src/shared/styles/webfonts/fa-brands-400.svg diff --git a/sass/webfonts/fa-brands-400.ttf b/src/shared/styles/webfonts/fa-brands-400.ttf similarity index 100% rename from sass/webfonts/fa-brands-400.ttf rename to src/shared/styles/webfonts/fa-brands-400.ttf diff --git a/sass/webfonts/fa-brands-400.woff b/src/shared/styles/webfonts/fa-brands-400.woff similarity index 100% rename from sass/webfonts/fa-brands-400.woff rename to src/shared/styles/webfonts/fa-brands-400.woff diff --git a/sass/webfonts/fa-brands-400.woff2 b/src/shared/styles/webfonts/fa-brands-400.woff2 similarity index 100% rename from sass/webfonts/fa-brands-400.woff2 rename to src/shared/styles/webfonts/fa-brands-400.woff2 diff --git a/sass/webfonts/fa-regular-400.eot b/src/shared/styles/webfonts/fa-regular-400.eot similarity index 100% rename from sass/webfonts/fa-regular-400.eot rename to src/shared/styles/webfonts/fa-regular-400.eot diff --git a/sass/webfonts/fa-regular-400.svg b/src/shared/styles/webfonts/fa-regular-400.svg similarity index 100% rename from sass/webfonts/fa-regular-400.svg rename to src/shared/styles/webfonts/fa-regular-400.svg diff --git a/sass/webfonts/fa-regular-400.ttf b/src/shared/styles/webfonts/fa-regular-400.ttf similarity index 100% rename from sass/webfonts/fa-regular-400.ttf rename to src/shared/styles/webfonts/fa-regular-400.ttf diff --git a/sass/webfonts/fa-regular-400.woff b/src/shared/styles/webfonts/fa-regular-400.woff similarity index 100% rename from sass/webfonts/fa-regular-400.woff rename to src/shared/styles/webfonts/fa-regular-400.woff diff --git a/sass/webfonts/fa-regular-400.woff2 b/src/shared/styles/webfonts/fa-regular-400.woff2 similarity index 100% rename from sass/webfonts/fa-regular-400.woff2 rename to src/shared/styles/webfonts/fa-regular-400.woff2 diff --git a/sass/webfonts/fa-solid-900.eot b/src/shared/styles/webfonts/fa-solid-900.eot similarity index 100% rename from sass/webfonts/fa-solid-900.eot rename to src/shared/styles/webfonts/fa-solid-900.eot diff --git a/sass/webfonts/fa-solid-900.svg b/src/shared/styles/webfonts/fa-solid-900.svg similarity index 100% rename from sass/webfonts/fa-solid-900.svg rename to src/shared/styles/webfonts/fa-solid-900.svg diff --git a/sass/webfonts/fa-solid-900.ttf b/src/shared/styles/webfonts/fa-solid-900.ttf similarity index 100% rename from sass/webfonts/fa-solid-900.ttf rename to src/shared/styles/webfonts/fa-solid-900.ttf diff --git a/sass/webfonts/fa-solid-900.woff b/src/shared/styles/webfonts/fa-solid-900.woff similarity index 100% rename from sass/webfonts/fa-solid-900.woff rename to src/shared/styles/webfonts/fa-solid-900.woff diff --git a/sass/webfonts/fa-solid-900.woff2 b/src/shared/styles/webfonts/fa-solid-900.woff2 similarity index 100% rename from sass/webfonts/fa-solid-900.woff2 rename to src/shared/styles/webfonts/fa-solid-900.woff2 diff --git a/sass/webfonts/muli.ttf b/src/shared/styles/webfonts/muli.ttf similarity index 100% rename from sass/webfonts/muli.ttf rename to src/shared/styles/webfonts/muli.ttf diff --git a/sass/website.scss b/src/shared/styles/website.scss similarity index 100% rename from sass/website.scss rename to src/shared/styles/website.scss diff --git a/webpack.prod.js b/webpack.prod.js index e01cbe7dd..d272caf31 100644 --- a/webpack.prod.js +++ b/webpack.prod.js @@ -19,7 +19,7 @@ const plugins = [ {from: 'logo/conversejs-filled-512.png', to: 'images/logo'}, {from: 'logo/conversejs-filled-192.svg', to: 'images/logo'}, {from: 'logo/conversejs-filled-512.svg', to: 'images/logo'}, - {from: 'sass/webfonts', to: 'webfonts'} + {from: 'src/shared/styles/webfonts', to: 'webfonts'} ] }), new webpack.DefinePlugin({ // This makes it possible for us to safely use env vars on our code @@ -62,4 +62,3 @@ module.exports = merge(common, { }] } }); -