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

Refactor gap css styles #3892

Merged
merged 9 commits into from
Jun 21, 2024
Merged

Refactor gap css styles #3892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af15ee0
start of gap changes
asylves1 Jun 17, 2024
ac2ef67
Merge branch 'main' into 3670-task-clean-up-the-gap-variables
asylves1 Jun 17, 2024
12e6b51
Merge branch 'main' into 3670-task-clean-up-the-gap-variables
asylves1 Jun 20, 2024
95d4875
Merge branch 'main' into 3670-task-clean-up-the-gap-variables
asylves1 Jun 20, 2024
763dc1a
Update packages/client/hmi-client/src/assets/css/theme/extensions/_au…
asylves1 Jun 20, 2024
a19d0f8
suggested PR changes
asylves1 Jun 20, 2024
1689ddf
suggested PR changes
asylves1 Jun 20, 2024
7fd4e81
remove extra space
asylves1 Jun 21, 2024
31917e3
Merge branch 'main' into 3670-task-clean-up-the-gap-variables
asylves1 Jun 21, 2024
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
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/assets/css/buttonset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
}

.p-button.p-button-sm {
padding: 0.5rem 0.75rem;
padding: var(--gap-2) var(--gap-3);
}
}
19 changes: 19 additions & 0 deletions packages/client/hmi-client/src/assets/css/theme/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,4 +976,23 @@ $petri-inputBox: var(--surface-0);
--node-header-hover: var(--text-color-subdued);
--z-index-modal: 1000;
--keyboard-zindex: calc(var(--z-index-modal) + 100);

// tailwind gaps as variables used in app
--gap-0-5: 0.125rem; // 2px
--gap-1: 0.25rem; // 4px
--gap-1-5: 0.375rem; // 6px
--gap-2: 0.5rem; // 8px
--gap-2-5: 0.625rem; // 10px
--gap-3: 0.75rem; // 12px
--gap-3-5: 0.875rem; // 14px
--gap-4: 1rem; // 16px
--gap-5: 1.25rem; // 20px
--gap-6: 1.5rem; // 24px
--gap-7: 1.75rem; // 28px
--gap-8: 2rem; // 32px
--gap-9: 2.25rem; // 36px
--gap-10: 2.5rem; // 40px
--gap-11: 2.75rem; // 44px
--gap-12: 3rem; // 48px

}
14 changes: 7 additions & 7 deletions packages/client/hmi-client/src/assets/css/theme/designer/components/data/_datatable.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,24 +280,24 @@
}

.p-datatable-thead > tr > th {
padding: 0.125rem 0;
padding: var(--gap-0-5) 0;
font-size: x-small;
}

.p-datatable-tbody > tr > td {
padding: 0.125rem 0;
padding: var(--gap-0-5) 0;
background-color: var(--surface-0);
border: none;
}

.p-datatable-thead > tr > th {
background-color: var(--surface-0);
}

.p-datatable-tbody > tr > t {
border: none;
}

.p-datatable-thead > tr > th {
border: none;
}
Expand Down Expand Up @@ -346,4 +346,4 @@
@include scaledPadding($tableFooterPadding, $tableScaleLG);
}
}
}
}
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/designer/components/data/_tree.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

.p-tree-filter-container {
margin-bottom: $inlineSpacing;
padding: 0.5rem;
padding: var(--gap-2);

.p-tree-filter {
width: 100%;
Expand All @@ -89,4 +89,4 @@
.p-tree-loading-icon {
font-size: $loadingIconFontSize;
}
}
}
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/designer/components/input/_autocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
border-radius: 0;
border-bottom-left-radius: 1.5rem;
border-bottom-right-radius: 1.5rem;
padding-bottom: 0.25rem;
padding-bottom: var(--gap-1);
box-shadow: $inputOverlayShadow;

.p-autocomplete-items {
Expand Down Expand Up @@ -122,4 +122,4 @@
font-weight: $submenuHeaderFontWeight;
}
}
}
}
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/assets/css/theme/designer/components/messages/_toast.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
.p-toast-message-icon {
font-size: $toastIconFontSize;
// display:none;
margin-left: 0.25rem;
margin-left: var(--gap-1);
width: 16px;
height: 16px;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/designer/components/misc/_chip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
border-radius: $chipBorderRadius;
font-weight: $fontWeightSemiBold;
font-size: $fontCaption;
padding: 0 0.75rem;
padding: 0 var(--gap-3);
border: solid 1px var(--surface-border-light);

.p-chip-text,
Expand Down Expand Up @@ -54,4 +54,4 @@
color:var(--text-color-primary);
}

}
}
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_autocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
.p-float-label {
.p-autocomplete-multiple-container {
.p-autocomplete-token {
padding: .25rem 1rem;
padding: var(--gap-1) 1rem;
}
}
}
Expand Down Expand Up @@ -69,4 +69,4 @@
box-shadow: inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor;
}
}
}
}
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_breadcrumb.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
background: $emphasis-lower;
}

padding: 0.25rem 0.5rem;
padding: var(--gap-1) var(--gap-2);
}
}
}
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_chips.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.p-float-label {
.p-chips-multiple-container {
.p-chips-token {
padding: .25rem 1rem;
padding: var(--gap-1) 1rem;
}
}
}
Expand Down Expand Up @@ -51,4 +51,4 @@
&:not(.p-disabled).p-focus {
box-shadow: inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor;
}
}
}
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@

.p-dropdown-sm {
.p-dropdown-label {
padding: 0.5rem;
padding: var(--gap-2);
}
}
}
6 changes: 3 additions & 3 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_float_label.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
.p-inputtext {
@include filled-input-float-label();
}

input:focus ~ label,
input.p-filled ~ label,
textarea:focus ~ label,
textarea.p-filled ~ label,
.p-inputwrapper-focus ~ label,
.p-inputwrapper-filled ~ label {
top: .25rem !important;
top: var(--gap-1) !important;
margin-top: 0;
background: transparent;
}
}
}
}
14 changes: 7 additions & 7 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
border-color: transparent;
}
}

@mixin filled-input-interaction() {
&:enabled:hover {
background-color: $inputFilledHoverBg;
Expand Down Expand Up @@ -98,16 +98,16 @@
background-image: none;
background: transparent;
}
}
}
}

@mixin filled-input-float-label() {
@if (nth($inputPadding, 1) == 1rem) {
padding-top: 1.5rem;
padding-bottom: .5rem;
padding-top: var(--gap-6);
padding-bottom: var(--gap-2);
}
@else if (nth($inputPadding, 1) == .75rem) {
padding-top: 1.25rem;
padding-bottom: .25rem;
padding-top: var(--gap-5);
padding-bottom: var(--gap-1);
}
}
}
18 changes: 9 additions & 9 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_multiselect.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
}

.p-multiselect-panel {
.p-multiselect-panel {
.p-multiselect-items {
.p-multiselect-item {
.p-ink {
Expand Down Expand Up @@ -53,9 +53,9 @@
.p-float-label {
.p-multiselect-label {
.p-multiselect-token {
padding: .25rem 1rem;
margin-top: .25rem;
margin-bottom: .25rem;
padding: var(--gap-1) 1rem;
margin-top: var(--gap-1);
margin-bottom: var(--gap-1);
}
}
}
Expand All @@ -67,25 +67,25 @@
@include filled-input-float-label();
}
}

.p-inputwrapper-filled {
&.p-multiselect {
.p-multiselect-label {
@include filled-input-float-label();
}

&.p-multiselect-chip {
.p-multiselect-token {
padding-top: 0;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;

.p-multiselect-token-icon {
font-size: 75%;
}
}
}
}
}
}
}
Expand All @@ -99,4 +99,4 @@
&:not(.p-disabled).p-focus {
box-shadow: inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor;
}
}
}
4 changes: 2 additions & 2 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_tabview.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
.p-tabview-nav-link {
display: flex;
font-size: $fontBodyMedium;
gap: 0.5rem;
gap: var(--gap-2);
transition: background-color $transitionDuration;
border-radius: 0;

Expand Down Expand Up @@ -44,4 +44,4 @@

.xsm {
height: 2rem;
}
}
16 changes: 8 additions & 8 deletions packages/client/hmi-client/src/assets/css/theme/extensions/_treeselect.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
.p-float-label {
.p-treeselect-label {
.p-treeselect-token {
padding: .25rem 1rem;
margin-top: .25rem;
margin-bottom: .25rem;
padding: var(--gap-1) 1rem;
margin-top: var(--gap-1);
margin-bottom: var(--gap-1);
}
}
}
Expand All @@ -49,25 +49,25 @@
@include filled-input-float-label();
}
}

.p-inputwrapper-filled {
&.p-treeselect {
.p-treeselect-label {
@include filled-input-float-label();
}

&.p-treeselect-chip {
.p-treeselect-token {
padding-top: 0;
padding-bottom: 0;
margin-top: 0;
margin-bottom: 0;

.p-treeselect-token-icon {
font-size: 75%;
}
}
}
}
}
}
}
Expand All @@ -81,4 +81,4 @@
&:not(.p-disabled).p-focus {
box-shadow: inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor,inset 0 0 0 1px $inputErrorBorderColor;
}
}
}
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/components/asset/tera-asset.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ main:deep(.p-accordion-content > textarea) {
main:deep(.artifact-amount) {
font-size: var(--font-caption);
color: var(--text-color-subdued);
margin-left: 0.25rem;
margin-left: var(--gap-1);
}

main:deep(.p-button.p-button-outlined) {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/components/dataset/tera-dataset-datatable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ watch(
}

.p-datatable.p-datatable-sm:deep(.p-datatable-tbody > tr > td) {
padding: 0.25rem 0.5rem;
padding: var(--gap-1) 0.5rem;
}
/* Histograms & Charts */
.column-summary {
Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/components/dataset/tera-dataset-jupyter-panel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ const onDownloadResponse = (payload) => {
}

.variables-table div {
padding: 0.25rem;
padding: var(--gap-1);
}

.variables-header {
Expand Down
Loading
Loading