Merge branch 'master' into mindcoding

Conflicts:
	tmpl/header.en

diff --git a/js/90-custom.js b/js/90-custom.js
index 8b1435d05301d20714ef3f00ea74f6b7384701ef..d847fc12092dc8dcd444e7929088dc02993e59e9 100644 (file)
--- a/js/90-custom.js
+++ b/js/90-custom.js
@@ -1,7 +1,7 @@
 (function(){
        'use strict';
        function set_style(name){
-               $('#stylesheet').attr("href", "/css/" + name);
+               $('#stylesheet').attr("href", "/css/" + name + ".css");
                localStorage.setItem("theme", name);
                if(name == 'slate' || name == 'cyborg')
                        $('.logo').addClass('logo-dark');

diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm
index 63aa12f90a71aa41cebfa8b5a2fb0080d8f42920..a0711013f99fec760e5b36f50cb8f77ce495da7e 100644 (file)
--- a/lib/Plack/App/Gruntmaster.pm
+++ b/lib/Plack/App/Gruntmaster.pm
@@ -58,8 +58,8 @@ BEGIN{
        my $word = qr,(\w+),a;
        my $ct = qr,(?:\/ct/$word)?,a;
 
-       get qr,/css/$word, => 'CSS';
-       get qr,/js, => 'JS';
+       get qr,/css/$word\.css, => 'CSS';
+       get qr,/js\.js, => 'JS';
 
        get qr,/ct/, => 'Ct';
        get qr,/ct/$word/, => 'Ct::Entry';

diff --git a/tmpl/header.en b/tmpl/header.en
index 2238a38856249e1e2f6dd70a7092020e84bf3335..72c4da3dedc95ec2560e0b35459c4b7c5d34dbe7 100644 (file)
--- a/tmpl/header.en
+++ b/tmpl/header.en
@@ -4,8 +4,8 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 <link rel="shortcut icon" href="/static/favicon.png">
-<link rel="stylesheet" href="/css/cosmo" id="stylesheet">
-<script src="/js" type="text/javascript"></script>
+<link rel="stylesheet" href="/css/cyborg.css" id="stylesheet">
+<script src="/js.js" type="text/javascript"></script>
 
 <nav class="navbar navbar-default navbar-static-top" role="navigation">
 <div class="container-fluid">