Commit 40fea673 authored by Robert Lyon's avatar Robert Lyon

Bug 1799802: Dropping special nav icons for primaryschool theme

Now that we have generic icons for nav in all themes

Also replacing the dashboard 'home' with new icon

behatnotneeded

Change-Id: I492da893d600468c279474879751bea1ada4ac38
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit ce39e073)
parent 29706dd3
......@@ -2889,7 +2889,7 @@ function mahara_standard_nav() {
'title' => get_string('dashboard', 'view'),
'weight' => 10,
'accesskey' => 'd',
'iconclass' => 'home'
'iconclass' => 'tachometer'
),
'create' => array(
'path' => 'create',
......
.navbar-showchildren {
.icon {
color: $navbar-inverse-toggle-icon-bar-bg;
color: $navbar-inverse-link-color;
}
&:hover,
&:focus {
.icon {
color: $navbar-inverse-toggle-icon-bar-bg;
color: $navbar-inverse-link-color;
}
}
.active & {
.icon {
color: $navbar-inverse-toggle-icon-bar-bg;
color: $navbar-inverse-link-color;
}
}
}
......@@ -28,10 +28,10 @@ $groups-color: #799323;
// 4) Lighter shade (can be specified in hex,rgba value)
// 5) Darker shade (can be specified in hex,rgba value)
$menu-styles: (
("home", $fa-var-tachometer, $home-color, lighten($home-color, 5%), darken($home-color, 5%)),
("create", $fa-var-pencil-square, $content-color, lighten($content-color, 5%), darken($content-color, 5%)),
("engage", $fa-var-file, $myportfolio-color, lighten($myportfolio-color, 5%), darken($myportfolio-color, 5%)),
("manage", $fa-var-users, $groups-color, lighten($groups-color, 5%), darken($groups-color, 5%))
("home", $home-color, lighten($home-color, 5%), darken($home-color, 5%)),
("create", $content-color, lighten($content-color, 5%), darken($content-color, 5%)),
("engage", $myportfolio-color, lighten($myportfolio-color, 5%), darken($myportfolio-color, 5%)),
("manage", $groups-color, lighten($groups-color, 5%), darken($groups-color, 5%))
);
.nav-main .navbar-nav {
......@@ -56,9 +56,6 @@ $menu-styles: (
&.active > a {
background-color: #FFFFFF;
}
.navbar-showchildren{
top: 7px;
}
.child-nav > li {
a {
color: #FFFFFF;
......@@ -71,21 +68,18 @@ $menu-styles: (
@each $section in $menu-styles {
> .#{nth($section, 1)} {
> a {
background-color: #{nth($section, 3)};
&:before {
content: "#{nth($section, 2)}";
}
background-color: #{nth($section, 2)};
&:focus,
&:hover {
background-color: #{nth($section, 4)};
background-color: #{nth($section, 3)};
}
}
&.active > a {
&:before {
color: #{nth($section, 3)};
color: #{nth($section, 2)};
&:focus,
&:hover {
background-color: #{nth($section, 4)};
background-color: #{nth($section, 3)};
color: #FFFFFF;
}
}
......@@ -96,22 +90,22 @@ $menu-styles: (
}
.navbar-showchildren,
&.active .navbar-showchildren {
background-color: #{nth($section, 3)};
background-color: #{nth($section, 2)};
&:focus,
&:hover {
background-color: #{nth($section, 5)};
background-color: #{nth($section, 4)};
}
}
.child-nav li {
a {
background-color: #{nth($section, 5)};
background-color: #{nth($section, 4)};
&:focus,
&:hover {
background-color: #{nth($section, 3)};
background-color: #{nth($section, 2)};
}
}
&.active a {
background-color: #{nth($section, 4)};
background-color: #{nth($section, 3)};
}
}
}
......
......@@ -432,10 +432,9 @@ $navbar-inverse-brand-hover-bg: $navbar-inverse-link-hover-bg;
// Inverted navbar toggle
$navbar-inverse-toggle-hover-bg: darken($navbar-inverse-bg, 2%);
$navbar-inverse-toggle-icon-bar-bg: #FFF;
$navbar-inverse-toggle-icon-bar-bg: #FFFFFF;
$navbar-inverse-toggle-border-color: #333;
//== Navs
//
//##
......
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