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

Bugfix #1535 #3467

Closed
wants to merge 19 commits into from
Closed

Bugfix #1535 #3467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9bdc2ac
added styling to buttons and changed span to button
taggie05 Nov 17, 2017
a09e68e
Contextual menu up/down arrow key behavior - preventing defaults (#3426)
whykushal93 Nov 20, 2017
e67a5e4
give new textfield examples the right max width (#3435)
sbalentine Nov 21, 2017
2d93e4d
SwatchColorPicker Color Cells: Adding Gray Border Around White Color …
chang47 Nov 21, 2017
5871a22
Fix typos & grammar for experiments README (#3437)
Jahnp Nov 21, 2017
71feff6
Applying package updates.
Nov 21, 2017
5f2cce6
Add small headline with margin and wide mode (#3441)
pipi1007 Nov 22, 2017
5275bfc
Applying package updates.
Nov 22, 2017
5ca08ee
ContextualMenu: Add a prop for setting the min width to be equal to t…
christiango Nov 22, 2017
336dfbf
ResizeGroup should apply className from props (#3450)
staylo8 Nov 22, 2017
c9c4e06
Modifying the combobox dropdown alignment to have the scrollbar align…
Caseyyu2 Nov 22, 2017
3851339
ComboBox behavior with up/down arrow keys when menu is closed (#3451)
whykushal93 Nov 22, 2017
2509956
ContextualMenu: Updated styles for expanded menu item to match toolki…
lynamemi Nov 22, 2017
3c633a1
Button: new prop splitButtonAriaLabel (#3430)
pablonete Nov 23, 2017
dd26806
Toggle: Split out a separate example for on and offAriaLabel (#3421)
lynamemi Nov 23, 2017
fabc839
Applying package updates.
Nov 23, 2017
4923ab5
Merge branch 'master' into bugfix1535
taggie05 Nov 27, 2017
1721267
Merge remote-tracking branch 'origin/master' into bugfix1535
taggie05 Nov 28, 2017
0608895
Merge remote-tracking branch 'origin/master' into bugfix1535
taggie05 Nov 28, 2017
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
23 changes: 16 additions & 7 deletions packages/office-ui-fabric-react/src/components/Calendar/Calendar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,25 +591,25 @@ $Calendar-dayPicker-margin: 10px;
}

.monthIsHighlighted {
background-color: $ms-color-themeLight;
background-color: $ms-color-themeLight !important;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

!important raises red flags - should be a last resort

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

agreed. this will break anyone downstream that is trying to theme their calendar.

&.monthOption:hover {
background-color: $ms-color-themeLight;
background-color: $ms-color-themeLight !important;
}
}

.monthIsCurrentMonth {
font-weight: 600;
color: $ms-color-white;
background-color: $ms-color-themePrimary;
color: $ms-color-white !important;
background-color: $ms-color-themePrimary !important;
&.monthOption:hover {
font-weight: 600;
color: $ms-color-white;
background-color: $ms-color-themePrimary;
color: $ms-color-white !important;
background-color: $ms-color-themePrimary !important;
}
}

.monthOption:active {
background-color: $ms-color-themeLight;
background-color: $ms-color-themeLight !important;
}

// Highlighted Month date styling.
Expand All @@ -636,4 +636,13 @@ $Calendar-dayPicker-margin: 10px;

.singleBottomDate {
border-radius: 0;
}
button {
background: none !important;
color: inherit;
border: none;
padding: 0! important;
font: inherit;
cursor: pointer;
outline: inherit !important;
}
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/Calendar/CalendarDay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export class CalendarDay extends BaseComponent<ICalendarDayProps, ICalendarDaySt
ref={ isNavigatedDate ? 'navigatedDay' : undefined }
key={ isNavigatedDate ? 'navigatedDay' : undefined }
>
<span aria-hidden='true'>{ dateTimeFormatter.formatDay(day.originalDate) }</span>
<button aria-hidden='true'>{ dateTimeFormatter.formatDay(day.originalDate) }</button>
</div>
</td>;
}) }
Expand Down
4 changes: 2 additions & 2 deletions packages/office-ui-fabric-react/src/components/Calendar/CalendarMonth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export class CalendarMonth extends BaseComponent<ICalendarMonthProps, {}> {
const isInBounds = (minDate ? compareDatePart(minDate, getMonthEnd(indexedMonth)) < 1 : true) &&
(maxDate ? compareDatePart(getMonthStart(indexedMonth), maxDate) < 1 : true);

return <span
return <button
role={ 'gridcell' }
className={
css('ms-DatePicker-monthOption', styles.monthOption,
Expand All @@ -138,7 +138,7 @@ export class CalendarMonth extends BaseComponent<ICalendarMonthProps, {}> {
ref={ isNavigatedMonth ? 'navigatedMonth' : undefined }
>
{ month }
</span>;
</button>;
}
) }
</div>
Expand Down