From: Marius Gavrilescu <marius@ieval.ro>
Date: Tue, 11 Feb 2014 07:17:40 +0000 (+0200)
Subject: Merge branch 'master' into mindcoding
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=46780bac97f1fd12d861601ecc545f195fb6d4b2;p=gruntmaster-page.git

Merge branch 'master' into mindcoding

Conflicts:
	tmpl/header.en
---

46780bac97f1fd12d861601ecc545f195fb6d4b2
diff --cc js/90-custom.js
index 8b1435d,750aaa1..d847fc1
--- a/js/90-custom.js
+++ b/js/90-custom.js
@@@ -1,17 -1,8 +1,17 @@@
  (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');
 +		else
 +			$('.logo').removeClass('logo-dark');
 +	}
 +
 +	var theme = localStorage.getItem("theme");
 +	if(theme) {
 +		set_style(theme);
  	}
  
  	$( document ).ready(function() {
diff --cc tmpl/header.en
index 2238a38,c4f51f6..72c4da3
--- a/tmpl/header.en
+++ b/tmpl/header.en
@@@ -3,9 -3,8 +3,9 @@@
  <meta charset="utf-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">