Commits

Scott Nixon committed d8c847e

Updated main template with production assets.

Comments (0)

Files changed (1)

article/templates/theme_base.html

         <!-- styles -->
         <link href="/media/css/bootstrap.css" rel="stylesheet">
         <link href="/media/css/style.css" rel="stylesheet">
+        <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
 
-        <link href="/media/css/bootstrap-responsive.css" rel="stylesheet">
-        <link href="/media/css/skins/tango/skin.css" rel="stylesheet">
 
         <link rel="stylesheet" type="text/css" media="print"
 	          href="/media/css/print.css" />
         {% else %}
-
-        <link rel="stylesheet" type="text/css" media="screen"
-	          href="{{ main_css }}" />
+        <link href="//css.happyherbivore.com/bootstrap.css" rel="stylesheet">
+        <link rel="stylesheet" href="{{ main_css }}" />
+        <link href="//css.happyherbivore.com/bootstrap-responsive.css" rel="stylesheet">
         <link rel="stylesheet" type="text/css" media="print"
 	          href="{{ print_css }}" />
 
         {% endif %}
         {% endspaceless %}
         {% block css %}
+        <link href="//css.happyherbivore.com/skins/tango/skin.css" rel="stylesheet">
         {% endblock %}
     {% endblock %}
      
-    <!-- Le fav and touch icons -->
+    <!-- Le fav and touch icons 
     <link rel="shortcut icon" href="http://photos.happyherbivore.com/favicon.ico">
     <link rel="apple-touch-icon-precomposed" sizes="114x114" href="ico/apple-touch-icon-114-precomposed.png">
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="ico/apple-touch-icon-72-precomposed.png">
     <link rel="apple-touch-icon-precomposed" href="ico/apple-touch-icon-57-precomposed.png">
-       
+       -->
     {% block js_base %}
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script> 
         <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
             <script src="/media/js/hh.js" type="text/javascript"></script> 
 	        <!-- <script src="{{ main_js }}"></script> -->
         {% else %}
-	        <!-- <script src="{{ main_js }}"></script> -->
+	        <script src="{{ main_js }}"></script>
 	    {% endif %}
 
         {% block js %}
       <div class="container">
         <div class="row">
           <div class="span8">
-            <a href="/"><img src="http://photos.happyherbivore.com/img/logo.png" 
+            <a href="/"><img src="//photos.happyherbivore.com/img/logo.png" 
                              class="main-logo" alt="Happy Herbivore" title="Happy Herbivore" /></a>
           </div>
           <div class="span4">
         
     
     {% block extra_body_base %}
-    <script src="/media/js/bootstrap.min.js"></script>
+    <script src="//css.happyherbivore.com/bootstrap.min.js"></script>
         {% block extra_body %}{% endblock %}
     {% endblock %}