Skip to content

Commit

Permalink
Merge branch 'pu/sd/VueStuff_In_Tinebase' into '2024.11'
Browse files Browse the repository at this point in the history
libs(Vue_Bootstrap): include vue-runtime and bs-styles in entrypoint

See merge request tine20/tine20!4723
  • Loading branch information
Sohan Deshar committed Jan 16, 2024
2 parents f41ac21 + b096e58 commit 2bd002a
Show file tree
Hide file tree
Showing 5 changed files with 120 additions and 2 deletions.
47 changes: 47 additions & 0 deletions tine20/Tinebase/css/bootstrap-vue/_global_bs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
// scss-docs-start import-stack
// Configuration
@import "bootstrap/scss/functions";
@import "bootstrap/scss/variables";
@import "bootstrap/scss/maps";
@import "bootstrap/scss/mixins";
@import "bootstrap/scss/utilities";

// Layoutbootstrap/scss/ & components
@import "bootstrap/scss/root";
// @import "bootstrap/scss/reboot";
// @import "bootstrap/scss/type";
// @import "bootstrap/scss/images";
// @import "bootstrap/scss/containers";
// @import "bootstrap/scss/grid";
// @import "bootstrap/scss/tables";
// @import "bootstrap/scss/forms";
// @import "bootstrap/scss/buttons";
// @import "bootstrap/scss/transitions";
// @import "bootstrap/scss/dropdown";
// @import "bootstrap/scss/button-group";
// @import "bootstrap/scss/nav";
// @import "bootstrap/scss/navbar";
// @import "bootstrap/scss/card";
// @import "bootstrap/scss/accordion";
// @import "bootstrap/scss/breadcrumb";
// @import "bootstrap/scss/pagination";
// @import "bootstrap/scss/badge";
// @import "bootstrap/scss/alert";
// @import "bootstrap/scss/progress";
// @import "bootstrap/scss/list-group";
// @import "bootstrap/scss/close";
// @import "bootstrap/scss/toasts";
@import "bootstrap/scss/modal";
// @import "bootstrap/scss/tooltip";
// @import "bootstrap/scss/popover";
// @import "bootstrap/scss/carousel";
// @import "bootstrap/scss/spinners";
// @import "bootstrap/scss/offcanvas";
// @import "bootstrap/scss/placeholders";

// // Helperbootstrap/scss/s
// @import "bootstrap/scss/helpers";

// // Utilitbootstrap/scss/ies
// @import "bootstrap/scss/utilities/api";
// // scss-docs-end import-stack
52 changes: 52 additions & 0 deletions tine20/Tinebase/css/bootstrap-vue/_scopable_bs.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// This file imports all the styles that can be scoped.
// i.e. styles that need not be in the global scope
// css-selector {
// @import "<path_to_this_file>"
// }

// scss-docs-start import-stack
// Configuration
//@import "bootstrap/scss/functions";
//@import "bootstrap/scss/variables";
//@import "bootstrap/scss/maps";
//@import "bootstrap/scss/mixins";
//@import "bootstrap/scss/utilities";

// Layoutbootstrap/scss/ & components
// @import "bootstrap/scss/root";
@import "bootstrap/scss/reboot";
@import "bootstrap/scss/type";
@import "bootstrap/scss/images";
@import "bootstrap/scss/containers";
@import "bootstrap/scss/grid";
@import "bootstrap/scss/tables";
@import "bootstrap/scss/forms";
@import "bootstrap/scss/buttons";
@import "bootstrap/scss/transitions";
@import "bootstrap/scss/dropdown";
@import "bootstrap/scss/button-group";
@import "bootstrap/scss/nav";
@import "bootstrap/scss/navbar";
@import "bootstrap/scss/card";
@import "bootstrap/scss/accordion";
@import "bootstrap/scss/breadcrumb";
@import "bootstrap/scss/pagination";
@import "bootstrap/scss/badge";
@import "bootstrap/scss/alert";
@import "bootstrap/scss/progress";
@import "bootstrap/scss/list-group";
@import "bootstrap/scss/close";
@import "bootstrap/scss/toasts";
// @import "bootstrap/scss/modal";
@import "bootstrap/scss/tooltip";
@import "bootstrap/scss/popover";
@import "bootstrap/scss/carousel";
@import "bootstrap/scss/spinners";
@import "bootstrap/scss/offcanvas";
@import "bootstrap/scss/placeholders";

// Helperbootstrap/scss/s
@import "bootstrap/scss/helpers";

// Utilitbootstrap/scss/ies
@import "bootstrap/scss/utilities/api";
13 changes: 13 additions & 0 deletions tine20/Tinebase/css/bootstrap-vue/custom_vue_styles.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
$primary: #0062a7; // setting the primary color

$alert-padding-y: 5px;
$alert-margin-bottom: 2px;

@import 'global_bs'; // global bs styles needed for modal
@import 'bootstrap-vue-next/dist/bootstrap-vue-next.css'; // bs-Vue styles

.bootstrap-scope{
@import './scopable_bs';
font-family: arial, tahoma, helvetica, sans-serif;
font-size: 1.1em;
}
9 changes: 8 additions & 1 deletion tine20/Tinebase/js/Tinebase.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ require('../css/darkmode.less');
// other libs
var lodash = require('lodash');
var director = require('director');
const vue = require('vue');
const mitt = require('mitt')

// custom bootstrap styles
require('../css/bootstrap-vue/custom_vue_styles.scss')

require('./ux/util/screenshot');
require('./ux/file/UploadManagerUI');
Expand All @@ -57,5 +62,7 @@ module.exports = {
director: director,
postal: postal,
lodash: lodash,
_: lodash
_: lodash,
vue: vue,
mitt: mitt
};
1 change: 0 additions & 1 deletion tine20/Tinebase/js/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ module.exports = {
},
externals: {
fs: "fs",
vue: "vue"
},
externalsType: "window",
output: {
Expand Down

0 comments on commit 2bd002a

Please sign in to comment.