diff --git a/.bowerrc b/.bowerrc index f3ba99a..fbbd19a 100644 --- a/.bowerrc +++ b/.bowerrc @@ -1,3 +1,3 @@ { - "directory": "shelfzilla/themes/bootflat/static/bower" + "directory": "shelfzilla/themes/kurono/static/bower" } diff --git a/.gitignore b/.gitignore index 07fc8d0..6d2b588 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ db.sqlite3 # Bootflat shelfzilla/themes/bootflat/static/css/*.css shelfzilla/themes/bootflat/static/bower/* +shelfzilla/themes/kurono/static/bower/* **/CACHE/* # Bower diff --git a/bower.json b/bower.json index 4684cb6..14f36a7 100644 --- a/bower.json +++ b/bower.json @@ -20,6 +20,8 @@ "jquery-pjax": "~1.8.1", "nprogress": "~0.1.3", "toastr": "~2.0.1", - "imagesloaded": "~3.1.4" + "imagesloaded": "~3.1.4", + "purecss": "~0.5.0", + "pure": "~0.5.0" } } diff --git a/shelfzilla/settings/base.py b/shelfzilla/settings/base.py index 2a9e7c0..ec76743 100644 --- a/shelfzilla/settings/base.py +++ b/shelfzilla/settings/base.py @@ -105,6 +105,7 @@ MIDDLEWARE_CLASSES = ( TEMPLATE_DIRS = ( os.path.join(BASE_DIR, "themes", "_base"), + os.path.join(BASE_DIR, "themes", "kurono", "templates"), os.path.join(BASE_DIR, "themes", "bootflat", "templates"), ) @@ -156,6 +157,7 @@ MEDIA_URL = '/media/' # Additional locations of static files STATICFILES_DIRS = ( + os.path.join(BASE_DIR, "themes", "kurono", "static"), os.path.join(BASE_DIR, "themes", "bootflat", "static"), ) diff --git a/shelfzilla/themes/bootflat/static/less/fixes.less b/shelfzilla/themes/bootflat/static/less/fixes.less index 9a3d9cf..86edac7 100644 --- a/shelfzilla/themes/bootflat/static/less/fixes.less +++ b/shelfzilla/themes/bootflat/static/less/fixes.less @@ -6,7 +6,7 @@ // bootstrap navbar, margin-top .navbar { - margin-top: 20px; + border-radius: 0; } * > p:last-child { diff --git a/shelfzilla/themes/kurono/static/less/navbar.less b/shelfzilla/themes/kurono/static/less/navbar.less new file mode 100644 index 0000000..ad6b05c --- /dev/null +++ b/shelfzilla/themes/kurono/static/less/navbar.less @@ -0,0 +1,14 @@ +body { + // Padding top due to fixed navgar + padding-top: @navbar-height + 10px; +} + +.navbar-nav { + // No border radius + // border-radius: 0; + + // Avatar size should be ~same as text size + .avatar { + width: 22px; + } +} diff --git a/shelfzilla/themes/kurono/static/less/style.less b/shelfzilla/themes/kurono/static/less/style.less new file mode 100644 index 0000000..ee2fbaf --- /dev/null +++ b/shelfzilla/themes/kurono/static/less/style.less @@ -0,0 +1,19 @@ +// Bootstrap +@import "../bower/bootstrap/less/variables.less"; +@import "variables.less"; +@import "../bower/bootstrap/less/mixins.less"; + +@import "../bower/bootstrap/less/normalize.less"; + +@import "../bower/bootstrap/less/scaffolding.less"; +@import "../bower/bootstrap/less/grid.less"; + +@import "../bower/bootstrap/less/forms.less"; + +@import "../bower/bootstrap/less/navs.less"; +@import "../bower/bootstrap/less/navbar.less"; + +@import "../bower/bootstrap/less/utilities.less"; + +// Own +@import "navbar.less"; diff --git a/shelfzilla/themes/kurono/static/less/variables.less b/shelfzilla/themes/kurono/static/less/variables.less new file mode 100644 index 0000000..07d212b --- /dev/null +++ b/shelfzilla/themes/kurono/static/less/variables.less @@ -0,0 +1,4 @@ +/* + * NAVGAR + */ +@navbar-height: 70px; diff --git a/shelfzilla/themes/kurono/templates/_css/purecss.html b/shelfzilla/themes/kurono/templates/_css/purecss.html new file mode 100644 index 0000000..3c7936d --- /dev/null +++ b/shelfzilla/themes/kurono/templates/_css/purecss.html @@ -0,0 +1,3 @@ +{% load staticfiles %} + + diff --git a/shelfzilla/themes/kurono/templates/_layout.html b/shelfzilla/themes/kurono/templates/_layout.html new file mode 100644 index 0000000..1ac8049 --- /dev/null +++ b/shelfzilla/themes/kurono/templates/_layout.html @@ -0,0 +1,120 @@ +{% load i18n solo_tags staticfiles compress %} +{% get_solo 'config.SiteConfiguration' as site_config %} +{% get_solo 'config.SocialConfiguration' as social_config %} + + + + + {% compress css %} + {% block stylesheets %} + {% include "_css/purecss.html" %} + + {% endblock %} + {% endcompress %} + {% block page_title %}ShelfZilla{% endblock %} + + + {% block navigation_bar %} + + {% endblock %} + + {% block messages %} +
+ {% endblock %} + +
+ {% block main_content2 %}{% endblock %} +
+ + {% block footer %}{% endblock %} + {% compress js %} + {% block javascript %} + + + + + + + + + + + + {% endblock %} + {% endcompress %} + {% if not USER_CONFIG.use_pjax %} + + {% endif %} + + {% if social_config.google_analytics %} + {% include "_includes/google_analytics.html" %} + {% endif %} + +