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

feat(form-field): add feature targeting for styles #4521

Merged
merged 3 commits into from
Mar 20, 2019
Merged

feat(form-field): add feature targeting for styles #4521

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
215f032
feat(form-field): add feature targeting for styles
mmalerba Mar 19, 2019
74018f5
WIP Add !default to variable for consistency with rest of repo
kfranqueiro Mar 20, 2019
66cd141
Merge branch 'master' into form-field-sass
kfranqueiro Mar 20, 2019
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
95 changes: 95 additions & 0 deletions packages/mdc-form-field/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
//
// Copyright 2019 Google Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//

@import "@material/feature-targeting/functions";
@import "@material/feature-targeting/mixins";
@import "@material/rtl/mixins";
@import "@material/theme/mixins";
@import "@material/typography/mixins";
@import "./variables";

@mixin mdc-form-field-core-styles($query: mdc-feature-all()) {
$feat-color: mdc-feature-create-target($query, color);
$feat-structure: mdc-feature-create-target($query, structure);

.mdc-form-field {
@include mdc-typography(body2, $query);

@include mdc-feature-targets($feat-color) {
@include mdc-theme-prop(color, text-primary-on-background);
}

@include mdc-feature-targets($feat-structure) {
display: inline-flex;
align-items: center;
vertical-align: middle;
}

// stylelint-disable-next-line selector-max-type
> label {
@include mdc-feature-targets($feat-structure) {
order: 0;
/* @noflip */
margin-right: auto;
/* @noflip */
padding-left: $mdc-form-field-item-spacing;
}
}

@include mdc-rtl {
// stylelint-disable-next-line selector-max-type
> label {
@include mdc-feature-targets($feat-structure) {
/* @noflip */
margin-left: auto;
/* @noflip */
padding-right: $mdc-form-field-item-spacing;
}
}
}
}

.mdc-form-field--align-end {
// stylelint-disable-next-line selector-max-type
> label {
@include mdc-feature-targets($feat-structure) {
order: -1;
/* @noflip */
margin-left: auto;
/* @noflip */
padding-right: $mdc-form-field-item-spacing;
}
}

@include mdc-rtl {
// stylelint-disable-next-line selector-max-type
> label {
@include mdc-feature-targets($feat-structure) {
/* @noflip */
margin-right: auto;
/* @noflip */
padding-left: $mdc-form-field-item-spacing;
}
}
}
}
}
23 changes: 23 additions & 0 deletions packages/mdc-form-field/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// Copyright 2019 Google Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
//

$mdc-form-field-item-spacing: 4px !default;
54 changes: 2 additions & 52 deletions packages/mdc-form-field/mdc-form-field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,55 +20,5 @@
// THE SOFTWARE.
//

@import "@material/rtl/mixins";
@import "@material/theme/mixins";
@import "@material/typography/mixins";

$mdc-form-field-item-spacing: 4px;

// stylelint-disable selector-max-type
.mdc-form-field {
@include mdc-typography(body2);
@include mdc-theme-prop(color, text-primary-on-background);

display: inline-flex;
align-items: center;
vertical-align: middle;

> label {
order: 0;
/* @noflip */
margin-right: auto;
/* @noflip */
padding-left: $mdc-form-field-item-spacing;
}

@include mdc-rtl {
> label {
/* @noflip */
margin-left: auto;
/* @noflip */
padding-right: $mdc-form-field-item-spacing;
}
}
}

.mdc-form-field--align-end {
> label {
order: -1;
/* @noflip */
margin-left: auto;
/* @noflip */
padding-right: $mdc-form-field-item-spacing;
}

@include mdc-rtl {
> label {
/* @noflip */
margin-right: auto;
/* @noflip */
padding-left: $mdc-form-field-item-spacing;
}
}
}
// stylelint-enable selector-max-type
@import "./mixins";
@include mdc-form-field-core-styles;
4 changes: 4 additions & 0 deletions test/scss/feature-targeting.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
@import "@material/checkbox/mixins";
@import "@material/elevation/mixins";
@import "@material/feature-targeting/functions";
@import "@material/form-field/mixins";
@import "@material/list/mixins";
@import "@material/menu-surface/mixins";
@import "@material/menu/mixins";
Expand Down Expand Up @@ -48,6 +49,9 @@
@include mdc-elevation-core-styles($query: mdc-feature-any());
@include mdc-elevation(0, $query: mdc-feature-any());

// Form Field
@include mdc-form-field-core-styles($query: mdc-feature-any());

// List
@include mdc-list-core-styles($query: mdc-feature-any());
@include mdc-list-item-primary-text-ink-color(red, $query: mdc-feature-any());
Expand Down