Commit d328984d authored by Curtis Adam's avatar Curtis Adam

Fix some scss issues for the frontend navigation

parent a682443c
......@@ -85,12 +85,12 @@ $themes: (
$navbar_create_text: map-get($map, "navbar_create_text");
$navbar_create_text_hover: map-get($map, "navbar_create_text_hover");
$navbar_create_text_active: map-get($map, "navbar_create_text_active");
$navbar_course_background: map-get($map, "navbar_course_background");
$navbar_course_background_hover: map-get($map, "navbar_course_background_hover");
$navbar_course_background_active: map-get($map, "navbar_course_background_active");
$navbar_course_text: map-get($map, "navbar_course_text");
$navbar_course_text_hover: map-get($map, "navbar_course_text_hover");
$navbar_course_text_active: map-get($map, "navbar_course_text_active");
$navbar_repetitorium_background: map-get($map, "navbar_repetitorium_background");
$navbar_repetitorium_background_hover: map-get($map, "navbar_repetitorium_background_hover");
$navbar_repetitorium_background_active: map-get($map, "navbar_repetitorium_background_active");
$navbar_repetitorium_text: map-get($map, "navbar_repetitorium_text");
$navbar_repetitorium_text_hover: map-get($map, "navbar_repetitorium_text_hover");
$navbar_repetitorium_text_active: map-get($map, "navbar_repetitorium_text_active");
$navbar_learn_background: map-get($map, "navbar_learn_background");
$navbar_learn_background_hover: map-get($map, "navbar_learn_background_hover");
$navbar_learn_background_active: map-get($map, "navbar_learn_background_active");
......@@ -1297,17 +1297,17 @@ $themes: (
color: $navbar_pool_text_active !important;
}
#navbar-course-iterations a {
background-color: $navbar_course_background !important;
color: $navbar_course_text !important;
#navbar-repetitorium a {
background-color: $navbar_repetitorium_background !important;
color: $navbar_repetitorium_text !important;
}
#navbar-course-iterations a:hover {
background-color: $navbar_course_background_hover !important;
color: $navbar_course_text_hover !important;
#navbar-repetitorium a:hover {
background-color: $navbar_repetitorium_background_hover !important;
color: $navbar_repetitorium_text_hover !important;
}
#navbar-course-iterations.active a, #navbar-course-iterations.active a:hover {
background-color: $navbar_course_background_active !important;
color: $navbar_course_text_active !important;
#navbar-repetitorium.active a, #navbar-repetitorium.active a:hover {
background-color: $navbar_repetitorium_background_active !important;
color: $navbar_repetitorium_text_active !important;
}
#navbar-own-decks a {
......@@ -1399,15 +1399,15 @@ $themes: (
color: $info_text !important;
}
#navbar-profile a {
#navbar-profile {
background-color: $navbar_profile_background !important;
color: $navbar_profile_text !important;
}
#navbar-profile a:hover {
#navbar-profile:hover {
background-color: $navbar_profile_background_hover !important;
color: $navbar_profile_text_hover !important;
}
#navbar-profile.active a, #navbar-profile.active a:hover {
#navbar-profile.active, #navbar-profile.active:hover {
background-color: $navbar_profile_background_active !important;
color: $navbar_profile_text_active !important;
}
......
......@@ -105,12 +105,12 @@
"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_repetitorium_background": black,
"navbar_repetitorium_background_hover": white,
"navbar_repetitorium_background_active": white,
"navbar_repetitorium_text": white,
"navbar_repetitorium_text_hover": black,
"navbar_repetitorium_text_active": black,
"navbar_learn_background": black,
"navbar_learn_background_hover": white,
"navbar_learn_background_active": white,
......
......@@ -107,12 +107,12 @@
"navbar_create_text": white,
"navbar_create_text_hover": white,
"navbar_create_text_active": white,
"navbar_course_background": $thm_gray,
"navbar_course_background_hover": lighten($thm_gray, 20%),
"navbar_course_background_active": $thm_green,
"navbar_course_text": white,
"navbar_course_text_hover": white,
"navbar_course_text_active": white,
"navbar_repetitorium_background": $thm_gray,
"navbar_repetitorium_background_hover": lighten($thm_gray, 20%),
"navbar_repetitorium_background_active": $thm_green,
"navbar_repetitorium_text": white,
"navbar_repetitorium_text_hover": white,
"navbar_repetitorium_text_active": white,
"navbar_learn_background": $thm_gray,
"navbar_learn_background_hover": lighten($thm_gray, 20%),
"navbar_learn_background_active": $thm_green,
......
......@@ -119,7 +119,7 @@
</a>
</li>
{{/if}}
<li id="navbar profile"
<li id="navbar-profile"
class="dropdown {{#if isActiveProfile}}active{{/if}}">
<a href="#" id="dropdownMenuLink" class="dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
......
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