From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 10 Mar 2015 19:15:34 +0000 (+0200)
Subject: Merge branch 'master' into newmc
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=268c695bdb59abe79704eeebe9569e224bb3b394;p=gruntmaster-page.git
Merge branch 'master' into newmc
Conflicts:
js/90-themes.js
tmpl/skel.en
---
268c695bdb59abe79704eeebe9569e224bb3b394
diff --cc js/90-themes.js
index b7d7322,7221dde..0bfa8bf
--- a/js/90-themes.js
+++ b/js/90-themes.js
@@@ -1,14 -1,9 +1,15 @@@
(function(){
'use strict';
function set_style(name){
- $('#stylesheet').attr("href", "https://static.mindcoding.ro/static/css/" + name + ".css");
+ $('link[rel~="stylesheet"]').prop('disabled', true);
+ $('link[title="' + name + '"]').prop('disabled', false);
localStorage.setItem("theme", name);
+ $(document).ready(function() {
+ if(name == 'slate' || name == 'cyborg')
+ $('.logo').removeClass('logo-light');
+ else
+ $('.logo').addClass('logo-light');
+ });
}
$( document ).ready(function() {
diff --cc tmpl/skel.en
index 610e9b7,b713e0e..26d074e
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@@ -3,8 -3,10 +3,10 @@@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" href="https://static.mindcoding.ro/static/css/slate.css" id="stylesheet">
-<link href="/static/css/cyborg.css" title="cyborg" rel="stylesheet">
-<link href="/static/css/slate.css" title="slate" rel="alternate stylesheet">
-<link href="/static/css/readable.css" title="readable" rel="alternate stylesheet">
-<script src="/static/js.js" type="text/javascript" async defer></script>
++<link href="https://static.mindcoding.ro/static/css/cyborg.css" title="cyborg" rel="alternate stylesheet">
++<link href="https://static.mindcoding.ro/static/css/slate.css" title="slate" rel="stylesheet">
++<link href="https://static.mindcoding.ro/static/css/readable.css" title="readable" rel="alternate stylesheet">
+<script src="https://static.mindcoding.ro/static/js.js" type="text/javascript" async defer></script>
<body>
<nav role="navigation">