Skip to content

Commit

Permalink
Update sass to remove warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
tmcconechy committed Aug 6, 2024
1 parent 91b3c69 commit 80ae4ef
Show file tree
Hide file tree
Showing 11 changed files with 57 additions and 66 deletions.
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

- `[Datagrid]` Optimize the initial loading of datagrids with filterable setting. ([#8935](https://github.com/infor-design/enterprise-ng/issues/8935))
- `[Datagrid]` Remove modification in calculateTextWidth that had incorrect selectors. ([#8938](https://github.com/infor-design/enterprise/issues/8938))
- `[General]` Upgrade dependencies, this involved updating sass and test dependencies with a few css deprecations that were fixed. ([#8947](https://github.com/infor-design/enterprise-ng/issues/8947))
- `[ModuleNav]` Fixed a bug where the tooltip was not showing when collapsed by default. ([NG#1678](https://github.com/infor-design/enterprise-ng/issues/1678))

## v4.98.0
Expand Down
4 changes: 2 additions & 2 deletions src/components/applicationmenu/_applicationmenu-new.scss
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,8 @@
&:hover,
&.is-focused,
&.is-selected {
z-index: 0;

> a {
// allows the text inside the pseudo to be placed in front.
position: relative;
Expand All @@ -273,8 +275,6 @@
position: absolute;
width: calc(100% - 20px);
}

z-index: 0;
}

&.is-focused {
Expand Down
8 changes: 4 additions & 4 deletions src/components/cards/_cards-new.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,14 @@

.card-content,
.widget-content {
&.has-back-button {
overflow-x: hidden;
}

border-bottom-left-radius: 8px;
border-bottom-right-radius: 8px;
position: relative;

&.has-back-button {
overflow-x: hidden;
}

&.padding-x-16 {
.content-main,
.content-detail {
Expand Down
8 changes: 4 additions & 4 deletions src/components/datagrid/_datagrid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4415,15 +4415,15 @@ td .btn-actions {
}

.icon:not(.datagrid-alert-icon) {
&:not(.icon-rowstatus) {
@include trigger-icon-background($datagrid-cell-bg-color);
}

color: $trigger-icon-fill-color;
left: 3px;
top: 4px;
visibility: hidden;

&:not(.icon-rowstatus) {
@include trigger-icon-background($datagrid-cell-bg-color);
}

&.datagrid-alert-icon {
visibility: visible;
}
Expand Down
27 changes: 13 additions & 14 deletions src/components/dropdown/_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ select.dropdown-xs {

div.dropdown,
div.multiselect {
@include input-style();
@include transition(background-color 0.2s ease);

background-color: $input-color-initial-background;
border-color: $input-color-initial-border;
color: $dropdown-color-initial-font;
Expand All @@ -87,9 +84,11 @@ div.multiselect {
text-overflow: ellipsis;
vertical-align: middle;
white-space: nowrap;
-webkit-touch-callout: none;
user-select: none;
transition: background-color 0.2s ease;

@include css3(touch-callout, none);
@include css3(user-select, none);
@include input-style();

&.text-align-reverse {
text-align: right;
Expand All @@ -116,13 +115,13 @@ div.multiselect {
}

> .listoption-icon {
@include list-icon-colors();

color: $popupmenu-icon-color;
position: absolute;
top: 9px;
vertical-align: middle;

@include list-icon-colors();

+ span {
padding-left: 29px;
}
Expand Down Expand Up @@ -431,14 +430,14 @@ div.multiselect {
}

.listoption-icon {
@include list-icon-colors();

color: $popupmenu-icon-color;
left: 0;
margin-right: 7px;
pointer-events: none;
top: 3px;

@include list-icon-colors();

&:not(.custom-icon) {
height: 16px;
}
Expand All @@ -458,13 +457,13 @@ div.multiselect {
}

> .listoption-icon {
@include list-icon-colors();

color: $popupmenu-icon-color;
left: 10px;
position: absolute;
top: 8px;

@include list-icon-colors();

&.swatch {
border-radius: 2px;
left: 14px;
Expand Down Expand Up @@ -505,9 +504,6 @@ div.multiselect {
}

a {
@include css3(touch-callout, none);
@include css3(user-select, none);

color: $popupmenu-color;
display: block;
overflow: hidden;
Expand All @@ -516,6 +512,9 @@ div.multiselect {
white-space: nowrap;
width: inherit;

@include css3(touch-callout, none);
@include css3(user-select, none);

&:empty {
height: 32px;
}
Expand Down
8 changes: 4 additions & 4 deletions src/components/header/_header-new.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@
.searchfield-wrapper.non-collapsible {
&.has-categories {
.searchfield {
@include placeholderTextColor() {
@include placeholder();
}

background-color: $subheader-searchfield-context-bg;
border-left-color: $subheader-input-color-focus-border;
color: $header-flex-toolbar-input-searchfield-color;

@include placeholderTextColor() {
@include placeholder();
}

+ .btn-icon.close {
svg {
top: 0 !important;
Expand Down
10 changes: 5 additions & 5 deletions src/components/module-nav/module-nav.dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ $module-nav-container-size: $module-nav-switcher-button-size + $module-nav-switc
}

div.dropdown {
@include module-nav-input-style;
@include module-nav-div-dropdown-adjustment;

height: $module-nav-switcher-dropdown-height;
width: $module-nav-switcher-dropdown-width;

@include module-nav-div-dropdown-adjustment;
@include module-nav-input-style;

&.is-disabled {
padding-block-start: 7px;
}
Expand Down Expand Up @@ -202,9 +202,9 @@ $module-nav-container-size: $module-nav-switcher-button-size + $module-nav-switc
// When configured with icons, don't show icon in "search" area
&.has-icons {
input.dropdown-search {
@include module-nav-div-dropdown-adjustment;

padding-block-start: 7px; // Adjustment needed for the input field

@include module-nav-div-dropdown-adjustment;
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/components/searchfield/_searchfield-toolbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1018,16 +1018,16 @@ html.is-firefox {
.toolbar-searchfield-wrapper.non-collapsible {
// reset all the styling for the searchfield to correctly appear open.
.searchfield {
@include placeholderTextColor() {
@include placeholder();
}

background-color: $subheader-searchfield-context-bg;
border-bottom-color: rgba($searchfield-header-border-color, 0.7);
color: $header-flex-toolbar-input-searchfield-color;
height: 38px;

&::-webkit-input-placeholder {
@include placeholderTextColor() {
@include placeholder();
}

&::-webkit-input-placeholder {
color: $searchfield-placeholder-text-color;
}

Expand Down
39 changes: 15 additions & 24 deletions src/components/tabs-module/_tabs-module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@
//================================================== //

.tab-container.module-tabs {
background-color: $module-tabs-bg-color;
border-bottom: 1px solid $module-tabs-y-border-color;
border-top: 1px solid $module-tabs-y-border-color;
font-size: 0;
height: 36px;
overflow: hidden;

@include transition(background-color 500ms cubic-bezier(0.17, 0.04, 0.03, 0.94));

&::after,
&::before {
@include transition(width 200ms $cubic-ease);

background-color: transparent;
content: '';
display: inline-block;
Expand All @@ -15,40 +22,24 @@
top: 0;
width: 0;
z-index: 20;

@include transition(width 200ms $cubic-ease);
}

&::before {
background-image:
linear-gradient(
to right,
linear-gradient(to right,
rgba($module-default-bg-color, 1),
rgba($module-default-bg-color, 0)
);
rgba($module-default-bg-color, 0));
}

&::after {
background-image:
linear-gradient(
to right,
linear-gradient(to right,
rgba($module-default-bg-color, 0),
rgba($module-default-bg-color, 1)
);
rgba($module-default-bg-color, 1));
}

@include transition(background-color 500ms cubic-bezier(0.17, 0.04, 0.03, 0.94));

background-color: $module-tabs-bg-color;
border-bottom: 1px solid $module-tabs-y-border-color;
border-top: 1px solid $module-tabs-y-border-color;
font-size: 0;
height: 36px;
overflow: hidden;

// Acts as a spacer that causes the toolbar items to vertically align.
// &::before {
// @include vertical-alignment-spacer;
// }

> * {
display: inline-block;
vertical-align: middle;
Expand Down
4 changes: 2 additions & 2 deletions src/components/tabs-vertical/_tabs-vertical.scss
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,10 @@

// Normal configuration of the tabset can just have '.tab-list' directly inside the vertical tabs container.
> .tab-list {
@include vertical-tab-style;

height: 100%;

@include vertical-tab-style;

> .tab {
a {
padding: 10px 30px;
Expand Down
4 changes: 2 additions & 2 deletions src/components/tabs/_tabs-new.scss
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
margin-bottom: -41px;

.tab {
top: 0;

&.has-popupmenu {
.icon {
height: 16px;
Expand All @@ -82,8 +84,6 @@
}
}

top: 0;

// Adds "semi-bold" style to selected/active tabs
&:not(.is-disabled).is-selected {
a {
Expand Down

0 comments on commit 80ae4ef

Please sign in to comment.