diff --git a/src/styles/_config.sass b/src/styles/_config.sass index 2c1d570a..4f50a98a 100644 --- a/src/styles/_config.sass +++ b/src/styles/_config.sass @@ -61,10 +61,10 @@ $screen-phone: $screen-xs-min $screen-sm: 768px !default $screen-sm-min: $screen-sm $screen-tablet: $screen-sm-min -$screen-md: 1100px !default // 992px +$screen-md: 1100px !default $screen-md-min: $screen-md $screen-desktop: $screen-md-min -$screen-lg: 1270px !default // 1200px +$screen-lg: 1270px !default $screen-lg-min: $screen-lg $screen-lg-desktop: $screen-lg-min $screen-xs-max: $screen-sm-min - 1 @@ -78,6 +78,9 @@ $project-sidebar-width: 50px $project_header-height: 50px $project_footer-height: 30px +$navbar-height: 50px +$navbar-backdrop-height: 600px + $list-node-children-item-width: 160px $list-node-children-item-width_list: 48px $z-index-base: 13 @@ -87,7 +90,7 @@ $z-index-base: 13 width: 750px @media (min-width: $screen-md-min) - width: 1100px // 970px + width: 1100px @media (min-width: $screen-lg-min) - width: 1270px // 1170px + width: 1270px diff --git a/src/styles/_base.sass b/src/styles/base.sass similarity index 99% rename from src/styles/_base.sass rename to src/styles/base.sass index 01651a2f..e5b47eaa 100644 --- a/src/styles/_base.sass +++ b/src/styles/base.sass @@ -1,3 +1,9 @@ +@import _normalize +@import _config +@import _utils + +@import _notifications +@import plugins/js_perfectscrollbar html @@ -34,9 +40,6 @@ a strong, b font-weight: 500 -$navbar-height: 50px -$navbar-backdrop-height: 600px - .container +media-xs max-width: 100% diff --git a/src/styles/blog.sass b/src/styles/blog.sass index c716898a..d0e933b4 100644 --- a/src/styles/blog.sass +++ b/src/styles/blog.sass @@ -3,19 +3,10 @@ @import _utils @import _comments - @import _error - -@import _base -@import _notifications @import _search -/* CSS comes from fontello.com using static/assets/font/config.json */ - -@import plugins/js_perfectscrollbar - - #blog_container margin: 0 padding: diff --git a/src/styles/main.sass b/src/styles/main.sass index 7e53aadd..12ce2a31 100644 --- a/src/styles/main.sass +++ b/src/styles/main.sass @@ -12,15 +12,12 @@ @import _error @import _stats @import _search -@import _base -@import _notifications /* services, about, etc */ @import _pages @import plugins/_jstree -@import plugins/js_perfectscrollbar @import plugins/_js_select2 /* CSS for pillar-font comes from fontello.com using static/assets/font/config.json */ diff --git a/src/styles/project-main.sass b/src/styles/project-main.sass index 1caccf58..7854143b 100644 --- a/src/styles/project-main.sass +++ b/src/styles/project-main.sass @@ -8,10 +8,7 @@ @import _project-dashboard @import _error -@import _base -@import _notifications @import _search @import plugins/_jstree -@import plugins/js_perfectscrollbar @import plugins/_js_select2 diff --git a/src/styles/theatre.sass b/src/styles/theatre.sass index 12efbf69..66579678 100644 --- a/src/styles/theatre.sass +++ b/src/styles/theatre.sass @@ -1,11 +1,5 @@ -@import _normalize -@import _config -@import _utils - -@import _base +@import base @import _comments -@import _notifications -@import plugins/js_perfectscrollbar $color-theatre-background: #222 $color-theatre-background-light: lighten($color-theatre-background, 5%) diff --git a/src/templates/layout.jade b/src/templates/layout.jade index d21fafbc..d25ad525 100644 --- a/src/templates/layout.jade +++ b/src/templates/layout.jade @@ -49,6 +49,7 @@ html(lang="en") | {% block css %} link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css', v=141020161) }}", rel="stylesheet") + link(href="{{ url_for('static_pillar', filename='assets/css/base.css', v=17020161) }}", rel="stylesheet") | {% if title == 'blog' %} link(href="{{ url_for('static_pillar', filename='assets/css/blog.css', v=141020161) }}", rel="stylesheet") | {% else %} diff --git a/src/templates/projects/view.jade b/src/templates/projects/view.jade index aeafbab3..b4da9ea5 100644 --- a/src/templates/projects/view.jade +++ b/src/templates/projects/view.jade @@ -38,6 +38,7 @@ link(href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.1/themes/default/style.mi | {% block css %} link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css', v=141020161) }}", rel="stylesheet") +link(href="{{ url_for('static_pillar', filename='assets/css/base.css', v=171020161) }}", rel="stylesheet") link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css', v=141020161) }}", rel="stylesheet") | {% endblock %}