From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 10 Dec 2014 11:39:31 +0000 (+0200)
Subject: Improve nav, hide Theme if no javascript
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=4896df53ed848c34d2fb08b222187a73a0dccbdd;p=plack-app-gruntmaster.git
Improve nav, hide Theme if no javascript
---
diff --git a/css/custom.css b/css/custom.css
index dcd555f..0da7b4e 100644
--- 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 750aaa1..183f3dd 100644
--- 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 09f37b6..d9ce6fc 100644
--- 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>