Skip to content
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.

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

Tinymce UI css updates #345

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions news/345.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Extend ``tinymce-ui-content.css`` with barceloneta base CSS definitions.
[petschki]
50 changes: 25 additions & 25 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
},
"scripts": {
"watch": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"",
"build": "npm-run-all css-compile-main css-prefix-main css-minify-main copy-tinymce-ui-css",
"build": "npm-run-all css-compile-main css-prefix-main css-minify-main css-compile-tinymce-ui",
"css-main": "npm-run-all css-compile-main css-prefix-main css-minify-main",
"css-compile-main": "sass --load-path=node_modules --style expanded --source-map --embed-sources --no-error-css scss/barceloneta.scss:plonetheme/barceloneta/theme/css/barceloneta.css",
"css-prefix-main": "postcss --config postcss.config.js --replace \"plonetheme/barceloneta/theme/css/*.css\" \"!plonetheme/barceloneta/theme/css/*.min.css\"",
"css-minify-main": "cleancss -O1 --format breakWith=lf --with-rebase --source-map --source-map-inline-sources --output plonetheme/barceloneta/theme/css/barceloneta.min.css plonetheme/barceloneta/theme/css/barceloneta.css",
"css-lint": "stylelint \"scss/**/*.scss\" --cache --cache-location .cache/.stylelintcache",
"copy-tinymce-ui-css": "cp \"node_modules/tinymce/skins/ui/oxide/content.css\" \"plonetheme/barceloneta/theme/tinymce/tinymce-ui-content.css\""
"css-compile-tinymce-ui": "sass --load-path=node_modules --style expanded --source-map --embed-sources --no-error-css scss/tinymce-ui.scss:plonetheme/barceloneta/theme/tinymce/tinymce-ui-content.css"
},
"dependencies": {
"bootstrap": "5.3.1"
Expand Down
2 changes: 1 addition & 1 deletion plonetheme/barceloneta/theme/css/barceloneta.css

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

2 changes: 1 addition & 1 deletion plonetheme/barceloneta/theme/css/barceloneta.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plonetheme/barceloneta/theme/css/barceloneta.min.css.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion plonetheme/barceloneta/theme/tinymce/tinymce-formats.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* tinyMCE format examples
Styles in will be automatically added to the top level of the formats menu.
CSS classes defined in this file will be automatically added to the top level of the formats menu.
Condition is that the file is named tinymce-formats.css and registered in the TinyMCE controlpanel.
*/

Expand Down
Loading