Skip to content

Commit

Permalink
fix css
Browse files Browse the repository at this point in the history
  • Loading branch information
matttdawson committed Jan 30, 2025
1 parent 373da4c commit 1dd8ca9
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 53 deletions.
2 changes: 2 additions & 0 deletions src/components/GridCell.test.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, expect, test } from 'vitest';

import { GridBaseRow } from './Grid';
import { generateFilterGetter, SAValueGetterParams } from './GridCell';

Expand Down
4 changes: 2 additions & 2 deletions src/lui/ActionButton.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/ColorVars" as colors;
@use "@linzjs/lui/dist/scss/Core" as lui;

.ActionButton {
display: flex;
Expand Down Expand Up @@ -44,7 +44,7 @@
.ActionButton-inProgress.lui-button-lg.lui-button-icon-right {
cursor: progress;
color: #007198;
background-color: colors.$polar;
background-color: lui.$polar;
}

.ActionButton-fill {
Expand Down
7 changes: 3 additions & 4 deletions src/lui/FormError.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/ColorVars" as colors;

@use "@linzjs/lui/dist/scss/Core" as lui;

.FormError {
display: flex;

&-helpText {
font-size: 0.75rem;
color: colors.$fuscous;
color: lui.$fuscous;
font-weight: 400;
}

Expand All @@ -19,7 +18,7 @@
padding-left: 0;
font-size: 14px;
font-weight: 600;
color: colors.$charcoal;
color: lui.$charcoal;
align-items: center;
}
}
18 changes: 9 additions & 9 deletions src/styles/Grid.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@use "../react-menu3/styles/index";
@use "./react-menu-customisations";
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/ColorVars" as colors;
@use "@linzjs/lui/dist/scss/Core" as lui;

.LabelPreferencesPanelGridCellAlignCenter .ag-wrapper {
margin-left: auto;
Expand Down Expand Up @@ -40,9 +40,9 @@
align-items: center;
flex-direction: row;
padding: 12px;
background-color: colors.$hint;
border-bottom: 1px solid colors.$silver;
border-top: 2px solid colors.$lily;
background-color: lui.$hint;
border-bottom: 1px solid lui.$silver;
border-top: 2px solid lui.$lily;
}

.Grid-container-filters button {
Expand All @@ -68,21 +68,21 @@
position: absolute;
margin: 8px;
pointer-events: none;
fill: colors.$fuscous;
fill: lui.$fuscous;
}

.GridFilterQuick-input {
width: 100%;
height: 40px;
min-height: 40px;
border: 0.06rem solid colors.$silver;
border: 0.06rem solid lui.$silver;
border-radius: 3px;
padding-left: 36px;
padding-right: 0.75rem;
font-family: "Open Sans", system-ui, sans-serif;

&::placeholder {
color: colors.$fuscous;
color: lui.$fuscous;
font-style: italic;
}
}
Expand All @@ -109,11 +109,11 @@
}

.ag-floating-top-container .ag-row {
background-color: colors.$hint;
background-color: lui.$hint;
}

.ag-floating-bottom-container .ag-row {
background-color: colors.$hint;
background-color: lui.$hint;
}

.GridHeaderAlignCenter .ag-header-cell-text {
Expand Down
12 changes: 6 additions & 6 deletions src/styles/GridIcon.scss
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/ColorVars" as colors;
@use "@linzjs/lui/dist/scss/Core" as lui;

.AgGridGenericCellRenderer-icon {
margin-right: 4px;
}

.AgGridGenericCellRenderer-ic_infoIcon {
margin-right: 4px;
fill: colors.$info;
fill: lui.$info;
}

.AgGridGenericCellRenderer-ic_info_outlineIcon {
margin-right: 4px;
fill: colors.$info;
fill: lui.$info;
}

.AgGridGenericCellRenderer-ic_warningIcon {
margin-right: 4px;
fill: colors.$warning;
fill: lui.$warning;
}

.AgGridGenericCellRenderer-ic_warning_outlineIcon {
margin-right: 4px;
fill: colors.$warning;
fill: lui.$warning;
}

.GridIcon-disabled {
fill: colors.$silver !important;
fill: lui.$silver !important;
}
6 changes: 3 additions & 3 deletions src/styles/GridPopoverMenu.scss
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/ColorVars" as colors;
@use "@linzjs/lui/dist/scss/Core" as lui;

.ag-cell .GridPopoutMenu-burger {
cursor: pointer;
display: block;

svg {
fill: colors.$sea;
fill: lui.$sea;
}
}

.ag-cell .GridPopoutMenu-burgerDisabled svg {
fill: colors.$disabled-color;
fill: lui.$disabled-color;
}
55 changes: 26 additions & 29 deletions src/styles/react-menu-customisations.scss
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/ColorVars" as colors;
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/FontVars" as fonts;
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Variables/SpacingVars" as spacing;
@use "../../node_modules/@linzjs/lui/dist/scss/Foundation/Utilities" as *;
@use "@linzjs/lui/dist/scss/Core" as lui;

/**
* Here is where we can override the styles of react-menu
*/
.step-ag-grid-react-menu.szh-menu {
z-index: 900;
color: colors.$base-type-color;
@include fonts.font-regular();
color: lui.$base-type-color;
@include lui.font-regular();

div,
a[role="menuitem"] {
text-decoration: none;
color: colors.$base-type-color;
@include fonts.font-regular();
color: lui.$base-type-color;
@include lui.font-regular();
}

li[role="menuitem"]:hover {
background-color: colors.$polar;
background-color: lui.$polar;
}

.szh-menu__header {
Expand Down Expand Up @@ -48,68 +45,68 @@
width: 240px;
}

color: colors.$base-type-color;
@include fonts.font-light();
color: lui.$base-type-color;
@include lui.font-light();
}

.lui-select-menuItem {
padding: spacing.$unit-xs spacing.$unit-sm spacing.$unit-xs spacing.$unit-xs;
padding: lui.$unit-xs lui.$unit-sm lui.$unit-xs lui.$unit-xs;
display: flex;
line-height: 1;
transition: all 0.2s ease-in-out;
fill: colors.$fuscous;
fill: lui.$fuscous;

&:hover {
background-color: colors.$polar;
background-color: lui.$polar;
}
}

.lui-select-menuItem--error {
p {
color: colors.$error;
color: lui.$error;
}

.LuiIcon {
fill: colors.$error;
fill: lui.$error;
}
}

.lui-select-menuItemText {
@include fonts.font-regular();
color: colors.$charcoal;
@include lui.font-regular();
color: lui.$charcoal;
margin: 0;
padding-left: spacing.$unit-lg;
padding-left: lui.$unit-lg;

// if no icon, give it 4px to align with the group header
&--noPadding {
padding-left: spacing.$unit-xxs;
padding-left: lui.$unit-xxs;
}
}

.lui-select-icon + .lui-select-menuItemText {
padding-left: spacing.$unit-xs;
padding-left: lui.$unit-xs;
}

.lui-select-menu-group {
height: 32px;
color: colors.$fuscous;
color: lui.$fuscous;
padding-left: 0.75rem;
text-transform: none;
@include fonts.font-semibold();
@include lui.font-semibold();
}

.lui-select-submenu {
flex: 1;

div[role="menuitem"] {
padding: spacing.$unit-xs spacing.$unit-xs spacing.$unit-xs 2.5rem;
padding: lui.$unit-xs lui.$unit-xs lui.$unit-xs 2.5rem;
text-decoration: none;
@include fonts.font-regular();
@include lui.font-regular();
height: 40px;
}
// overwrite the hover color
.szh-menu__item--hover {
background-color: colors.$polar;
background-color: lui.$polar;
}
}

Expand All @@ -119,7 +116,7 @@
div[role="menuitem"] {
padding-left: 0;
text-decoration: none;
@include fonts.font-regular();
@include lui.font-regular();
height: 40px;
}
}
Expand All @@ -130,6 +127,6 @@


.step-ag-grid-react-menu-sub-header-icon {
margin: spacing.$unit-xs;
fill: colors.$fuscous;
margin: lui.$unit-xs;
fill: lui.$fuscous;
}
1 change: 1 addition & 0 deletions src/utils/testUtil.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { act, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { isEqual } from 'lodash-es';
import { expect } from 'vitest';

import { findQuick, getAllQuick, getMatcher, getQuick, IQueryQuick, queryQuick } from './testQuick';

Expand Down
7 changes: 7 additions & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ export default defineConfig(async (): Promise<UserConfig> => {
outDir: './build',
target: 'esnext',
},
css: {
preprocessorOptions: {
scss: {
api: 'modern',
},
},
},
base: '/',
};
});

0 comments on commit 1dd8ca9

Please sign in to comment.