Skip to content

MDL2: RTL and other fixes #255

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

Merged
dzearing merged 4 commits into from
Sep 6, 2016
Merged

MDL2: RTL and other fixes #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f7eb3ae
Un-nesting CSS
Sep 6, 2016
aa47fb8
Dropdown more consistent
Sep 6, 2016
a27ff76
Persona RTL fixes
Sep 6, 2016
2b4b935
RTL fixes
Sep 6, 2016
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
180 changes: 88 additions & 92 deletions src/components/Breadcrumb/Breadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,119 +16,115 @@ $Breadcrumb-itemMaxWidth-sm: 116px;
.ms-Breadcrumb {
@include ms-baseFont;
margin: 23px 0 1px;
}

.ms-Breadcrumb-list {
white-space: nowrap;
padding: 0;
margin: 0;
}

.ms-Breadcrumb-chevron {
font-size: $ms-font-size-s;
color: $ms-color-neutralSecondary;
vertical-align: top;
margin: 11px 7px;
}
.ms-Breadcrumb-list {
white-space: nowrap;
padding: 0;
margin: 0;
}

.ms-Breadcrumb-listItem {
list-style-type: none;
vertical-align: top;
margin: 0;
padding: 0;
display: inline-block;
position: relative;
.ms-Breadcrumb-chevron {
font-size: $ms-font-size-s;
color: $ms-color-neutralSecondary;
vertical-align: top;
margin: 11px 7px;
}

&:last-of-type {
.ms-Breadcrumb-chevron {
display: none;
}
}
.ms-Breadcrumb-listItem {
list-style-type: none;
vertical-align: top;
margin: 0;
padding: 0;
display: inline-block;
position: relative;

.ms-Breadcrumb-itemLink {
@include focus-border;
@include ms-font-xl;
color: $ms-color-neutralPrimary;
display: inline-block;
padding: 0 4px;
max-width: $Breadcrumb-itemMaxWidth;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
vertical-align: top;
&:last-of-type {
.ms-Breadcrumb-chevron {
display: none;
}
}

.ms-Breadcrumb-overflow {
.ms-Breadcrumb-itemLink {
@include focus-border;
@include ms-font-xl;
color: $ms-color-neutralPrimary;
display: inline-block;
position: relative;

.ms-Breadcrumb-overflowButton {
font-size: $Breadcrumb-overflowButtonSize;
display: inline-block;
color: $Breadcrumb-overflowButtonColor;
padding: 8px;
cursor: pointer;
vertical-align: top;
}
padding: 0 4px;
max-width: $Breadcrumb-itemMaxWidth;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
vertical-align: top;
}
}

.ms-Breadcrumb-itemLink,
.ms-Breadcrumb-overflowButton {
text-decoration: none;
outline: transparent;
.ms-Breadcrumb-overflow {
display: inline-block;
position: relative;
}

&:hover {
background-color: $selectedHoverBackgroundColor;
color: $Breadcrumb-buttonHoverColor;
cursor: pointer;
}
.ms-Breadcrumb-overflowButton {
font-size: $Breadcrumb-overflowButtonSize;
display: inline-block;
color: $Breadcrumb-overflowButtonColor;
padding: 8px;
cursor: pointer;
vertical-align: top;
}

&:focus {
outline: $ms-color-neutralSecondaryAlt solid 1px;
color: $ms-color-neutralDark;
}
.ms-Breadcrumb-itemLink,
.ms-Breadcrumb-overflowButton {
text-decoration: none;
outline: transparent;

&:active {
outline: transparent;
background-color: $selectedActiveBackgroundColor;
color: $selectedActiveForegroundColor;
}
&:hover {
background-color: $selectedHoverBackgroundColor;
color: $Breadcrumb-buttonHoverColor;
cursor: pointer;
}

@media screen and (max-width: $ms-screen-md-max) {
margin: 11px 0 1px;
&:focus {
outline: $ms-color-neutralSecondaryAlt solid 1px;
color: $ms-color-neutralDark;
}

.ms-Breadcrumb-listItem .ms-Breadcrumb-itemLink {
font-size: $ms-font-size-l;
}
&:active {
outline: transparent;
background-color: $selectedActiveBackgroundColor;
color: $selectedActiveForegroundColor;
}
}

.ms-Breadcrumb-chevron {
font-size: $ms-font-size-mi;
margin: 8px 5px;
}
@media screen and (max-width: $ms-screen-md-max) {
margin: 11px 0 1px;

.ms-Breadcrumb-overflow {
.ms-Breadcrumb-overflowButton {
font-size: $ms-font-size-m-plus;
padding: 5px 4px;
}
}
.ms-Breadcrumb-listItem .ms-Breadcrumb-itemLink {
font-size: $ms-font-size-l;
}

@media screen and (max-width: $ms-screen-sm-max) {
.ms-Breadcrumb-listItem .ms-Breadcrumb-itemLink {
font-size: $ms-font-size-m;
max-width: $Breadcrumb-itemMaxWidth-sm;
}
.ms-Breadcrumb-chevron {
font-size: $ms-font-size-mi;
margin: 8px 5px;
}

.ms-Breadcrumb-chevron {
margin: 5px 4px;
}
.ms-Breadcrumb-overflowButton {
font-size: $ms-font-size-m-plus;
padding: 5px 4px;
}
}

.ms-Breadcrumb-overflow {
.ms-Breadcrumb-overflowButton {
padding: 2px 4px;
}
}
@media screen and (max-width: $ms-screen-sm-max) {
.ms-Breadcrumb-listItem .ms-Breadcrumb-itemLink {
font-size: $ms-font-size-m;
max-width: $Breadcrumb-itemMaxWidth-sm;
}

.ms-Breadcrumb-chevron {
margin: 5px 4px;
}

.ms-Breadcrumb-overflowButton {
padding: 2px 4px;
}
}
17 changes: 8 additions & 9 deletions src/components/Callout/Callout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,15 @@ $Callout-beak-slant-width: 28px;

.ms-Link.ms-Link--hero {
position: relative;
left: -8px; // Move link inline with body text
@include left(-8px); // Move link inline with body text
}
}

.ms-Callout-action {
position: relative;
top: 4px;
left: -8px;
margin-left: 0 !important;
@include left(-8px);
@include margin-left(0);

&:hover .ms-Callout-actionIcon,
&:focus .ms-Callout-actionIcon {
Expand All @@ -92,18 +92,17 @@ $Callout-beak-slant-width: 28px;
}

.ms-Callout-button {
margin-right: 12px;
@include margin-right(12px);
}

//= Modifier: Close button callout
//
.ms-Callout.ms-Callout--close {
.ms-Callout-title {
margin-right: 20px; // Avoid overlap with close button
@include margin-right(20px); // Avoid overlap with close button
}
}


//= Modifier: OOBE (Out of box experience) callout
//
.ms-Callout.ms-Callout--OOBE {
Expand Down Expand Up @@ -152,16 +151,16 @@ $Callout-beak-slant-width: 28px;
&.ms-Callout--arrowBottom {
&:before,
&:after {
left: 40px;
right: auto;
@include left(40px);
@include right(auto);
}
}

&.ms-Callout--arrowRight,
&.ms-Callout--arrowLeft {
&:before,
&:after {
top: calc('50% - 10px');
top: calc(50% - 10px);
}
}

Expand Down
47 changes: 23 additions & 24 deletions src/components/Check/Check.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,6 @@ $checkBoxHeight: 20px;
height: $checkBoxHeight;
text-align: center;

.ms-Check-background {
&:before {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
display: inline-block;
margin: auto;
height: $checkBoxHeight - 2px;
width: $checkBoxHeight - 2px;
background: $ms-color-white;
border: 1px solid $ms-color-neutralTertiaryAlt;
border-radius: 50%;
content: ' ';
}

}

&.is-checked {
.ms-Check-background {
&:before {
Expand All @@ -55,13 +36,31 @@ $checkBoxHeight: 20px;
opacity: 1;
}
}
}

.ms-Check-check {
.ms-Check-check {
left: 0;
right: 0;
position: absolute;
line-height: $checkBoxHeight;
color: $ms-color-neutralTertiaryAlt;
opacity: 0;
}

.ms-Check-background {
&:before {
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
position: absolute;
line-height: $checkBoxHeight;
color: $ms-color-neutralTertiaryAlt;
opacity: 0;
display: inline-block;
margin: auto;
height: $checkBoxHeight - 2px;
width: $checkBoxHeight - 2px;
background: $ms-color-white;
border: 1px solid $ms-color-neutralTertiaryAlt;
border-radius: 50%;
content: ' ';
}
}
18 changes: 11 additions & 7 deletions src/components/Dropdown/Dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

$Dropdown-selectedItem-bg: $ms-color-neutralQuaternaryAlt;
$Dropdown-selectedItem-hover-bg: $ms-color-neutralLighter;
$DropDown-height: 32px;
$DropDown-item-height: 36px;

// Mixin for high contrast mode link states
@mixin highContrastListItemState {
Expand Down Expand Up @@ -150,10 +152,10 @@ $Dropdown-selectedItem-hover-bg: $ms-color-neutralLighter;
color: $ms-color-neutralDark;
font-size: $ms-icon-size-s;
position: absolute;
right: 13px;
bottom: 9px;
z-index: 1;
top: 0px;
@include right(12px);
pointer-events: none;
line-height: $DropDown-height;
}

// Style the new, replacement component
Expand All @@ -163,8 +165,9 @@ $Dropdown-selectedItem-hover-bg: $ms-color-neutralLighter;
border: 1px solid $ms-color-neutralTertiaryAlt;
cursor: pointer;
display: block;
height: 32px;
padding: 5px 32px 0 10px;
height: $DropDown-height;
line-height: $DropDown-height - 2px; // height minus the border
@include padding(0, $DropDown-height, 0, 12px);
position: relative;
overflow: hidden;
}
Expand Down Expand Up @@ -215,8 +218,9 @@ $Dropdown-selectedItem-hover-bg: $ms-color-neutralLighter;
box-sizing: border-box;
cursor: pointer;
display: block;
height: 36px;
padding: 7px 10px;
height: $DropDown-item-height;
line-height: $DropDown-item-height - 2px; // height minus the border
padding: 0px 12px;
position: relative;
border: 1px solid transparent;
white-space: nowrap;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Dropdown/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ export class Dropdown extends React.Component<IDropdownProps, any> {
aria-activedescendant={ selectedIndex >= 0 ? (id + '-list' + selectedIndex) : (id + '-list') }
aria-controls={ id + '-list' }
>
<i className='ms-Dropdown-caretDown ms-Icon ms-Icon--ChevronDown'></i>
<span className='ms-Dropdown-title'>{ selectedOption ? selectedOption.text : '' }</span>
<i className='ms-Dropdown-caretDown ms-Icon ms-Icon--ChevronDown'></i>
<ul ref={ (c: HTMLElement) => this._optionList = c }
id={ id + '-list' }
className='ms-Dropdown-items'
Expand Down
2 changes: 1 addition & 1 deletion src/components/GroupedList/GroupHeader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ $groupHeader-ease-in-back: cubic-bezier(0.600, -0.280, 0.735, 0.045);
display: inline-block;
position: relative;
top: -16px;
left: -26px;
@include left(-26px);
font-size: $ms-icon-size-l;
color: $ms-color-neutralSecondaryAlt;
transition: transform $ms-duration2 $groupHeader-ease-in-back, opacity $ms-duration4 $groupHeader-ease-out-sine;
Expand Down
Loading