Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into feat/fab-feature-ta…
Browse files Browse the repository at this point in the history
…rgeting
  • Loading branch information
Kenneth G. Franqueiro committed Mar 21, 2019
2 parents 1e89a55 + 4706f05 commit 33dd8ab
Show file tree
Hide file tree
Showing 5 changed files with 157 additions and 143 deletions.
143 changes: 143 additions & 0 deletions test/scss/_feature-targeting-test.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
@import "@material/button/mixins";
@import "@material/card/mixins";
@import "@material/checkbox/mixins";
@import "@material/elevation/mixins";
@import "@material/fab/mixins";
@import "@material/form-field/mixins";
@import "@material/list/mixins";
@import "@material/menu-surface/mixins";
@import "@material/menu/mixins";
@import "@material/radio/mixins";
@import "@material/ripple/mixins";
@import "@material/shape/mixins";
@import "@material/switch/mixins";
@import "@material/theme/mixins";
@import "@material/typography/mixins";

@mixin mdc-feature-targeting-test($query) {
.mdc-test {
// Button
@include mdc-button-core-styles($query: $query);
@include mdc-button-filled-accessible(red, $query: $query);
@include mdc-button-container-fill-color(red, $query: $query);
@include mdc-button-outline-color(red, $query: $query);
@include mdc-button-icon-color(red, $query: $query);
@include mdc-button-ink-color(red, $query: $query);
@include mdc-button-shape-radius(0, $query: $query);
@include mdc-button-horizontal-padding(0, $query: $query);
@include mdc-button-outline-width(0, $query: $query);
@include mdc-button-ripple($query: $query);
@include mdc-button-without-ripple($query: $query);

// Card
@include mdc-card-core-styles($query: $query);
@include mdc-card-fill-color(red, $query: $query);
@include mdc-card-outline(red, $query: $query);
@include mdc-card-shape-radius(0, $query: $query);
@include mdc-card-media-aspect-ratio(1, 1, $query: $query);
@include mdc-card-ripple($query: $query);
@include mdc-card-without-ripple($query: $query);

// Checkbox
@include mdc-checkbox-core-styles($query: $query);
@include mdc-checkbox-container-colors($query: $query);
@include mdc-checkbox-ink-color(red, $query: $query);
@include mdc-checkbox-focus-indicator-color(red, $query: $query);
@include mdc-checkbox-ripple($query: $query);
@include mdc-checkbox-without-ripple($query: $query);

// Elevation
@include mdc-elevation-core-styles($query: $query);
@include mdc-elevation(0, $query: $query);

// FAB
@include mdc-fab-core-styles($query: $query);
@include mdc-fab-without-ripple($query: $query);
@include mdc-fab-ripple($query: $query);
@include mdc-fab-accessible(red, $query: $query);
@include mdc-fab-container-color(red, $query: $query);
@include mdc-fab-icon-size(0, $query: $query);
@include mdc-fab-ink-color(red, $query: $query);
@include mdc-fab-extended-fluid($query: $query);
@include mdc-fab-extended-padding(0, 0, $query: $query);
@include mdc-fab-extended-label-padding(0, $query: $query);
@include mdc-fab-shape-radius(0, $query: $query);
@include mdc-fab-extended-shape-radius(0, $rtl-reflexive: false, $query: $query);

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

// List
@include mdc-list-core-styles($query: $query);
@include mdc-list-item-primary-text-ink-color(red, $query: $query);
@include mdc-list-item-secondary-text-ink-color(red, $query: $query);
@include mdc-list-item-graphic-fill-color(red, $query: $query);
@include mdc-list-item-graphic-ink-color(red, $query: $query);
@include mdc-list-item-meta-ink-color(red, $query: $query);
@include mdc-list-item-shape-radius(42, $rtl-reflexive: false, $query: $query);
@include mdc-list-divider-color(red, $query: $query);
@include mdc-list-group-subheader-ink-color(red, $query: $query);
@include mdc-list-ripple($query: $query);
@include mdc-list-without-ripple($query: $query);

// Menu
@include mdc-menu-core-styles($query: $query);
@include mdc-menu-width(0, $query: $query);

// Menu Surface
@include mdc-menu-surface-core-styles($query: $query);
@include mdc-menu-surface-fill-color(surface, $query: $query);
@include mdc-menu-surface-ink-color(on-surface, $query: $query);
@include mdc-menu-surface-shape-radius(medium, $query: $query);

// Radio
@include mdc-radio-core-styles($query: $query);
@include mdc-radio-unchecked-stroke-color(red, $query: $query);
@include mdc-radio-checked-stroke-color(red, $query: $query);
@include mdc-radio-ink-color(red, $query: $query);
@include mdc-radio-focus-indicator-color(red, $query: $query);
@include mdc-radio-ripple($query: $query);
@include mdc-radio-without-ripple($query: $query);

// Ripple
@include mdc-ripple-core-styles($query: $query);
@include mdc-ripple-common($query: $query);
@include mdc-ripple-surface($query: $query);
@include mdc-states-base-color(red, $query: $query);
@include mdc-states-hover-opacity(1, $query: $query);
@include mdc-states-focus-opacity(1, $query: $query);
@include mdc-states-press-opacity(1, $query: $query);
@include mdc-states($query: $query);
@include mdc-states-activated(red, $query: $query);
@include mdc-states-selected(red, $query: $query);
@include mdc-ripple-radius-bounded($query: $query);
@include mdc-ripple-radius-unbounded($query: $query);

// Shape
@include mdc-shape-radius(1px 2px, true, $query: $query);

// Switch
@include mdc-switch-core-styles($query: $query);
@include mdc-switch-toggled-on-color(on-surface, $query: $query);
@include mdc-switch-toggled-off-color(on-surface, $query: $query);
@include mdc-switch-toggled-on-ripple-color(on-surface, $query: $query);
@include mdc-switch-toggled-off-ripple-color(on-surface, $query: $query);
@include mdc-switch-toggled-on-track-color(on-surface, $query: $query);
@include mdc-switch-toggled-on-thumb-color(on-surface, $query: $query);
@include mdc-switch-toggled-off-track-color(on-surface, $query: $query);
@include mdc-switch-toggled-off-thumb-color(on-surface, $query: $query);
@include mdc-switch-ripple($query: $query);
@include mdc-switch-without-ripple($query: $query);

// Theme
@include mdc-theme-core-styles($query: $query);

// Typography
@include mdc-typography-core-styles($query: $query);
@include mdc-typography-base($query: $query);
@include mdc-typography(button, $query: $query);
@include mdc-typography-overflow-ellipsis($query: $query);
@include mdc-typography-baseline-top(0, $query: $query);
@include mdc-typography-baseline-bottom(0, $query: $query);
}
}
3 changes: 3 additions & 0 deletions test/scss/feature-targeting-select-all.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "@material/feature-targeting/functions";
@import "./feature-targeting-test";
@include mdc-feature-targeting-test(mdc-feature-all());
3 changes: 3 additions & 0 deletions test/scss/feature-targeting-select-none.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "@material/feature-targeting/functions";
@import "./feature-targeting-test";
@include mdc-feature-targeting-test(mdc-feature-any());
142 changes: 0 additions & 142 deletions test/scss/feature-targeting.scss

This file was deleted.

9 changes: 8 additions & 1 deletion test/scss/verify-feature-targeting.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,15 @@ function materialImporter(url) {
return {file: url};
}

// Verify that the Sass compiles when we ask for all features.
sass.renderSync({
file: path.join(__dirname, 'feature-targeting-select-all.scss'),
importer: materialImporter,
});

// Verify that the Sass produces no CSS when we ask for no features.
const result = sass.renderSync({
file: path.join(__dirname, 'feature-targeting.scss'),
file: path.join(__dirname, 'feature-targeting-select-none.scss'),
importer: materialImporter,
});
const css = result.css.toString('utf8').trim();
Expand Down

0 comments on commit 33dd8ab

Please sign in to comment.