Commit e3de432c authored by Curtis Adam's avatar Curtis Adam

Add more sass variables to the navigation bar

parent c59f7a41
This diff is collapsed.
......@@ -73,8 +73,69 @@
"disabled_text": $mercury_approx,
//navbar
"navbar_background": black,
"navbar_text": $thm_gray,
"navbar_text_hover": $white,
"navbar_text": white,
"navbar_text_hover": white,
"navbar_alldecks_background": black,
"navbar_alldecks_background_hover": white,
"navbar_alldecks_background_active": white,
"navbar_alldecks_text": white,
"navbar_alldecks_text_hover": black,
"navbar_alldecks_text_active": black,
"navbar_alldecks_border": black,
"navbar_alldecks_border_hover": white,
"navbar_alldecks_border_active": white,
"navbar_create_background": black,
"navbar_create_background_hover": white,
"navbar_create_background_active": white,
"navbar_create_text": white,
"navbar_create_text_hover": black,
"navbar_create_text_active": black,
"navbar_course_background": black,
"navbar_course_background_hover": white,
"navbar_course_background_active": white,
"navbar_course_text": white,
"navbar_course_text_hover": black,
"navbar_course_text_active": black,
"navbar_learn_background": black,
"navbar_learn_background_hover": white,
"navbar_learn_background_active": white,
"navbar_learn_text": white,
"navbar_learn_text_hover": black,
"navbar_learn_text_active": black,
"navbar_pool_background": black,
"navbar_pool_background_hover": white,
"navbar_pool_background_active": white,
"navbar_pool_text": white,
"navbar_pool_text_hover": black,
"navbar_pool_text_active": black,
"navbar_search_background": white,
"navbar_search_text": black,
"navbar_search_placeholder": $thm_orange,
"navbar_search_icon": black,
"navbar_help_background": black,
"navbar_help_background_hover": white,
"navbar_help_background_active": white,
"navbar_help_text": white,
"navbar_help_text_hover": black,
"navbar_help_text_active": black,
"navbar_backend_background": black,
"navbar_backend_background_hover": white,
"navbar_backend_text": white,
"navbar_backend_text_hover": black,
"navbar_notifications_background": black,
"navbar_notifications_background_hover": white,
"navbar_notifications_text": white,
"navbar_notifications_text_hover": black,
"navbar_profile_background": black,
"navbar_profile_background_hover": white,
"navbar_profile_background_active": white,
"navbar_profile_text": white,
"navbar_profile_text_hover": black,
"navbar_profile_text_active": black,
"navbar_logout_background": black,
"navbar_logout_background_hover": white,
"navbar_logout_text": white,
"navbar_logout_text_hover": black,
//welcome page colors
"footer_background":$thm_green,
"footer_info_navigation_text": white,
......
......@@ -76,7 +76,68 @@
//navbar
"navbar_background": $thm_gray,
"navbar_text": $thm_gray,
"navbar_text_hover": $white,
"navbar_text_hover": white,
"navbar_alldecks_background": $thm_gray,
"navbar_alldecks_background_hover": $thm_gray,
"navbar_alldecks_background_active": $thm_green,
"navbar_alldecks_text": white,
"navbar_alldecks_text_hover": white,
"navbar_alldecks_text_active": white,
"navbar_alldecks_border": white,
"navbar_alldecks_border_hover": white,
"navbar_alldecks_border_active": white,
"navbar_create_background": $thm_gray,
"navbar_create_background_hover": $thm_gray,
"navbar_create_background_active": $thm_green,
"navbar_create_text": white,
"navbar_create_text_hover": white,
"navbar_create_text_active": white,
"navbar_course_background": $thm_gray,
"navbar_course_background_hover": $thm_gray,
"navbar_course_background_active": $thm_green,
"navbar_course_text": white,
"navbar_course_text_hover": white,
"navbar_course_text_active": white,
"navbar_learn_background": $thm_gray,
"navbar_learn_background_hover": $thm_gray,
"navbar_learn_background_active": $thm_green,
"navbar_learn_text": white,
"navbar_learn_text_hover": white,
"navbar_learn_text_active": white,
"navbar_pool_background": $thm_gray,
"navbar_pool_background_hover": $thm_gray,
"navbar_pool_background_active": $thm_green,
"navbar_pool_text": white,
"navbar_pool_text_hover": white,
"navbar_pool_text_active": white,
"navbar_search_background": $thm_gray,
"navbar_search_text": white,
"navbar_search_placeholder": $thm_orange,
"navbar_search_icon": white,
"navbar_help_background": $thm_gray,
"navbar_help_background_hover": $thm_gray,
"navbar_help_background_active": $thm_green,
"navbar_help_text": white,
"navbar_help_text_hover": white,
"navbar_help_text_active": white,
"navbar_backend_background": $thm_gray,
"navbar_backend_background_hover": $thm_gray,
"navbar_backend_text": white,
"navbar_backend_text_hover": white,
"navbar_notifications_background": $thm_gray,
"navbar_notifications_background_hover": $thm_gray,
"navbar_notifications_text": white,
"navbar_notifications_text_hover": white,
"navbar_profile_background": $thm_gray,
"navbar_profile_background_hover": $thm_gray,
"navbar_profile_background_active": $thm_green,
"navbar_profile_text": white,
"navbar_profile_text_hover": white,
"navbar_profile_text_active": white,
"navbar_logout_background": $thm_gray,
"navbar_logout_background_hover": $thm_gray,
"navbar_logout_text": white,
"navbar_logout_text_hover": white,
//welcome page colors
"footer_background": $thm_green,
"footer_info_navigation_text": white,
......
......@@ -64,14 +64,14 @@
{{_ "navbar-collapse.course"}}
</a>
</li>
<li id="navbar-ownsets"
<li id="navbar-own-decks"
class="{{#if isActiveRoute regex='home|create'}}active{{/if}}"
data-toggle="collapse" data-target="#thm-top-navigation">
<a href="{{pathFor route='create'}}" id="cardsets">
{{_ "navbar-collapse.carddecks"}}
</a>
</li>
<li id="navbar-ownsets"
<li id="navbar-learn-decks"
class="{{#if isActiveRoute regex='home|learn'}}active{{/if}}"
data-toggle="collapse" data-target="#thm-top-navigation">
<a href="{{pathFor route='learn'}}" id="learnsets">
......@@ -96,8 +96,8 @@
{{/if}}
</div>
<ul class="nav navbar-nav navbar-right">
{{#if isInRole 'admin, editor'}}
<li id="navbar-ownsets"
{{#if isInRole 'admin, editor'}}
<li id="navbar-all-decks"
class="{{#if isActiveRoute regex='alldecks'}}active{{/if}}"
data-toggle="collapse" data-target="#thm-top-navigation">
<a href="{{pathFor route='alldecks'}}" id="learnsets">
......@@ -105,7 +105,8 @@
</a>
</li>
{{/if}}
<li>
<li id="navbar-help"
class="{{#if isActiveRoute regex='help'}}active{{/if}}">
<a href="#" id="helpBtn">{{_ "contact.help"}}</a>
</li>
{{#if isInRole 'admin, editor'}}
......@@ -173,7 +174,7 @@
</span>
</a>
</li>
<li><a href="#" id="logout"><i
<li id="navbar-logout"><a href="#" id="logout"><i
class="glyphicon glyphicon-log-out"></i>
</a></li>
</ul>
......
//global
$default_font: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
//navbar
$size_navbar_alldecks_border: 3px;
//welcome page
$size_footer_height: 40px;
......@@ -92,7 +95,9 @@ body {
}
#input-search {
width: 180px;
line-height: 30pt !important;
padding-right: 30px !important;
}
.navbar-default {
......@@ -138,6 +143,11 @@ body {
margin-right: 5px;
}
}
@media(min-width: 768px) {
#navbar-all-decks {
border-left: $size_navbar_alldecks_border solid !important;
}
}
}
#contact-nav a, #contact-nav-footer a {
......@@ -349,12 +359,6 @@ button {
}
}
@media (min-width: 768px) and (max-width: 991px) {
#input-search {
width: 80px;
}
}
@media (min-width: 768px) {
.panelUnit {
border-right: solid 1px;
......@@ -750,8 +754,9 @@ th {
#clearSearch {
font-size: 22px;
cursor: pointer;
z-index: 1000 !important;
.glyphicon-remove-circle {
padding-left: 7px;
padding-left: 2px;
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment