Commit fc5a870f authored by Curtis Adam's avatar Curtis Adam

Update sass variables for new profile navigation and remove the old one

parent 31472db6
......@@ -117,6 +117,13 @@ $themes: (
$navbar_profile_text_active: map-get($map, "navbar_profile_text_active");
$navbar_logout_background: map-get($map, "navbar_profile_background");
$navbar_logout_background_hover: map-get($map, "navbar_logout_background_hover");
$navbar_profile_dropdown_background: map-get($map, "navbar_profile_dropdown_background");
$navbar_profile_dropdown_background_opacity: map-get($map, "navbar_profile_dropdown_background_opacity");
$navbar_profile_dropdown_background_hover: map-get($map, "navbar_profile_dropdown_background_hover");
$navbar_profile_dropdown_background_active: map-get($map, "navbar_profile_dropdown_background_active");
$navbar_profile_dropdown_text: map-get($map, "navbar_profile_dropdown_text");
$navbar_profile_dropdown_text_hover: map-get($map, "navbar_profile_dropdown_text_hover");
$navbar_profile_dropdown_text_active: map-get($map, "navbar_profile_dropdown_text_active");
$navbar_logout_text: map-get($map, "navbar_logout_text");
$navbar_logout_text_hover: map-get($map, "navbar_logout_text_hover");
//welcome page colors
......@@ -1743,23 +1750,20 @@ $themes: (
}
}
#profile-drop {
background-color: $thm_gray;
opacity: 0.9;
overflow: hidden;
text-align: left;
position: absolute;
min-width: auto;
a {
text-decoration: none;
}
td .fa, .glyphicon {
margin: 7px;
}
background-color: $navbar_profile_dropdown_background !important;
color: $navbar_profile_dropdown_text !important;
opacity: $navbar_profile_dropdown_background_opacity !important;
tr:hover {
background-color: $thm_green;
background-color: $navbar_profile_dropdown_background_hover !important;
color: $navbar_profile_dropdown_text_hover !important;
}
.active {
background-color: $navbar_profile_dropdown_background_active !important;
color: $navbar_profile_dropdown_text_active !important;
}
.logout-hover:hover {
background-color: red;
.logout-dropdown:hover {
background-color: $navbar_logout_background_hover !important;
color: $navbar_logout_text_hover !important;
}
}
......
......@@ -136,8 +136,15 @@
"navbar_profile_text": white,
"navbar_profile_text_hover": black,
"navbar_profile_text_active": black,
"navbar_profile_dropdown_background": black,
"navbar_profile_dropdown_background_opacity": 0.9,
"navbar_profile_dropdown_background_hover": black,
"navbar_profile_dropdown_background_active": white,
"navbar_profile_dropdown_text": white,
"navbar_profile_dropdown_text_hover": white,
"navbar_profile_dropdown_text_active": black,
"navbar_logout_background": black,
"navbar_logout_background_hover": white,
"navbar_logout_background_hover": $thm_orange,
"navbar_logout_text": white,
"navbar_logout_text_hover": black,
//welcome page colors
......
......@@ -138,8 +138,15 @@
"navbar_profile_text": white,
"navbar_profile_text_hover": white,
"navbar_profile_text_active": white,
"navbar_profile_dropdown_background": $thm_gray,
"navbar_profile_dropdown_background_opacity": 0.9,
"navbar_profile_dropdown_background_hover": $thm_green,
"navbar_profile_dropdown_background_active": $thm_green,
"navbar_profile_dropdown_text": white,
"navbar_profile_dropdown_text_hover": white,
"navbar_profile_dropdown_text_active": white,
"navbar_logout_background": $thm_gray,
"navbar_logout_background_hover": $thm_red,
"navbar_logout_background_hover": $thm_orange,
"navbar_logout_text": white,
"navbar_logout_text_hover": white,
//welcome page colors
......
......@@ -309,7 +309,7 @@
"billing": "Abrechnung",
"membership": "Mitgliedschaft",
"notifications": "Benachrichtigungen",
"requests": "Pro-Anfragen Karteifreigabe",
"requests": "Pro-Karteifreigabe",
"norequests": "Keine Anfragen vorhanden",
"lecturer": "Dozenten-Freigabe",
"accept": "Akzeptieren",
......
This diff is collapsed.
......@@ -805,3 +805,16 @@ th {
font-size: 13pt !important;
font-style: italic;
}
#profile-drop {
overflow: hidden;
text-align: left;
position: absolute;
min-width: auto;
a {
text-decoration: none;
}
td .fa, .glyphicon {
margin: 7px;
}
}
......@@ -5,11 +5,8 @@
{{#if isInRole 'blocked'}}
{{> access_denied_content_only}}
{{else}}
<div id='profileSidebar' class="col-md-3">
{{> profileSidebar}}
</div>
{{#if isVisible}}
<div class="col-md-9">
<div class="col-xs-12">
{{#if isActiveRoute 'profileOverview'}}
<div id="profileOverview">{{> profileOverview}}</div>
{{/if}}
......@@ -69,7 +66,7 @@
</div>
{{else}}
<div class="col-md-9">
<div class="col-xs-12">
<div class="row">
<div id="profileprivate">
<div class="panel panel-default">
......
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