Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Site nav link colors #15

Merged
merged 5 commits into from
Aug 8, 2023
Merged

Site nav link colors #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f71eb5
hr in site nav
Alex-Jordan Aug 6, 2023
ffacc1c
thicker focus outlines
Alex-Jordan Aug 6, 2023
f93a156
contrast ratios above 3% for focus outline
Alex-Jordan Aug 7, 2023
98a9799
nav link outline at 2px
Alex-Jordan Aug 7, 2023
8c69fca
clean up hr css for nav links
Alex-Jordan Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion htdocs/themes/math4-green/_theme-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
:root {
--ww-site-nav-link-active-background-color: #{lighten($primary, 50%)};
--ww-site-nav-link-active-background-color: #{darken($primary, 2%)};
}
4 changes: 4 additions & 0 deletions htdocs/themes/math4-red/_theme-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
a:not(.btn):focus {
outline-color: #{lighten($link-hover-color, 26%)};
}

4 changes: 4 additions & 0 deletions htdocs/themes/math4-yellow/_theme-overrides.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
color: $link-color !important;
}

a:not(.btn):focus {
outline-color: #{darken($link-hover-color, 1%)};
}

:root {
--ww-site-nav-link-active-background-color: #{$primary};
--ww-site-nav-link-active-color: #{color-contrast($primary)};
Expand Down
9 changes: 6 additions & 3 deletions htdocs/themes/math4/bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,19 @@ $breadcrumb-active-color: #495057;
--ww-logo-background-color: #{$ww-logo-background-color};
--ww-primary-foreground-color: #{color-contrast($primary)};
--ww-achievement-level-color: #{$ww-achievement-level-color};
--ww-site-nav-link-active-background-color: #{lighten($primary, 55%)};
--ww-site-nav-link-active-color: #{$primary};
--ww-site-nav-link-active-background-color: #{$primary};
}

// Overrides
a:not(.btn):focus {
color: $link-hover-color;
outline-style: solid;
outline-color: $link-hover-color;
outline-color: #{lighten($link-hover-color, 8%)};
outline-width: 1px;
}

#site-links a:not(.btn):focus {
outline-width: 2px;
}

@import "theme-overrides";
9 changes: 8 additions & 1 deletion htdocs/themes/math4/math4.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ $site-nav-width: 250px !default;
transition-property: left, border-right-width;
transition-duration: 0.3s;
border-right: 1px solid $layout-divider-color;
padding: 2px;

&.toggle-width {
left: -20%;
Expand Down Expand Up @@ -214,7 +215,8 @@ $site-nav-width: 250px !default;

&.active {
background-color: var(--ww-site-nav-link-active-background-color, #038);
color: var(--ww-site-nav-link-active-color, white);
color: var(--ww-primary-foreground-color, white);

}
}
&.list-group-item {
Expand All @@ -238,6 +240,11 @@ $site-nav-width: 250px !default;
padding-right: 0.5rem;
}
}

hr.site-nav-separator {
margin: 3pt 7pt;
border: 1pt solid;
}
}

#content {
Expand Down
3 changes: 2 additions & 1 deletion templates/ContentGenerator/Base/admin_links.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<ul class="nav flex-column">
<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('options') %></li>
<li class="list-group-item nav-item"><%= $makelink->('options') %></li>
<hr class="site-nav-separator"/>
% if ($authz->hasPermissions($userID, 'create_and_delete_courses')) {
<li class="list-group-item nav-item">
<%= $makelink->(
Expand Down
11 changes: 6 additions & 5 deletions templates/ContentGenerator/Base/links.html.ep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ul class="nav flex-column">
% if (defined $courseID && $authen->was_verified) {
% # Homework Sets or Course Administration
<li class="list-group-item list-group-item-primary nav-item">
<li class="list-group-item nav-item">
% if ($restricted_navigation) {
<span class="nav-link disabled"><%= maketext('Homework Sets') %></span>
% } else {
Expand All @@ -16,7 +16,7 @@
</li>
%
% if (defined $setID) {
<li class="list-group-item list-group-item-primary nav-item">
<li class="list-group-item nav-item">
<ul class="nav flex-column">
% # Set link. The set record is needed to determine the assignment type.
% my $setRecord = $db->getGlobalSet($setID =~ s/,v\d+$//r);
Expand Down Expand Up @@ -74,18 +74,19 @@
% || $authz->hasPermissions($userID, 'change_email_address')
% || $authz->hasPermissions($userID, 'change_pg_display_settings'))
% {
<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('options') %></li>
<li class="list-group-item nav-item"><%= $makelink->('options') %></li>
% }
%
% unless ($restricted_navigation || $courseID eq 'admin') {
<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('grades') %></li>
<li class="list-group-item nav-item"><%= $makelink->('grades') %></li>
% }
%
% if ($ce->{achievementsEnabled}) {
<li class="list-group-item list-group-item-primary nav-item"><%= $makelink->('achievements') %></li>
<li class="list-group-item nav-item"><%= $makelink->('achievements') %></li>
% }
%
% if ($authz->hasPermissions($userID, 'access_instructor_tools')) {
<hr class="site-nav-separator"/>
<li class="list-group-item nav-item"><%= $makelink->('instructor_tools') %></li>
% # Class list editor
<li class="list-group-item nav-item"><%= $makelink->('instructor_user_list') %></li>
Expand Down