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

Jump to bottom

Remove object namespace #2829

Merged
merged 3 commits into from Oct 7, 2018
Merged

Remove object namespace #2829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8d5835
Remove `object` namespace
thisisdano Oct 7, 2018
6b372e3
Manually correct utility names
thisisdano Oct 7, 2018
f027674
Use `utility` ns for all utilities
thisisdano Oct 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 3 additions & 6 deletions src/stylesheets/core/mixins/_utility-builder.scss
View file
Open in desktop
Expand Up @@ -17,12 +17,11 @@ loop
null
);
$this-mq: null;
$this-type: map-get($utility, type);

@if $mq {
$this-mq: '#{$mq}\\:';
}
.#{$this-mq}#{$pseudoclass}\:#{ns($this-type)}#{$selector}:#{$pseudoclass} {
.#{$this-mq}#{$pseudoclass}\:#{ns('utility')}#{$selector}:#{$pseudoclass} {
@each $this-property in $property {
#{$this-property}: unquote('#{$value}#{$important}');
}
Expand Down Expand Up @@ -54,7 +53,6 @@ loop
);
$our-breakpoints: map-deep-get($system-properties, breakpoints, standard);
$mq: null;
$this-type: map-get($utility, type);
$value-is-map: if(
type-of($val-props) == 'map',
true,
Expand All @@ -67,7 +65,7 @@ loop

@if map-get($theme-utility-breakpoints, $media-key) {
@include at-media($media-key) {
.#{$mq}\:#{ns($this-type)}#{$selector} {
.#{$mq}\:#{ns('utility')}#{$selector} {
@if $value-is-map and map-has-key($val-props, extend) {
@include add-utility-declaration($val-props, extend, $important);
}
Expand Down Expand Up @@ -113,14 +111,13 @@ future version of Sass' warning.
null
);
$mq: null;
$this-type: map-get($utility, type);
$value-is-map: if(
type-of($val-props) == 'map',
true,
false
);

.#{ns($this-type)}#{$selector} {
.#{ns('utility')}#{$selector} {
@if $value-is-map and map-has-key($val-props, extend) {
@include add-utility-declaration($val-props, extend, $important);
}
Expand Down
4 changes: 0 additions & 4 deletions src/stylesheets/settings/_settings-general.scss
View file
Open in desktop
Expand Up @@ -44,10 +44,6 @@ $theme-namespace: (
namespace: 'grid-',
output: true,
),
'object': (
namespace: 'add-',
output: true,
),
'utility': (
namespace: 'u-',
output: false,
Expand Down
4 changes: 0 additions & 4 deletions src/stylesheets/theme/_uswds-theme-general.scss
View file
Open in desktop
Expand Up @@ -44,10 +44,6 @@ $theme-namespace: (
namespace: 'grid-',
output: true,
),
'object': (
namespace: 'add-',
output: true,
),
'utility': (
namespace: 'u-',
output: false,
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/utilities/rules/add-aspect.scss
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ example:

$add-aspect: (
add-aspect: (
base: 'aspect',
base: 'add-aspect',
modifiers: null,
values: (
9x16: (
Expand Down
2 changes: 1 addition & 1 deletion src/stylesheets/utilities/rules/add-list-reset.scss
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ example:

$add-list-reset: (
list-reset: (
base: 'list',
base: 'add-list',
modifiers: null,
values: (
reset: (
Expand Down