Skip to content

Commit

Permalink
Merge pull request #370 from st3phhays/0.5.20
Browse files Browse the repository at this point in the history
(#369)(#371) Accessibility for dropdowns, pagination, and maint items
  • Loading branch information
vexx32 authored Jan 10, 2024
2 parents cdc6e6c + 4e2d779 commit b070d3a
Show file tree
Hide file tree
Showing 12 changed files with 214 additions and 188 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ module.exports = {
}
},
{
files: ['.eslintrc.js', 'js/**/*.*', 'getting-started/*.js', 'playwright/**/*.ts'],
files: ['.eslintrc.js', 'js/**/*.*', 'getting-started/*.js', 'playwright/**/*.ts', 'wwwroot/js/src/**/*.js', 'gulpfile.js'],
rules: {
semi: ['error', 'always'],
quotes: ['error', 'single'],
Expand Down
2 changes: 1 addition & 1 deletion getting-started/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"homepage": "https://github.com/chocolatey/chocolatey.org#readme",
"devDependencies": {
"choco-theme": "0.5.19"
"choco-theme": "0.5.20"
},
"resolutions": {
"glob-parent": "^6.0.2",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "choco-theme",
"version": "0.5.19",
"version": "0.5.20",
"description": "The global theme for Chocolatey Software.",
"repository": {
"type": "git",
Expand Down
5 changes: 5 additions & 0 deletions scss/_dropdowns.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.dropdown-item {
&:hover {
cursor: pointer;
}
}
26 changes: 20 additions & 6 deletions scss/_flatpickr.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
/* stylelint-disable selector-class-pattern */

.flatpickr .form-control[readonly]:not([disabled]) {
background: var(--choco-theme-elevation-1);
}

.flatpickr .flatpickr-input[disabled] {
cursor: default;
.flatpickr {
&.input-group {
.form-control.input {
border-top-left-radius: $border-radius !important;
border-bottom-left-radius: $border-radius !important;
}

button[data-clear] {
border-top-right-radius: $border-radius !important;
border-bottom-right-radius: $border-radius !important;
}
}

.form-control[readonly]:not([disabled]) {
background: var(--choco-theme-elevation-1);
}

.flatpickr-input[disabled] {
cursor: default;
}
}

.flatpickr-calendar {
Expand Down
5 changes: 5 additions & 0 deletions scss/_left-navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@
#leftSidebarNav {
top: 0;

&.sticky-md-top {
height: 100vh;
overflow: auto;
}

.navbar > .navbar-collapse {
border-bottom: 0;
}
Expand Down
17 changes: 3 additions & 14 deletions scss/_pagination.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,4 @@
.page-link {
background-color: unset;
border: 1px solid var(--choco-theme-border);

&:hover,
&:focus {
background-color: var(--choco-theme-neutral);
border-color: var(--choco-theme-neutral);
}
}

.page-item.disabled .page-link {
background: unset;
border-color: var(--choco-theme-border);
.disabled > .page-link,
.page-link.disabled {
opacity: .5;
}
1 change: 1 addition & 0 deletions scss/_styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@
@import "code-copy-for-view";
@import "terminal";
@import "anchorjs";
@import "dropdowns";
5 changes: 0 additions & 5 deletions scss/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,6 @@ hr {
}

@include media-breakpoint-up(md) {
.sticky-md-top {
max-height: 100vh;
overflow: auto;
}

.h-md-400-px {
height: 400px !important;
}
Expand Down
16 changes: 16 additions & 0 deletions scss/variables/_chocolatey.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,19 @@ $alert-color-scale: 0%;
$nav-tabs-link-active-bg: $white;
$nav-pills-link-active-color: $black;

// Pagination
$pagination-bg: unset;
$pagination-border-color: $primary;

$pagination-focus-color: $black;
$pagination-focus-bg: $primary;

$pagination-hover-color: $black;
$pagination-hover-bg: $primary;
$pagination-hover-border-color: $primary;

$pagination-active-color: $black;

$pagination-disabled-color: $primary;
$pagination-disabled-bg: unset;
$pagination-disabled-border-color: $primary;
2 changes: 2 additions & 0 deletions scss/variables/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,8 @@ $dropdown-border-color: var(--choco-theme-border);
$dropdown-link-color: var(--choco-theme-text);
$dropdown-link-hover-color: var(--choco-theme-text);
$dropdown-link-hover-bg: var(--choco-theme-background);
$dropdown-link-active-color: var(--choco-theme-text);
$dropdown-link-active-bg: var(--choco-theme-background);

// Offcanvas
$offcanvas-bg-color: var(--choco-theme-elevation-1);
Expand Down
Loading

0 comments on commit b070d3a

Please sign in to comment.