Link to one stylesheet per page by using @import instead

hammerlab · May 15, 2015 · c368791 · c368791
1 parent c39b37b
commit c368791
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/cycledash/static/scss/examine.scss b/cycledash/static/scss/examine.scss
@@ -1,4 +1,4 @@
-@import 'bootstrap.min';
+@import 'style';
 
 /* ExaminePage */
 h1 small {

diff --git a/cycledash/static/scss/header.scss b/cycledash/static/scss/header.scss
@@ -1,5 +1,3 @@
-@import 'bootstrap.min';
-
 nav.navigation {
   font-size: 12px;
   position: absolute;

diff --git a/cycledash/static/scss/runs.scss b/cycledash/static/scss/runs.scss
@@ -1,4 +1,4 @@
-@import 'bootstrap.min';
+@import 'style';
 
 main {
   width: 800px;

diff --git a/cycledash/static/scss/style.scss b/cycledash/static/scss/style.scss
@@ -1,4 +1,5 @@
 @import 'bootstrap.min';
+@import 'header';
 
 body {
   padding: 11px;

diff --git a/cycledash/templates/about.html b/cycledash/templates/about.html
@@ -1,6 +1,10 @@
 {% extends "layouts/layout.html" %}
 {%- from 'macros/nav.html' import nav -%}
 
+{% block head %}
+<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
+{% endblock %}
+
 {% block body %}
 {{ nav("about") }}
 <main>

diff --git a/cycledash/templates/comments.html b/cycledash/templates/comments.html
@@ -1,6 +1,10 @@
 {% extends "layouts/layout.html" %}
 {%- from 'macros/nav.html' import nav -%}
 
+{% block head %}
+<link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}">
+{% endblock %}
+
 {% block body %}
 {{ nav("comments") }}
 <main id="comments"></main>

diff --git a/cycledash/templates/layouts/layout.html b/cycledash/templates/layouts/layout.html
@@ -29,9 +29,6 @@
     <script type="text/javascript" src={{config['TYPEKIT_URL']}}></script>
     <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
     {% endif %}
-
-    <link rel="stylesheet" href="/static/css/style.css">
-    <link rel="stylesheet" href="/static/css/header.css">
     {% block head %}{% endblock %}
   </head>