Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions js/NavMainComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ NavMainComponent.prototype.init = function () {
// Open navigation on mobile
component.$mobileMenuButton.on('click', function(event) {
var $self = $(this);
var $menuExpanded = $self.attr('aria-expanded');

event.stopImmediatePropagation();

if ($self.text() === 'Menu') {
if ($menuExpanded === 'false') {
component.showMobileNav(true);
} else {
component.showMobileNav(false);
Expand Down Expand Up @@ -368,7 +370,6 @@ NavMainComponent.prototype.showMobileNav = function (show) {
component.$body.removeClass('open-nav');
component.$mobileMenuButton
.removeClass('open')
.text('Menu')
.attr('aria-expanded', 'false');
component.$brandingLink.attr('tabindex', '-1');
component.$primaryNavLinks.attr('tabindex', '-1');
Expand All @@ -384,7 +385,6 @@ NavMainComponent.prototype.showMobileNav = function (show) {
component.$body.addClass('open-nav');
component.$mobileMenuButton
.addClass('open')
.text('Close')
.attr('aria-expanded', 'true');
component.$brandingLink.attr('tabindex', '3');
component.$primaryNavLinks.attr('tabindex', '3');
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion stylesheets/_component.badges.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

.badge {
color: color(white) !important;
font-size: 12px;
font-size: $font-size-medium;
margin-bottom: -1px;
margin-top: -1px;
min-width: 20px;
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_component.buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

.icon,
[class*=icon-] {
font-size: 14px;
font-size: $font-size-medium;
}
}

Expand Down
6 changes: 3 additions & 3 deletions stylesheets/_component.colorpicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
}

.sp-container {
font-size: 14px;
font-size: $font-size-medium;
padding: 5px 0;
margin: 0;
background-color: #fff;
Expand All @@ -110,7 +110,7 @@
}

.sp-cancel {
font-size: 14px;
font-size: $font-size-medium;
}

.sp-container button,
Expand All @@ -129,7 +129,7 @@
color: color(text);
cursor: pointer;
display: inline-block;
font-size: 14px;
font-size: $font-size-medium;
font-weight: normal;
line-height: normal;
margin: 0;
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_component.datatables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ th.sorting_disabled:hover {

.dataTables_actions {
position: absolute;
font-size: 14px;
font-size: $font-size-medium;
left: 24px;
top: 62px;
z-index: 1;
Expand Down
6 changes: 3 additions & 3 deletions stylesheets/_component.datepicker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
overflow: hidden;
margin: 0;
padding: 5px 3px;
font-size: 14px;
font-size: $font-size-medium;
line-height: 20px;
font-weight: bold;
background-color: #fff;
Expand Down Expand Up @@ -155,7 +155,7 @@

.pika-table th {
color: #999;
font-size: 12px;
font-size: $font-size-small;
line-height: 25px;
font-weight: bold;
text-align: center;
Expand All @@ -170,7 +170,7 @@
width: 100%;
padding: 5px;
color: #666;
font-size: 12px;
font-size: $font-size-small;
line-height: 15px;
text-align: right;
background: #f5f5f5;
Expand Down
16 changes: 8 additions & 8 deletions stylesheets/_component.daterange.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
.daterangepicker .calendar th,
.daterangepicker .calendar td {
font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
font-size: 12px;
font-size: $font-size-small;
min-width: 32px;
text-align: center;
white-space: nowrap;
Expand All @@ -69,7 +69,7 @@
.daterangepicker .ranges label {
color: color(gray, darker);
display: block;
font-size: 11px;
font-size: $font-size-small;
font-weight: normal;
height: 20px;
line-height: 20px;
Expand All @@ -81,7 +81,7 @@
}

.daterangepicker .ranges input {
font-size: 11px;
font-size: $font-size-small;
}

.daterangepicker .ranges .input-mini {
Expand All @@ -90,7 +90,7 @@
border: 1px solid color(gray, lightest);
color: color(gray, darker);
display: block;
font-size: 11px;
font-size: $font-size-small;
height: 30px;
line-height: 30px;
margin: 0 0 10px;
Expand All @@ -111,7 +111,7 @@
border: 1px solid color(gray, off-white);
color: color(primary, dark);
cursor: pointer;
font-size: 13px;
font-size: $font-size-medium;
margin-bottom: 8px;
padding: 3px 12px;
}
Expand Down Expand Up @@ -149,7 +149,7 @@

// scss-lint:disable SelectorFormat
.daterangepicker .daterangepicker_input i {
font-size: 14px;
font-size: $font-size-medium;
position: absolute;
left: 8px;
top: 8px;
Expand All @@ -160,7 +160,7 @@
border: 1px solid color(gray, lightest);
border-radius: $border-radius;
color: color(gray, darker);
font-size: 14px;
font-size: $font-size-medium;
height: 30px;
line-height: 30px;
display: block;
Expand Down Expand Up @@ -241,7 +241,7 @@
.daterangepicker select.monthselect,
.daterangepicker select.yearselect {
cursor: default;
font-size: 12px;
font-size: $font-size-small;
height: auto;
margin: 0;
padding: 1px;
Expand Down
4 changes: 2 additions & 2 deletions stylesheets/_component.filterbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
.legend {
border: 0;
display: block;
font-size: 16px;
font-size: $font-size-base;
padding-right: $padding-base;

@include respond-min($screen-tablet) {
border: 0;
display: table-cell;
float: left;
font-size: 16px;
font-size: $font-size-base;
height: 100%;
line-height: 38px;
margin-bottom: 0;
Expand Down
6 changes: 3 additions & 3 deletions stylesheets/_component.modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
}

.form-v2 legend {
font-size: 20px;
font-size: $epsilon;
margin-left: 0;

&::before {
Expand Down Expand Up @@ -216,7 +216,7 @@
.modal__header {
border-bottom: 1px solid color(gray, lightest);
display: flex;
font-size: 16px;
font-size: $font-size-base;
height: 60px;
padding: 0;
}
Expand Down Expand Up @@ -308,7 +308,7 @@

.modal__title-meta {
color: color(text, help);
font-size: 14px;
font-size: $font-size-medium;
margin-bottom: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_component.navigation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
}

.popover {
font-size: 14px;
font-size: $font-size-medium;
padding: 5px 0;
margin: 0;
list-style: none;
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_component.notifications.scss
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
display: inline-block;
line-height: 1.2em;
margin-bottom: 0;
font-size: 20px;
font-size: $epsilon;
}

.notifications-dismiss {
Expand Down
4 changes: 2 additions & 2 deletions stylesheets/_component.piano.scss
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ $piano-bg: #fafafa;
.piano__time {
clear: both;
display: block;
font-size: 14px;
font-size: $font-size-medium;
}

.piano__form {
Expand All @@ -197,7 +197,7 @@ $piano-bg: #fafafa;
}

.piano__item-toggle {
font-size: 20px;
font-size: $epsilon;
position: absolute;
right: 20px;
text-decoration: none;
Expand Down
4 changes: 2 additions & 2 deletions stylesheets/_component.ribbon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
border-bottom: 1px solid #ccc;
border-top: 1px solid #ccc;
color: #000;
font-size: 14px;
font-size: $font-size-medium;
padding: 0 $gutter-width;
position: relative;
width: 100%;
Expand All @@ -26,7 +26,7 @@

.ribbon__mobile-toggle {
color: #000;
font-size: 28px;
font-size: $gamma;
position: absolute;
right: 10px;
text-decoration: none;
Expand Down
6 changes: 3 additions & 3 deletions stylesheets/_component.rules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
}

.rule-block__heading__icon {
font-size: 16px;
font-size: $font-size-base;
margin-left: 10px;
}

Expand Down Expand Up @@ -230,7 +230,7 @@
content: '\f061';
font-family: $font-family-icons;
font-weight: 900;
font-size: 19px;
font-size: $font-size-large;
left: 0;
position: absolute;
top: 17px;
Expand Down Expand Up @@ -408,7 +408,7 @@ td.table__form .rules + .form__group:last-of-type {
content: '\f061';
font-family: $font-family-icons;
font-weight: 900;
font-size: 19px;
font-size: $font-size-large;
left: 0;
position: absolute;
top: 17px;
Expand Down
6 changes: 3 additions & 3 deletions stylesheets/_component.search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ input.main-search__field::-ms-clear {
background: none;
border: 0;
color: #555;
padding: 1px 8px 0;
padding: 3px 8px;
position: absolute;
right: 0;
top: 8px;
top: 6px;
z-index: 3;

@include respond-min($screen-tablet) {
Expand All @@ -95,7 +95,7 @@ input.main-search__field::-ms-clear {
.main-search__extras {
background-color: #eee;
display: block;
font-size: 14px;
font-size: $font-size-medium;
padding: 5px 12px;
text-align: left;
text-transform: lowercase;
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_component.select2.scss
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
@include ie-lte(9) {
color: color(black);
float: none;
font-size: 18px;
font-size: $zeta;
line-height: 20px;
padding: 0 $padding-base;
}
Expand Down
8 changes: 4 additions & 4 deletions stylesheets/_component.timeline.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@

span {
display: block;
font-size: 10px;
font-size: $micro;
line-height: 2.1;
text-align: center;

@include respond-min($screen-phone) {
font-size: 13px;
font-size: $font-size-medium;
}

@include respond-min($screen-tablet) {
font-size: 20px;
font-size: $epsilon;
}
}

Expand Down Expand Up @@ -209,7 +209,7 @@

&__date {
display: block;
font-size: 14px;
font-size: $font-size-medium;
margin-top: $padding-base;

@include respond-min($screen-tablet) {
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_component.toggle-switch.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
width: 4em;

&::after {
font-size: 32px;
font-size: $font-size-xxlarge;
left: 15px;
letter-spacing: 32px;
}
Expand Down
Loading