Merge pull request #15 from oarepo/stojanovic/ep-89-handling-css

fixed theme.less

src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/invenio.cfg

@@ -285,7 +285,7 @@ SETTINGS_TEMPLATE='invenio_theme/page_settings.html'
 
 THEME_HEADER_TEMPLATE = "oarepo_ui/header.html"
 THEME_FOOTER_TEMPLATE = "oarepo_ui/footer.html"
-THEME_JAVASCRIPT_TEMPLATE = "oarepo_ui/javascript.html"
+THEME_JAVASCRIPT_TEMPLATE = "javascript.html"
 THEME_TRACKINGCODE_TEMPLATE = "oarepo_ui/trackingcode.html"
 THEME_CSS_TEMPLATE = "css.html"
 
@@ -310,7 +310,7 @@ REPOSITORY_DESCRIPTION = "{{ cookiecutter.repository_description }}"
 # We set this to avoid bug: https://github.com/inveniosoftware/invenio-administration/issues/180
 THEME_HEADER_LOGIN_TEMPLATE = "header_login.html"
 
-BASE_TEMPLATE = "base/page.html"
+BASE_TEMPLATE = "oarepo_ui/base_page.html"
 
 RATELIMIT_GUEST_USER = "5000 per hour;500 per minute"
 RATELIMIT_AUTHENTICATED_USER = "20000 per hour;2000 per minute"

src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/{{cookiecutter.ui_package}}/branding/semantic-ui/less/theme.less

@@ -103,10 +103,6 @@ Sample output:
   /* invenio global css styles */
   @import (optional, multiple) "themes/invenio/@{type}s/@{element}.overrides";
 
-  /* oarepo-ui overrides */
-  @import (optional, multiple)
-    "@{siteFolder}/oarepo_ui/themes/default/globals/site.overrides";
-  @import (optional, multiple) "@{siteFolder}/globals/site.overrides";
 
   @import (optional, multiple)
     "@{siteFolder}/oarepo_ui/themes/@{theme}/@{type}s/@{element}.overrides";
@@ -115,7 +111,11 @@ Sample output:
   @import (optional, multiple)
     "@{siteFolder}/components/@{theme}/@{type}s/@{element}.overrides";
 
-  /* site theme css style */
+    /* site theme css style */
+  /* this one imports overrides for components located in the site itself i.e. button, 
+  container etc. */
   @import (optional, multiple)
     "@{siteFolder}/@{theme}/@{type}s/@{element}.overrides";
+  /* this one imports overrides for global folder i.e. site.overrides. */
+  @import (optional, multiple) "@{siteFolder}/@{type}s/@{element}.overrides";
 }

src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/{{cookiecutter.ui_package}}/branding/templates/base/css.html

@@ -1,3 +1,5 @@
-{% include "oarepo_ui/css.html" %}
-{{ webpack['branding.css']}}
-{{webpack['components.css']}}
+{% raw %}
+    {% include "oarepo_ui/css.html" %}
+        {{ webpack['branding.css']}}
+        {{webpack['components.css']}}
+{% endraw %}

src/nrp_devtools/templates/repository/{{cookiecutter.repository_name}}/{{cookiecutter.ui_package}}/branding/templates/base/javascript.html

@@ -0,0 +1,5 @@
+{% raw %}
+    {% include "oarepo_ui/javascript.html" %}
+        {{ webpack['branding.js']}}
+        {{webpack['components.js']}}
+{% endraw %}