Skip to content

Sass migration #1299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
didoda merged 6 commits into from
Oct 27, 2025
Merged

Sass migration #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
096c5b6
feat: apply sass migrator module on scss files
didoda Aug 12, 2025
d3e89f6
feat: silence sass warnings in build
didoda Aug 12, 2025
2f59a69
chore feat: update dependencies
didoda Aug 12, 2025
5a2fcaf
refactor: loaders options
didoda Aug 12, 2025
9166555
Merge branch 'master' into refactor/scss-sass-migration
didoda Sep 15, 2025
0b0571c
Merge branch 'master' into refactor/scss-sass-migration
didoda Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
"eslint-plugin-vue": "^9.32.0",
"gettext-parser": "^4.0.2",
"json-loader": "^0.5.7",
"mini-css-extract-plugin": "^2.9.2",
"mini-css-extract-plugin": "^2.9.4",
"moment-locales-webpack-plugin": "^1.0.7",
"sass": "^1.82.0",
"sass": "^1.90.0",
"sass-loader": "^12.2.0",
"svg-url-loader": "^7.1.1",
"ttag-cli": "^1.9.2",
Expand All @@ -75,4 +75,4 @@
"webpack-cli": "^4.9.0",
"webpack-watch-files-plugin": "^1.2.0"
}
}
}
24 changes: 13 additions & 11 deletions resources/js/app/components/dialog/dialog.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../../../../styles/variables";

.bedita-dialog {
.backdrop {
position: fixed;
Expand Down Expand Up @@ -52,28 +54,28 @@
}

&.warning {
border-color: $warning;
border-color: variables.$warning;
}

&.error {
border-color: $error;
border-color: variables.$error;
}

&.prompt,
&.info {
border-color: $info;
border-color: variables.$info;

.icon-info-1,
.icon-info-circled {
color: $info;
color: variables.$info;
}
}

&.success {
border-color: $success;
border-color: variables.$success;

.icon-ok-circled-1 {
color: $success;
color: variables.$success;
}
}

Expand All @@ -89,7 +91,7 @@

input[type=text] {
width: 100%;
border: 1px solid $gray-600;
border: 1px solid variables.$gray-600;
}

details {
Expand All @@ -101,12 +103,12 @@
width: 100%;
max-height: 400px;
overflow: auto;
margin-top: $gutter * .75;
padding: $gutter * .75;
margin-top: variables.$gutter * .75;
padding: variables.$gutter * .75;
flex: 1;
background-color: $gray-200;
background-color: variables.$gray-200;
font-family: monospace;
font-size: $font-size-sm;
font-size: variables.$font-size-sm;
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions resources/richeditor.lazy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,24 @@

BEdita Manager
*/
@import './styles/variables'; // common variables used for color, margins, typography, media breakpoints, tag collections
@import './styles/mixins';
@use 'styles/variables'; // common variables used for color, margins, typography, media breakpoints, tag collections
@use 'styles/mixins';

// general
@import './styles/base';
@use 'styles/base';

// tinymce base content style
@import '~tinymce/skins/ui/oxide/content';
@use '../node_modules/tinymce/skins/ui/oxide/content';

@import url("https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:ital,wght@0,200;0,400;1,200;1,400&family=IBM+Plex+Sans:ital,wght@0,200;0,300;0,400;0,500;1,200;1,300;1,400;1,500&family=IBM+Plex+Serif:ital,wght@0,200;0,400;0,700;1,200;1,400;1,700&display=swap");

body {
padding: 1em !important;
color: unset;
background: unset;
font-family: $font-family-monospace;
font-size: $font-size-base;
font-weight: $font-weight-base;
font-family: variables.$font-family-monospace;
font-size: variables.$font-size-base;
font-weight: variables.$font-weight-base;
}

.mce-offscreen-selection {
Expand All @@ -40,7 +40,7 @@ p {
blockquote {
padding-left:1rem;
margin-left:0;
border-left: 4px solid $gray-700;
border-left: 4px solid variables.$gray-700;
}

a {
Expand All @@ -58,7 +58,7 @@ a:link, a:hover, a:active, a:visited {

[data-placeholder] {
&[data-mce-selected] {
outline: solid 2px $info;
outline: solid 2px variables.$info;
}
}

Expand Down Expand Up @@ -91,11 +91,11 @@ div[data-placeholder] {
}

details {
border: 1px solid $gray-700;
border: 1px solid variables.$gray-700;
border-radius: 2px;
padding: 0 4px;
}

summary {
border-bottom: 1px solid $gray-700;
border-bottom: 1px solid variables.$gray-700;
}
86 changes: 43 additions & 43 deletions resources/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,56 +9,56 @@

BEdita Manager
*/
@import './styles/variables'; // common variables used for color, margins, typography, media breakpoints, tag collections
@import './styles/mixins';
@use 'styles/variables'; // common variables used for color, margins, typography, media breakpoints, tag collections
@use 'styles/mixins';

// general
@import './styles/base_normalize';
@import './styles/base';
@import './styles/layout'; // main grid base layout
@import './styles/buttons';
@import './styles/forms';
@import './styles/forms_file';
@import './styles/utility_classes';
@import './styles/elements';
@import './styles/columns';
@import './styles/richtexteditor';
@use 'styles/base_normalize';
@use 'styles/base';
@use 'styles/layout'; // main grid base layout
@use 'styles/buttons';
@use 'styles/forms';
@use 'styles/forms_file';
@use 'styles/utility_classes';
@use 'styles/elements';
@use 'styles/columns';
@use 'styles/richtexteditor';

// elements
@import '../templates/Element/Form/form';
@import '../templates/Element/Form/calendar';
@import '../templates/Element/Form/locations';
@import '../templates/Element/Form/trees';
@import '../templates/Element/Form/publish_properties';
@import '../templates/Element/Form/relations';
@import '../templates/Element/Form/map';
@import '../templates/Element/Form/history';
@import '../templates/Element/Form/categories';
@import '../templates/Element/flash/flash';
@import '../templates/Element/Menu/colophon';
@import '../templates/Element/Menu/menu';
@import '../templates/Element/Menu/sidebar';
@import '../templates/Element/Modules/index_properties';
@import '../templates/Element/FilterBox/filter_box';
@import '../templates/Element/Panel/panel';
@use '../templates/Element/Form/form';
@use '../templates/Element/Form/calendar';
@use '../templates/Element/Form/locations';
@use '../templates/Element/Form/trees';
@use '../templates/Element/Form/publish_properties';
@use '../templates/Element/Form/relations';
@use '../templates/Element/Form/map';
@use '../templates/Element/Form/history';
@use '../templates/Element/Form/categories';
@use '../templates/Element/flash/flash';
@use '../templates/Element/Menu/colophon';
@use '../templates/Element/Menu/menu';
@use '../templates/Element/Menu/sidebar';
@use '../templates/Element/Modules/index_properties';
@use '../templates/Element/FilterBox/filter_box';
@use '../templates/Element/Panel/panel';

// components
@import './js/app/components/dialog/dialog.scss';
@import './js/app/components/ajax-login/ajax-login.scss';
@import './js/app/components/tag-form/tag-form.scss';
@use 'js/app/components/dialog/dialog.scss';
@use 'js/app/components/ajax-login/ajax-login.scss';
@use 'js/app/components/tag-form/tag-form.scss';

// Pages
@import '../templates/Pages/Login/login';
@import '../templates/Pages/Dashboard/dashboard';
@import '../templates/Pages/Admin/admin';
@import '../templates/Pages/Import/import';
@import '../templates/Pages/Modules/modules-index';
@import '../templates/Pages/Modules/modules-view';
@import '../templates/Pages/Model/model-index';
@import '../templates/Pages/Model/model-view';
@import '../templates/Pages/Translations/view';
@use '../templates/Pages/Login/login';
@use '../templates/Pages/Dashboard/dashboard';
@use '../templates/Pages/Admin/admin';
@use '../templates/Pages/Import/import';
@use '../templates/Pages/Modules/modules-index';
@use '../templates/Pages/Modules/modules-view';
@use '../templates/Pages/Model/model-index';
@use '../templates/Pages/Model/model-view';
@use '../templates/Pages/Translations/view';

@import './styles/non-production';
@use 'styles/non-production';

// vue
[v-cloak] {
Expand All @@ -80,7 +80,7 @@ BEdita Manager
border-top-color: transparent;
content: "";
display: block;
height: $gutter * 2;
width: $gutter * 2;
height: variables.$gutter * 2;
width: variables.$gutter * 2;
}
}
24 changes: 13 additions & 11 deletions resources/styles/_base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
@use "variables";

// base

body {
overflow-x: hidden;
font-family: $font-family-base;
font-size: $font-size-sm;
line-height: $line-height-base;
background-color: $defaultBackground;
font-family: variables.$font-family-base;
font-size: variables.$font-size-sm;
line-height: variables.$line-height-base;
background-color: variables.$defaultBackground;
// background-image: linear-gradient(160deg, $gray-900 0%, $gray-800 100%);
background-attachment: fixed;
background-repeat: no-repeat;
color: $white;
font-weight: $font-weight-base;
color: variables.$white;
font-weight: variables.$font-weight-base;
text-align: left; // explicit initial text-align value so that we can later use `inherit`
}

*,
*::before,
*::after { box-sizing: border-box; }

h1 { margin-bottom: $gutter; }
h1 { margin-bottom: variables.$gutter; }
h1, h2, h3 {
margin-top: 0;
line-height: 1.125em;
font-weight: $font-weight-base;
font-weight: variables.$font-weight-base;
}

p { margin: 0; }
Expand All @@ -34,7 +36,7 @@ a:link, a:hover, a:active, a:visited {
}

b, strong {
font-weight: $font-weight-bold;
font-weight: variables.$font-weight-bold;
}

figure { margin: 0; }
Expand All @@ -54,10 +56,10 @@ dl {
margin: 0;
dd {
margin: 0;
font-weight: $font-weight-bold;
font-weight: variables.$font-weight-bold;
}
dd + dt {
margin-top: $gutter * .25;
margin-top: variables.$gutter * .25;
}
}

Expand Down
Loading
Loading