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.

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

Fix #25862: UI Issues after CSS changes #25864

Merged
merged 21 commits into from Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
bb15c2d
fix (storybook): wrong import in searchable dropdown story
zJaaal Aug 22, 2023
1ef8981
fix (searchable dropdown component): Add overflow support for long texts
zJaaal Aug 22, 2023
60ea6d3
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 23, 2023
efa9807
fix (jsp components): change styles that were off after css changes
zJaaal Aug 23, 2023
3f29683
fix (dot template thumbnail field style): button and input styles wer…
zJaaal Aug 23, 2023
67c0388
fix (comboBox styles): height of input needs to be 100%
zJaaal Aug 23, 2023
4bfe459
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 23, 2023
6e0f465
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 23, 2023
ce6405b
fix (general styles): modifying styles that were off
zJaaal Aug 23, 2023
32992f4
dev (chips styles): create chips common extend
zJaaal Aug 23, 2023
d0e7200
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 23, 2023
efe7214
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 23, 2023
bad5490
fix (chip extend): general cleanup
zJaaal Aug 23, 2023
1e43512
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 23, 2023
7da13fe
fix (tags and textarea dojo): general cleanup
zJaaal Aug 24, 2023
2cc53bd
fix (dojo styles and components): general clean up
zJaaal Aug 24, 2023
fb8d859
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 24, 2023
a943ccc
fix (dojo menu): wrong height setting
zJaaal Aug 24, 2023
fc82aaf
fix (dojo calendar styles): increment/decrement arrows were missing
zJaaal Aug 24, 2023
762125f
Merge branch 'master' into issue-25862-fix-ui-issues-after-css-changes
zJaaal Aug 24, 2023
91b3730
fix (item disable extend): delete unnecessary color
zJaaal Aug 24, 2023
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
@@ -1,5 +1,6 @@
@use "variables" as *;
@import "dotcms-theme/components/form/common";
@import "dotcms-theme/components/buttons/common";

dot-binary-file {
display: block;
Expand All @@ -10,9 +11,6 @@ dot-binary-file {

input {
@extend #form-field-extend;
border-top-left-radius: $border-radius-xs;
border-bottom-left-radius: $border-radius-xs;
padding: 1.07rem;
width: 100%;
}
}
Expand All @@ -22,8 +20,17 @@ dot-binary-file {
}

button {
border-top-right-radius: $border-radius-xs;
border-bottom-right-radius: $border-radius-xs;
all: unset;
@extend #main-primary-severity;
background-color: $color-palette-primary;
display: block;
height: $field-height-md;
font-size: $font-size-md;
color: $white;
border-radius: $border-radius-md;
padding: 0 $spacing-3;
text-transform: capitalize;
margin-left: $spacing-0;
}

.dot-file-preview__info {
Expand Down
Expand Up @@ -8,24 +8,32 @@
position: relative;

::ng-deep .p-element.p-button:enabled {
justify-content: space-between;
gap: $spacing-1;
text-align: left;
padding: 0;
padding-left: $spacing-1;
border: $field-border-size solid $color-palette-gray-400;

.p-button-label {
@include truncate-text;
text-transform: none;
color: $black;
}

.p-button-icon {
@extend #field-trigger;
@extend #field-trigger-icon;
height: 100%;
display: flex;
align-items: center;
justify-content: center;

&:before {
display: flex;
align-items: center;
justify-content: center;
width: $field-height-md;
aspect-ratio: 1/1;
}
}

&:hover {
Expand Down
Expand Up @@ -28,7 +28,7 @@ export default {
},
decorators: [
moduleMetadata({
declarations: [DotMessagePipe, SearchableDropdownComponent],
declarations: [SearchableDropdownComponent],
imports: [
BrowserAnimationsModule,
ButtonModule,
Expand All @@ -37,7 +37,8 @@ export default {
DotIconModule,
FormsModule,
InputTextModule,
OverlayPanelModule
OverlayPanelModule,
DotMessagePipe
]
})
],
Expand Down Expand Up @@ -71,7 +72,7 @@ export default {
},
data: [
{
label: 'This is an option',
label: 'This is a really long option to test the power of the ellipsis in this component',
value: 'option1'
},
{
Expand Down
Expand Up @@ -51,8 +51,7 @@
}

// Severity for basic button
.p-button:enabled,
.p-button.p-element {
.p-button.p-element:enabled {
@extend #main-primary-severity;

&.p-button-secondary {
Expand Down
Expand Up @@ -23,9 +23,19 @@
}
}

.p-autocomplete-dropdown.p-button.p-element {
&:hover,
&:focus,
&:active {
outline: none;
background-color: $color-palette-gray-200;
}
}

&.p-autocomplete-multiple {
.p-autocomplete-multiple-container {
padding: 0.375rem $spacing-2;
display: flex;
align-items: center;
max-height: 13rem; // 208px
overflow: auto; // Make it scrollable

Expand All @@ -35,16 +45,12 @@
border: none;
}

&:has(> .p-autocomplete-token) {
padding: $spacing-1 0;
}

.p-autocomplete-token {
padding: 0.375rem $spacing-2;
margin-right: $spacing-1;
background: $color-palette-primary-200;
color: $color-palette-primary;
border-radius: $field-border-radius;

.p-autocomplete-token-icon {
margin-left: $spacing-1;
}
@extend #field-chip;
}

.p-autocomplete-input-token {
Expand Down
Expand Up @@ -6,6 +6,8 @@
@extend #form-field-base;
min-width: 13rem;
padding-right: 0;
min-height: $field-height-md;
height: auto;

&:not(.p-multiselect-open):hover {
@extend #form-field-hover;
Expand All @@ -17,16 +19,26 @@
}

.p-multiselect-label-container {
padding: $spacing-1 0;
display: flex;
align-items: center;
padding-right: $spacing-1;

.p-multiselect-label:not(.p-placeholder) {
color: $black;
@include truncate-text;

&:has(> .p-multiselect-token) {
padding: $spacing-1 0;
height: auto;
flex-wrap: wrap;
overflow: visible;
}
}
}

.p-multiselect-trigger {
@extend #field-trigger;
height: auto;

.p-multiselect-trigger-icon {
@extend #field-trigger-icon;
Expand All @@ -51,24 +63,11 @@
color: $color-palette-gray-800;

.p-multiselect-label {
gap: $spacing-1;
padding: $spacing-1;
}

.p-multiselect-label.p-placeholder {
padding: $spacing-3;
gap: $spacing-0;
}

.p-multiselect-token {
align-items: center;
background: $color-palette-primary-op-10;
border-radius: $border-radius-sm;
color: $color-palette-primary;
display: flex;
gap: $spacing-1;
justify-content: center;
margin-right: $spacing-1;
padding: $spacing-1;
@extend #field-chip;
}
}
}
Expand Down
Expand Up @@ -131,7 +131,6 @@

#field-panel-item-disabled {
@extend #form-field-disabled;
color: $color-palette-gray-500;
cursor: initial;
}

Expand All @@ -143,3 +142,16 @@
border: 2px solid $color-palette-gray-400;
}
}

#field-chip {
height: 1.5rem;
padding: $spacing-1;
background: $color-palette-primary-200;
border-radius: $border-radius-sm;
color: $color-palette-primary;
font-size: $font-size-sm;
display: flex;
align-items: center;
justify-content: center;
gap: $spacing-0;
}