diff --git a/static/media/css/core.css b/static/media/css/core.css index acaddc0..59b40b7 100644 --- a/static/media/css/core.css +++ b/static/media/css/core.css @@ -125,6 +125,11 @@ ol { .navbar .nav-wrap ul.nav > li > a:hover { color: #c0c0c0; } +.navbar .nav-wrap ul.nav > li.active a, +.navbar .nav-wrap ul.nav > li.active a:hover { + border-left: none; + border-right: none; +} .navbar .nav-wrap ul.nav > li:last-child { border-right: none; } @@ -633,18 +638,6 @@ input[type="password"].metered:focus:invalid + .password-meter { } input[type="password"].metered:focus:invalid:focus + .password-meter { border-color: #e9322d; -} -/* ------------------------------ */ -/* Mobile : width > iphone ------ */ -/* ------------------------------ */ -@media only screen and (min-width: 321px) and (max-width: 940px) { - -} -/* ------------------------------ */ -/* Mobile : width <= iphone ----- */ -/* ------------------------------ */ -@media only screen and (max-width: 320px) { - } /* ------------------------------ */ /* CSOL-site SPECIFIC ----------- */ diff --git a/static/media/js/custom_logic.js b/static/media/js/custom_logic.js index 8461100..4f054dd 100644 --- a/static/media/js/custom_logic.js +++ b/static/media/js/custom_logic.js @@ -60,9 +60,6 @@ if( /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) ) mob $(this).appendTo("#dynWrap"); } }); - - $('ul.nav').show(); - } } }); \ No newline at end of file diff --git a/static/media/less/core.less b/static/media/less/core.less index 190e13f..1923148 100644 --- a/static/media/less/core.less +++ b/static/media/less/core.less @@ -129,6 +129,12 @@ ol { & > a:focus, & > a:hover { color:#c0c0c0; } + &.active { + a, a:hover { + border-left:none; + border-right:none; + } + } } & > li:last-child { border-right:none; @@ -334,9 +340,6 @@ and (max-width : 599px) { width:90%; margin:0 auto; border-radius:5px; - ul.nav { - display:none; - } ul.nav, #dynWrap { li, li.active { display:block; @@ -728,23 +731,6 @@ input[type="password"].metered { } } -/* ------------------------------ */ -/* Mobile : width > iphone ------ */ -/* ------------------------------ */ -@media only screen -and (min-width : 321px) -and (max-width : 940px ) { - -} - -/* ------------------------------ */ -/* Mobile : width <= iphone ----- */ -/* ------------------------------ */ -@media only screen -and (max-width : 320px) { - -} - /* ------------------------------ */ /* CSOL-site SPECIFIC ----------- */ /* ------------------------------ */