Skip to content

refactor(components): use spacing for margin and padding #11444

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
simeonoff merged 10 commits into from
Apr 21, 2022
Merged

refactor(components): use spacing for margin and padding #11444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e934b46
feat(action-strip): use new spacing() function for margin and paddings.
desig9stein Apr 19, 2022
b1b74da
feat(banner): use new spacing() function for margin and paddings.
desig9stein Apr 19, 2022
99e2970
feat(bottom-nav): use new spacing() function for margin and paddings.
desig9stein Apr 19, 2022
eaf0717
feat(button-group): use new spacing() function for margin and paddings.
desig9stein Apr 19, 2022
ee9230b
feat(navbar): use new spacing() function for margin and paddings.
desig9stein Apr 19, 2022
ccf6b9e
feat(navdrawer): use new spacing() function for margin and paddings.
desig9stein Apr 20, 2022
b9f9d08
feat(paginator): use new spacing() function for margin and paddings.
desig9stein Apr 20, 2022
b247b0c
feat(progress): update theme file
desig9stein Apr 20, 2022
2d549aa
feat(navdrawer): fix build style error.
desig9stein Apr 20, 2022
a612901
feat(bottom-nav): fix missing spacing.
desig9stein Apr 21, 2022
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
15 changes: 8 additions & 7 deletions ...cts/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,16 @@

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires spacing
/// @requires rem
/// @requires var-get
@mixin action-strip($theme) {
@include css-vars($theme);

$padding: (
comfortable: 0 rem(24px),
cosy: 0 rem(16px),
compact: 0 rem(12px)
comfortable: 0 spacing(24px, 'comfortable'),
cosy: 0 spacing(16px, 'cosy'),
compact: 0 spacing(12px, 'compact')
);

$variant: map.get($theme, variant);
Expand Down Expand Up @@ -136,18 +137,18 @@
}

igx-icon + [igxLabel] {
margin-inline-start: rem(12px);
margin-inline-start: spacing(12px);
}

&%igx-drop-down__item--cosy {
igx-icon + [igxLabel] {
margin-inline-start: rem(10px);
margin-inline-start: spacing(10px);
}
}

&%igx-drop-down__item--compact {
igx-icon + [igxLabel] {
margin-inline-start: rem(8px);
margin-inline-start: spacing(8px);
}
}
}
Expand Down Expand Up @@ -197,7 +198,7 @@

%igx-action-strip__editing-actions {
> [igxButton] {
margin-inline-start: rem(4px);
margin-inline-start: spacing(4px);

&:first-of-type {
margin-inline-start: 0;
Expand Down
13 changes: 7 additions & 6 deletions projects/igniteui-angular/src/lib/core/styles/components/banner/_banner-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,14 @@
/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires rem
/// @requires spacing
/// @requires var-get
@mixin banner($theme) {
@include css-vars($theme);
$banner-padding: (
comfortable: rem(8),
cosy: rem(8),
compact: rem(8)
comfortable: spacing(8px, 'comfortable'),
cosy: spacing(8px, 'cosy'),
compact: spacing(8px, 'compact')
);

%igx-banner,
Expand All @@ -100,7 +101,7 @@
width: rem(40);
min-width: rem(40);
height: rem(40);
margin-inline-start: rem(16);
margin-inline-start: spacing(16px);
color: var-get($theme, 'banner-illustration-color');
}

Expand All @@ -117,7 +118,7 @@
%igx-banner__text {
color: var-get($theme, 'banner-message-color');
flex: 1 0 0%;
margin-inline-start: rem(24);
margin-inline-start: spacing(24px);

> * {
margin-block-start: 0 !important;
Expand All @@ -135,7 +136,7 @@
%igx-banner__message {
min-width: rem(220);
flex: 1 0 0%;
margin-inline-end: rem(90);
margin-inline-end: spacing(90px);
}

%igx-banner__row {
Expand Down
7 changes: 4 additions & 3 deletions projects/igniteui-angular/src/lib/core/styles/components/bottom-nav/_bottom-nav-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
/// @requires color
/// @requires extend
/// @requires rem
/// @requires spacing
/// @requires $ease-in-out-quad
/// @requires var-get
@mixin bottom-nav($theme) {
Expand All @@ -90,7 +91,7 @@
$menu-height: rem(56px);
$item-min-width: rem(80px);
$item-max-width: rem(168px);
$item-padding: 0 rem(12px, 16px);
$item-padding: 0 spacing(12px);

%igx-bottom-nav-panel {
display: block;
Expand Down Expand Up @@ -161,7 +162,7 @@

%igx-tab-label {
@include ellipsis();
padding-block-start: rem(4px);
padding-block-start: spacing(4px);
max-width: 100%;
text-align: center;
transform: translateZ(0);
Expand All @@ -174,7 +175,7 @@
position: relative;
justify-content: center;
height: 24px;
padding: 0 8px;
padding: 0 spacing(8px);
transform: translateZ(0);
transition: transform .15s $ease-in-out-quad;
z-index: 1;
Expand Down
6 changes: 4 additions & 2 deletions ...cts/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,17 @@
/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires color
/// @requires rem
/// @requires spacing
/// @requires border-radius
/// @requires var-get
@mixin button-group($theme) {
@include css-vars($theme);
$group-item-min-width: 24px;
$group-item-border-thickness: 1px;
$group-items-margin: rem(10px, 16px);
$group-items-margin: spacing(10px);
$transition: all 140ms $ease-in-out-quad;
$palette: map.get($theme, 'palette');

$variant: map.get($theme, 'variant');
$bootstrap-theme: $variant == 'bootstrap';
$indigo-theme: $variant == 'indigo-design';
Expand Down
7 changes: 4 additions & 3 deletions projects/igniteui-angular/src/lib/core/styles/components/navbar/_navbar-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,13 @@

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires em
/// @requires rem
/// @requires spacing
/// @requires var-get
@mixin navbar($theme) {
@include css-vars($theme);

$navbar-padding: rem(16px);
$navbar-padding: spacing(16px);
$navbar-title-fz: rem(18px, 16px);
$navbar-title-lh: rem(18px, 16px);
$navbar-title-margin: 0;
Expand Down Expand Up @@ -135,7 +136,7 @@
user-select: none;

> * + * {
margin-inline-start: rem(16px);
margin-inline-start: spacing(16px);
}
}

Expand Down
25 changes: 14 additions & 11 deletions projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,16 @@
/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires rem
/// @requires spacing
/// @requires border-radius
/// @requires var-get
@mixin navdrawer($theme) {
@include css-vars($theme);

$drawer-icon-size: rem(24px);
$drawer-item-margin: rem(8px);
$text-side-padding: rem(8px);
$drawer-item-m: 8px;
$drawer-item-margin: spacing($drawer-item-m);
$text-side-padding: spacing(8px);
$drawer-item-min-h: auto;
$drawer-item-max-h: rem(48px);
$drawer-item-min-w: rem(32px);
Expand Down Expand Up @@ -238,7 +241,7 @@
@if $variant == 'indigo-design' {
max-width: rem(32px);
// important is needed to override the typography margins
margin: rem(14px) auto !important;
margin: spacing(14px) auto !important;

igx-icon {
margin-inline-start: 0;
Expand Down Expand Up @@ -296,11 +299,11 @@
@if $variant != 'indigo-design' {
// important is needed to override the typography margins
margin: $drawer-item-margin !important;
padding: rem(12px) rem(8px);
padding: spacing(12px) spacing(8px);
} @else {
// important is needed to override the typography margins
margin: rem(15px) $drawer-item-margin !important;
padding: rem(4px);
margin: spacing(15px) $drawer-item-margin !important;
padding: spacing(4px);
}

cursor: pointer;
Expand All @@ -309,15 +312,15 @@
white-space: nowrap;
border-radius: border-radius(var-get($theme, 'item-border-radius'));
text-decoration: none;
width: calc(100% - #{$drawer-item-margin * 2});
width: calc(100% - #{rem($drawer-item-m) * 2});
border: none;
justify-content: flex-start;

> igx-icon + span {
@if $variant == 'indigo-design' {
margin-inline-start: calc(32px - #{$text-side-padding});
margin-inline-start: spacing(24px);
} @else {
margin-inline-start: rem(32px);
margin-inline-start: spacing(32px);
}
}

Expand All @@ -330,7 +333,7 @@
igx-icon {
color: var-get($theme, 'item-icon-color');
@if $variant == 'indigo-design' {
margin-inline-start: rem(4px);
margin-inline-start: spacing(4px);
}
}

Expand Down Expand Up @@ -415,7 +418,7 @@

%item--header {
display: block;
padding: rem(12px) rem(16px);
padding: spacing(12px) spacing(16px);
white-space: nowrap;
color: var-get($theme, 'item-header-text-color');
}
Expand Down
11 changes: 6 additions & 5 deletions projects/igniteui-angular/src/lib/core/styles/components/paginator/_paginator-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,15 @@
/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires rem
/// @requires spacing
/// @requires var-get
@mixin paginator($theme) {
@include css-vars($theme);

$paginator-padding: (
comfortable: 0 rem(24px),
cosy: 0 rem(16px),
compact: 0 rem(12px)
comfortable: 0 spacing(24px, 'comfortable'),
cosy: 0 spacing(16px, 'cosy'),
compact: 0 spacing(12px, 'compact')
);

$paginator-height: (
Expand Down Expand Up @@ -123,7 +124,7 @@
}

%igx-page-size__label {
margin-inline-end: rem(8px);
margin-inline-end: spacing(8px);
@include ellipsis();
}

Expand All @@ -140,7 +141,7 @@
flex: 1;

> * {
margin-inline-start: rem(8px);
margin-inline-start: spacing(8px);
}

[dir='rtl'] & {
Expand Down
7 changes: 4 additions & 3 deletions projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@

/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires em
/// @requires rem
/// @requires border-radius
/// @requires var-get
@mixin progress-linear($theme) {
@include css-vars($theme);
Expand Down Expand Up @@ -138,7 +139,6 @@
$stripe-color: var-get($theme, 'stripes-color');
$value-fs: em(14px, 16px);
$value-fw: 600;
$value-margin: 0;

%linear-display {
position: relative;
Expand Down Expand Up @@ -229,7 +229,7 @@
}

%linear-value {
margin: $value-margin;
margin: 0;
color: var-get($theme, 'text-color');
font-size: $value-fs;
font-weight: $value-fw;
Expand Down Expand Up @@ -338,6 +338,7 @@
/// @param {Map} $theme - The theme used to style the component.
/// @requires {mixin} css-vars
/// @requires rem
/// @requires border-radius
/// @requires {mixin} rotate-center
/// @requires var-get
@mixin progress-circular($theme) {
Expand Down