Forráskód Böngészése

Move controlbox styles to plugin folder

JC Brand 4 éve
szülő
commit
005cf4dc96

+ 2 - 0
src/plugins/controlbox/index.js

@@ -15,6 +15,8 @@ import log from '@converse/headless/log';
 import { _converse, api, converse } from '@converse/headless/core';
 import { _converse, api, converse } from '@converse/headless/core';
 import { addControlBox } from './utils.js';
 import { addControlBox } from './utils.js';
 
 
+import './styles/_controlbox.scss';
+
 const u = converse.env.utils;
 const u = converse.env.utils;
 
 
 
 

+ 5 - 0
src/shared/styles/_controlbox.scss → src/plugins/controlbox/styles/_controlbox.scss

@@ -1,3 +1,8 @@
+@import "bootstrap/scss/functions";
+@import "bootstrap/scss/variables";
+@import "shared/styles/_variables.scss";
+@import "shared/styles/_mixins.scss";
+
 #conversejs {
 #conversejs {
     .oauth-providers {
     .oauth-providers {
         text-align: center;
         text-align: center;

+ 0 - 8
src/shared/styles/_core.scss

@@ -1,11 +1,3 @@
-@mixin fade-in {
-    opacity: 0;  /* make things invisible upon start */
-    animation-name: fadein;
-    animation-fill-mode: forwards;
-    animation-duration: 0.5s;
-    animation-timing-function: ease;
-}
-
 body.converse-fullscreen {
 body.converse-fullscreen {
     margin: 0;
     margin: 0;
     background-color: var(--global-background-color);
     background-color: var(--global-background-color);

+ 9 - 0
src/shared/styles/_mixins.scss

@@ -0,0 +1,9 @@
+@import "bootstrap/scss/mixins";
+
+@mixin fade-in {
+    opacity: 0;  /* make things invisible upon start */
+    animation-name: fadein;
+    animation-fill-mode: forwards;
+    animation-duration: 0.5s;
+    animation-timing-function: ease;
+}

+ 1 - 1
src/shared/styles/index.scss

@@ -37,11 +37,11 @@
 @import "./font-awesome.scss";
 @import "./font-awesome.scss";
 @import "variables";
 @import "variables";
 
 
+@import "mixins";
 @import "core";
 @import "core";
 @import "forms";
 @import "forms";
 @import "toolbar";
 @import "toolbar";
 @import "chatbox";
 @import "chatbox";
-@import "controlbox";
 @import "roster";
 @import "roster";
 @import "lists";
 @import "lists";
 @import "chatrooms";
 @import "chatrooms";

+ 4 - 1
webpack.common.js

@@ -63,7 +63,10 @@ module.exports = {
                     loader: 'sass-loader',
                     loader: 'sass-loader',
                     options: {
                     options: {
                         sassOptions: {
                         sassOptions: {
-                            includePaths: [path.resolve(__dirname, 'node_modules/')]
+                            includePaths: [
+                                path.resolve(__dirname, 'node_modules/'),
+                                path.resolve(__dirname, 'src/')
+                            ]
                         },
                         },
                         sourceMap: true
                         sourceMap: true
                     }
                     }