projects / gruntmaster-page.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a6516cf)
Improve nav, hide Theme if no javascript
authorMarius Gavrilescu <marius@ieval.ro>
Wed, 10 Dec 2014 11:39:31 +0000 (13:39 +0200)
committerMarius Gavrilescu <marius@ieval.ro>
Wed, 10 Dec 2014 11:39:31 +0000 (13:39 +0200)
css/custom.css patch | blob | blame | history
js/90-custom.js patch | blob | blame | history
tmpl/skel.en patch | blob | blame | history

diff --git a/css/custom.css b/css/custom.css
index dcd555f28f64404abaf7c48c9149651d9ea0b4a0..0da7b4ed3fa05fcf15ce688a2c9c4c44909db41d 100644 (file)
--- a/css/custom.css
+++ b/css/custom.css
@@ -60,13 +60,6 @@ a.dropdown-toggle{
        margin-right: 1em;
 }
 
-nav{
-       padding: 5px 0;
-       background-color: #3A3F44;
-       background-image: linear-gradient(#484E55, #3A3F44 60%, #313539);
-}
-
 nav li{
-       border-right: 1px solid rgba(0, 0, 0, 0.2);
-       border-left: 1px solid rgba(255, 255, 255, 0.1);
-}
\ No newline at end of file
+       padding: 5px;
+}
diff --git a/js/90-custom.js b/js/90-custom.js
index 750aaa101822763bfb7171b430d375e4089640f0..183f3dd3c282aff96679e85b6f942df027ecfb80 100644 (file)
--- a/js/90-custom.js
+++ b/js/90-custom.js
@@ -6,6 +6,8 @@
        }
 
        $( document ).ready(function() {
+               $('#theme-selector').removeClass('hidden');
+
                var hiddenDiv = $(document.createElement('div'));
 
                hiddenDiv.addClass('hiddendiv common');
diff --git a/tmpl/skel.en b/tmpl/skel.en
index 09f37b6ec5da6248491d35ad53696cd36cdd36f5..d9ce6fc37962b21dcc799ee3fed9d6188d5592da 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -9,12 +9,13 @@
 <body>
 <nav role="navigation">
 <div class="container-fluid">
-<ul class="nav nav-justified">
+<ul class="nav nav-pills nav-justified">
+<li><a href="/">Gruntmaster 6000</a>
 <li><a href="/pb/">Problems</a>
 <li><a href="/ct/">Contests</a>
-<li><a href="/account">Account</a>
 <li><a href="/log/">Job log</a>
-<li><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
+<li><a href="/account">Account</a>
+<li id="theme-selector" class="hidden"><a class="dropdown-toggle" data-toggle="dropdown"> Theme <span class="caret"></span></a>
 <ul class="dropdown-menu" role="menu">
 <li><a href="#" id="theme_slate">Gunmetal gray</a>
 <li><a href="#" id="theme_cyborg">Black</a>
Gruntmaster page generators
This page took 0.01223 seconds and 4 git commands to generate.