From: Marius Gavrilescu Date: Fri, 7 Feb 2014 15:57:36 +0000 (+0200) Subject: Merge cache-control changes from master X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=9e1979aeb2725b7548115832fa696393772340bd;hp=7e3d8247f03853c8fd28a48dcd4681a02df32cdd;p=plack-app-gruntmaster.git Merge cache-control changes from master --- diff --git a/a/index.en.title b/a/index.en.title index e7e81c9..d0fb4fb 100644 --- a/a/index.en.title +++ b/a/index.en.title @@ -1 +1 @@ -Gruntmaster 6000 \ No newline at end of file +MindCoding First Edition \ No newline at end of file diff --git a/css/custom.css b/css/custom.css index bc0b7ea..4c4ba93 100644 --- a/css/custom.css +++ b/css/custom.css @@ -4,14 +4,6 @@ h1#title{ font-size: 3em !important; } -footer{ - width: 60em; - margin: auto; - margin-top: 6em; - white-space: pre-wrap; - color: #777; -} - #logo { margin: 5em auto 2em; display: block; @@ -48,6 +40,10 @@ div#result{ text-align: center; } +footer{ + padding: 1.5em 0; +} + a.dropdown-toggle{ cursor: pointer; } diff --git a/css/logos.css b/css/logos.css new file mode 100644 index 0000000..2ce1c3f --- /dev/null +++ b/css/logos.css @@ -0,0 +1,19 @@ +.logo { + background: url("/static/logos.png") no-repeat; + display: inline-block; + vertical-align: middle; +} + +.logo-clujlife{ background-position: 0 0; width: 60px; height: 53px; } +.logo-cos{ background-position: -65px 0; width: 212px; height: 53px; } +.logo-csf{ background-position: -282px 0; width: 220px; height: 120px; } +.logo-eyc{ background-position: -507px 0; width: 166px; height: 53px; } +.logo-facebook{ background-position: -678px 0; width: 111px; height: 111px; } +.logo-hermes{ background-position: -794px 0; width: 200px; height: 111px; } +.logo-mindcoding{ background-position: -999px 0; width: 600px; height: 93px; display: block; } +.logo-sigla{ background-position: -1604px 0; width: 29px; height: 31px; } +.logo-usr{ background-position: -1638px 0; width: 105px; height: 52px; } +.logo-vinsieu{ background-position: -1748px 0; width: 71px; height: 53px; } +.logo-welcome2cluj{ background-position: -1824px 0; width: 123px; height: 53px; } +.logo-yardi{ background-position: -1952px 0; width: 250px; height: 61px; } +.logo-yardi.logo-dark{ background-position: -2207px 0; width: 250px; height: 61px; } diff --git a/js/90-custom.js b/js/90-custom.js index 3759c1b..8b1435d 100644 --- a/js/90-custom.js +++ b/js/90-custom.js @@ -3,6 +3,15 @@ function set_style(name){ $('#stylesheet').attr("href", "/css/" + name); 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() { @@ -25,10 +34,13 @@ $('#theme_cerulean').on('click', function () { set_style("cerulean"); }); $('#theme_cyborg' ).on('click', function () { set_style("cyborg"); }); $('#theme_cosmo' ).on('click', function () { set_style("cosmo"); }); - }); - var theme = localStorage.getItem("theme"); - if(theme) { - set_style(theme); - } + if(!$('#sidebar').size()) { + var content = $('#content'); + content.wrapInner('
').append('