Skip to content

Commit

Permalink
Move Stylesheets out of assets folder
Browse files Browse the repository at this point in the history
We do not want our individual stylesheets to be precompiled
as seperate files. We have precompiled files in assets/builds.
  • Loading branch information
tvdeyen committed Oct 6, 2024
1 parent 020f08f commit 92c6346
Show file tree
Hide file tree
Showing 72 changed files with 62 additions and 62 deletions.
2 changes: 1 addition & 1 deletion app/assets/builds/alchemy/admin.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/assets/builds/alchemy/admin/page-select.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/assets/builds/alchemy/admin/print.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/assets/builds/alchemy/welcome.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions app/assets/stylesheets/alchemy/_defaults.scss

This file was deleted.

43 changes: 0 additions & 43 deletions app/assets/stylesheets/alchemy/admin.scss

This file was deleted.

3 changes: 3 additions & 0 deletions app/stylesheets/alchemy/_defaults.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "./variables";
@import "./mixins";
@import "./extends";
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "alchemy/deprecation";
@import "./deprecation";

@include alchemy-deprecated-variable("$default-padding", "var(--spacing-1)");
@include alchemy-deprecated-variable("$default-margin", "var(--spacing-1)");
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "alchemy/deprecated_variables";
@import "./deprecated_variables";

$light-blue: hsl(203deg, 32%, 85%);
$very-light-blue: hsl(203deg, 32%, 97%);
Expand Down
43 changes: 43 additions & 0 deletions app/stylesheets/alchemy/admin.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
@import "./custom-properties";
@import "./defaults";
@import "./fonts";
@import "./admin/archive";
@import "./admin/attachment-select";
@import "./admin/attachments";
@import "./admin/base";
@import "./admin/buttons";
@import "./admin/clipboard";
@import "./admin/dashboard";
@import "./admin/dialogs";
@import "./admin/elements";
@import "./admin/errors";
@import "./admin/flash";
@import "./admin/flatpickr";
@import "./admin/form_fields";
@import "./admin/forms";
@import "./admin/frame";
@import "./admin/hints";
@import "./admin/icons";
@import "./admin/image_library";
@import "./admin/images";
@import "./admin/labels";
@import "./admin/list_filter";
@import "./admin/lists";
@import "./admin/navigation";
@import "./admin/node-select";
@import "./admin/nodes";
@import "./admin/notices";
@import "./admin/pagination";
@import "./admin/preview_window";
@import "./admin/resource_info";
@import "./admin/search";
@import "./admin/selects";
@import "./admin/shoelace";
@import "./admin/sitemap";
@import "./admin/spinner";
@import "./admin/tables";
@import "./admin/tags";
@import "./admin/toolbar";
@import "./admin/typography";
@import "./admin/upload";
@import "cropper.min";
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import "alchemy/defaults";
@import "../defaults";

div#main_menu,
div#top_menu,
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "alchemy/custom-properties";
@import "alchemy/variables";
@import "alchemy/fonts";
@import "./custom-properties";
@import "./variables";
@import "./fonts";

body {
background-color: $main-menu-bg-color;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* For commercial licenses see https://www.tiny.cloud/
*/

@import "alchemy/variables";
@import "alchemy/custom-properties";
@import "../../../../alchemy/variables";
@import "../../../../alchemy/custom-properties";

html {
font-size: 13px;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* For commercial licenses see https://www.tiny.cloud/
*/

@import "alchemy/variables";
@import "../../../../alchemy/variables";

.tox {
box-shadow: none;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"lint": "prettier --check 'app/javascript/**/*.js'",
"eslint": "eslint app/javascript/**/*.js",
"build:js": "rollup -c",
"build:css": "sass --style=compressed --source-map --load-path app/assets/stylesheets --load-path vendor/assets/stylesheets --load-path node_modules/cropperjs/dist app/assets/stylesheets/alchemy/admin.scss:app/assets/builds/alchemy/admin.css app/assets/stylesheets/alchemy/admin/print.scss:app/assets/builds/alchemy/admin/print.css app/assets/stylesheets/alchemy/welcome.scss:app/assets/builds/alchemy/welcome.css app/assets/stylesheets/tinymce/skins/content/alchemy/content.scss:app/assets/builds/tinymce/skins/content/alchemy/content.min.css app/assets/stylesheets/tinymce/skins/ui/alchemy/skin.scss:app/assets/builds/tinymce/skins/ui/alchemy/skin.min.css app/assets/stylesheets/alchemy/admin/page-select.scss:app/assets/builds/alchemy/admin/page-select.css",
"build:css": "sass --style=compressed --source-map --load-path app/assets/stylesheets --load-path vendor/assets/stylesheets --load-path node_modules/cropperjs/dist app/stylesheets/alchemy/admin.scss:app/assets/builds/alchemy/admin.css app/stylesheets/alchemy/admin/print.scss:app/assets/builds/alchemy/admin/print.css app/stylesheets/alchemy/welcome.scss:app/assets/builds/alchemy/welcome.css app/stylesheets/tinymce/skins/content/alchemy/content.scss:app/assets/builds/tinymce/skins/content/alchemy/content.min.css app/stylesheets/tinymce/skins/ui/alchemy/skin.scss:app/assets/builds/tinymce/skins/ui/alchemy/skin.min.css app/stylesheets/alchemy/admin/page-select.scss:app/assets/builds/alchemy/admin/page-select.css",
"handlebars:compile": "handlebars app/javascript/alchemy_admin/templates/*.hbs -f app/javascript/alchemy_admin/templates/compiled.js -o -m",
"build": "bun run --bun build:js && bun run --bun build:css && bun run --bun handlebars:compile"
},
Expand Down

0 comments on commit 92c6346

Please sign in to comment.