Skip to content

Commit f70a1a4

Browse files
committed
Merge branch 'master' into master-deprecated
2 parents f7b8959 + 2c240fa commit f70a1a4

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@ The basic structure of the project is given in the following way:
106106

107107
## Team
108108

109-
AlloyUI is maintained by these people and a bunch of awesome [contributors](https://github.com/liferay/alloy-ui/graphs/contributors).
109+
AlloyUI is maintained by Liferay's Frontend Infrastructure team and a bunch of awesome [contributors](https://github.com/liferay/alloy-ui/graphs/contributors).
110110

111-
[![Eduardo Lundgren](http://gravatar.com/avatar/42327de520e674a6d1686845b30778d0?s=70)](https://github.com/eduardolundgren) | [![Nate Cavanaugh](http://gravatar.com/avatar/3f754d8a639c608d338b580b446c59d6?s=70)](https://github.com/natecavanaugh) | [![Bruno Basto](http://gravatar.com/avatar/4d7367e850216a8e6f9be296c74f0d68?s=70)](https://github.com/brunobasto) | [![Iliyan Peychev](http://gravatar.com/avatar/c2a0cb9ed0d19196b7fe061055c18838?s=70)](https://github.com/ipeychev) | [![Zeno Rocha](http://gravatar.com/avatar/e190023b66e2b8aa73a842b106920c93?s=70)](https://github.com/zenorocha)
112-
--- | --- | --- | --- | ---
113-
[Eduardo Lundgren](https://github.com/eduardolundgren) | [Nate Cavanaugh](https://github.com/natecavanaugh) | [Bruno Basto](https://github.com/brunobasto) | [Iliyan Peychev](https://github.com/ipeychev) | [Zeno Rocha](https://github.com/zenorocha)
111+
[![Liferay Frontend Infrastructure Team](https://avatars.githubusercontent.com/u/66941902?v=4)](https://github.com/liferay-frontend) |
112+
--- |
113+
[Liferay Frontend Infrastructure Team](https://github.com/liferay-frontend) |
114114

115115
## History
116116

@@ -120,4 +120,4 @@ Each module (located under `src/`) contains a `HISTORY.md` file, check them for
120120

121121
## License
122122

123-
[BSD-3-Clause License](https://github.com/liferay/alloy-ui/blob/master/LICENSE.md) (c) Liferay, Inc.
123+
[BSD-3-Clause License](https://github.com/liferay/alloy-ui/blob/master/LICENSE.md) (c) Liferay, Inc.

src/aui-scheduler/assets/aui-scheduler-view-agenda-core.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
.scheduler-view-agenda-info-container .scheduler-view-agenda-info .scheduler-view-agenda-info-label-biggie {
3838
font-size: 1.5em;
3939
padding: 5px 0;
40+
font-weight: bold;
4041
}
4142

4243
.scheduler-view-agenda-info-container .scheduler-view-agenda-info .scheduler-view-agenda-info-label-small {

src/aui-scheduler/assets/aui-scheduler-view-day-core.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
.scheduler-view-day-table-time {
4747
border-top: 1px solid #ddd;
48-
color: #aba9aa;
48+
color: #555;
4949
height: 52px;
5050
padding-right: 4px;
5151
}
@@ -124,7 +124,7 @@
124124
}
125125

126126
.scheduler-view-day-header-day .scheduler-today-hd {
127-
color: #009be6;
127+
color: #0b5fff;
128128
font-weight: bold;
129129
}
130130

src/aui-scheduler/assets/aui-scheduler-view-month-core.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}
99

1010
.scheduler-view-month-table-data-col-nomonth {
11-
color: #ccc;
11+
color: #666;
1212
font-size: 14px;
1313
}
1414

src/aui-scheduler/js/aui-scheduler-base-view.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,7 @@ var SchedulerView = A.Component.create({
452452
if (bodyNode) {
453453
bodyNode.toggleClass(CSS_SCHEDULER_VIEW_SCROLLABLE, val);
454454
bodyNode.toggleClass(CSS_SCHEDULER_VIEW_NOSCROLL, !val);
455+
bodyNode.setAttribute('tabindex', 0);
455456
}
456457
}
457458
}

src/aui-scheduler/js/aui-scheduler-base.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ var CSS_SCHEDULER_VIEW_ = A.getClassName('scheduler-base', 'view', ''),
5555
TPL_SCHEDULER_NAV_DATE = '<div class="' + CSS_SCHEDULER_NAV_DATE + ' hidden-xs" tabindex="0"></div>',
5656
TPL_SCHEDULER_TODAY = '<button aria-label="{ariaLabel}" role="button" type="button" class="' +
5757
[CSS_SCHEDULER_TODAY, CSS_BTN, CSS_BTN_DEFAULT].join(' ') + '">{today}</button>',
58-
TPL_SCHEDULER_VIEW_BUTTON = '<button aria-label="{ariaLabel}" aria-pressed="false" type="button" class="hidden-xs ' +
58+
TPL_SCHEDULER_VIEW_BUTTON = '<button aria-label="{ariaLabel}" type="button" class="hidden-xs ' +
5959
[CSS_SCHEDULER_VIEW, CSS_SCHEDULER_VIEW_].join(' ') + '{name}" data-view-name="{name}">{label}</button>',
6060
TPL_SCHEDULER_VIEW_LIST = '<option aria-label="{ariaLabel}" aria-pressed="false" class="' +
6161
[CSS_SCHEDULER_VIEW, CSS_SCHEDULER_VIEW_].join(' ') + '{name}" data-view-name="{name}">{label}</option>',
@@ -1487,9 +1487,9 @@ var SchedulerBase = A.Component.create({
14871487
activeNav = instance.viewsNode.one('.' + CSS_SCHEDULER_VIEW_ + activeView);
14881488

14891489
if (activeNav) {
1490-
instance.viewsNode.all('button').removeClass(CSS_SCHEDULER_VIEW_SELECTED).setAttribute('aria-pressed', false);
1490+
instance.viewsNode.all('button').removeClass(CSS_SCHEDULER_VIEW_SELECTED);
14911491
instance.viewsSelectNode.one('[data-view-name=' + activeView + ']').set('selected', true);
1492-
activeNav.addClass(CSS_SCHEDULER_VIEW_SELECTED).setAttribute('aria-pressed', true);
1492+
activeNav.addClass(CSS_SCHEDULER_VIEW_SELECTED);
14931493
}
14941494
}
14951495
},

0 commit comments

Comments
 (0)