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

Add theme maintenance mode #35

Open
wants to merge 12 commits into
base: master
Choose a base branch
from

Conversation

mariolorenz
Copy link

I´ve add an maintenance-task to the grunt-file.

The idea of the task is, to generate the assets files for the theme himself. In this way, the moga theme can be used immediately as an OXID theme without having to recreate all of the resources.

@mariolorenz
Copy link
Author

@tfavetto I´ve updated somethings:

  • maintenance create a bootstrap for compiling
  • the search-icon was broken (it was noticed when recompiling the icons)
  • switch to newer version for icon-creations
  • remove the preview.css from templates (i´ve add a pull request to moga-module, to add a overload-block)

because of compatibility during merge with master
# Conflicts:
#	Gruntfile.js
#	build/scss/style.scss
#	build/scss/vendor/_bootstrap-opt.scss
#	build/scss/vendor/_bootstrap.scss
#	build/vendor/bootstrap/js/src/alert.js
#	build/vendor/bootstrap/js/src/base-component.js
#	build/vendor/bootstrap/js/src/button.js
#	build/vendor/bootstrap/js/src/carousel.js
#	build/vendor/bootstrap/js/src/collapse.js
#	build/vendor/bootstrap/js/src/dom/data.js
#	build/vendor/bootstrap/js/src/dom/event-handler.js
#	build/vendor/bootstrap/js/src/dom/manipulator.js
#	build/vendor/bootstrap/js/src/dom/selector-engine.js
#	build/vendor/bootstrap/js/src/dropdown.js
#	build/vendor/bootstrap/js/src/modal.js
#	build/vendor/bootstrap/js/src/offcanvas.js
#	build/vendor/bootstrap/js/src/popover.js
#	build/vendor/bootstrap/js/src/scrollspy.js
#	build/vendor/bootstrap/js/src/tab.js
#	build/vendor/bootstrap/js/src/toast.js
#	build/vendor/bootstrap/js/src/tooltip.js
#	build/vendor/bootstrap/js/src/util/backdrop.js
#	build/vendor/bootstrap/js/src/util/index.js
#	build/vendor/bootstrap/js/src/util/sanitizer.js
#	build/vendor/bootstrap/js/src/util/scrollbar.js
#	out/moga/src/css/styles-all.min.css
#	out/moga/src/fonts/icons.woff
#	out/moga/src/fonts/icons.woff2
#	package-lock.json
#	package.json
#	tpl/layout/base.tpl
@mariolorenz
Copy link
Author

Hello @tfavetto,

I have updated my branch to the master. In the moment there are no merge-conflicts. Can you check it out?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant