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

Fix #4637 - Component Styles: Remove use of !important now that @layer is used #4638

Merged
merged 4 commits into from
Dec 21, 2023
Merged

Fix #4637 - Component Styles: Remove use of !important now that @layer is used #4638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6c3ea85
Update !important from component CSS
FlipWarthog Oct 17, 2023
7602d71
Undo maximize style so it still takes over
FlipWarthog Nov 7, 2023
30efb09
Restore important based on PrimeReact impl
FlipWarthog Nov 10, 2023
6b6fe55
Reapply important removal
FlipWarthog Nov 17, 2023
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
4 changes: 2 additions & 2 deletions components/lib/basecomponent/style/BaseComponentStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ const css = `
}

.p-disabled, .p-disabled * {
cursor: default !important;
cursor: default;
pointer-events: none;
user-select: none;
}
Expand All @@ -274,7 +274,7 @@ const css = `
padding: 0;
position: absolute;
width: 1px;
word-wrap: normal !important;
word-wrap: normal;
}

.p-link {
Expand Down
4 changes: 2 additions & 2 deletions components/lib/calendar/Calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2693,14 +2693,14 @@ export default {
let { breakpoint, numMonths } = responsiveOptions[i];
let styles = `
.p-datepicker[${this.attributeSelector}] .p-datepicker-group:nth-child(${numMonths}) .p-datepicker-next {
display: inline-flex !important;
display: inline-flex;
}
`;

for (let j = numMonths; j < this.numberOfMonths; j++) {
styles += `
.p-datepicker[${this.attributeSelector}] .p-datepicker-group:nth-child(${j + 1}) {
display: none !important;
display: none;
}
`;
}
Expand Down
2 changes: 1 addition & 1 deletion components/lib/cascadeselect/style/CascadeSelectStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const css = `
}

.p-cascadeselect-item-active {
overflow: visible !important;
overflow: visible;
}

.p-cascadeselect-item-active > .p-cascadeselect-sublist {
Expand Down
2 changes: 1 addition & 1 deletion components/lib/confirmdialog/ConfirmDialog.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export interface ConfirmDialogBreakpoints {
*
* @media screen and (max-width: ${breakpoint[key]}) {
* .p-dialog[attributeSelector] {
* width: ${breakpoint[value]} !important;
* width: ${breakpoint[value]};
* }
* }
*/
Expand Down
4 changes: 2 additions & 2 deletions components/lib/datatable/DataTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,12 +1903,12 @@ export default {
@media screen and (max-width: ${this.breakpoint}) {
${selector} > .p-datatable-thead > tr > th,
${selector} > .p-datatable-tfoot > tr > td {
display: none !important;
display: none;
}

${selector} > .p-datatable-tbody > tr > td {
display: flex;
width: 100% !important;
width: 100%;
align-items: center;
justify-content: space-between;
}
Expand Down
4 changes: 2 additions & 2 deletions components/lib/datatable/style/DataTableStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const css = `

.p-datatable .p-column-resizer {
display: block;
position: absolute !important;
position: absolute;
top: 0;
right: 0;
margin: 0;
Expand Down Expand Up @@ -230,7 +230,7 @@ const css = `
}

.p-datatable .p-virtualscroller .p-virtualscroller-loading {
transform: none !important;
transform: none;
min-height: 0;
position: sticky;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion components/lib/dialog/Dialog.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export interface DialogBreakpoints {
*
* @media screen and (max-width: ${breakpoint[key]}) {
* .p-dialog[attributeSelector] {
* width: ${breakpoint[value]} !important;
* width: ${breakpoint[value]};
* }
* }
*/
Expand Down
2 changes: 1 addition & 1 deletion components/lib/dialog/Dialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export default {
innerHTML += `
@media screen and (max-width: ${breakpoint}) {
.p-dialog[${this.attributeSelector}] {
width: ${this.breakpoints[breakpoint]} !important;
width: ${this.breakpoints[breakpoint]};
}
}
`;
Expand Down
4 changes: 2 additions & 2 deletions components/lib/dialog/style/DialogStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ const css = `
transform: none;
width: 100vw !important;
height: 100vh !important;
top: 0px !important;
left: 0px !important;
top: 0px;
left: 0px;
max-height: 100%;
height: 100%;
}
Expand Down
2 changes: 1 addition & 1 deletion components/lib/message/style/MessageStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const css = `
.p-message.p-message-leave-to {
max-height: 0;
opacity: 0;
margin: 0 !important;
margin: 0;
}

.p-message-leave-active {
Expand Down
2 changes: 1 addition & 1 deletion components/lib/overlaypanel/OverlayPanel.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export interface OverlayPanelBreakpoints {
*
* @media screen and (max-width: ${breakpoint[key]}) {
* .p-overlaypanel[attributeSelector] {
* width: ${breakpoint[value]} !important;
* width: ${breakpoint[value]};
* }
* }
*/
Expand Down
2 changes: 1 addition & 1 deletion components/lib/overlaypanel/OverlayPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export default {
innerHTML += `
@media screen and (max-width: ${breakpoint}) {
.p-overlaypanel[${this.attributeSelector}] {
width: ${this.breakpoints[breakpoint]} !important;
width: ${this.breakpoints[breakpoint]};
}
}
`;
Expand Down
8 changes: 4 additions & 4 deletions components/lib/paginator/Paginator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,22 +175,22 @@ export default {
@media screen ${minValue} {
.paginator[${this.attributeSelector}],
.p-paginator-default{
display: flex !important;
display: flex;
}
}
`;
} else {
innerHTML += `
.paginator[${this.attributeSelector}], .p-paginator-${key} {
display: none !important;
display: none;
}
@media screen ${minValue} and (max-width: ${key}) {
.paginator[${this.attributeSelector}], .p-paginator-${key} {
display: flex !important;
display: flex;
}
.paginator[${this.attributeSelector}],
.p-paginator-default{
display: none !important;
display: none;
}
}
`;
Expand Down
2 changes: 1 addition & 1 deletion components/lib/picklist/style/PickListStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const css = `

.p-picklist-item.p-picklist-flip-enter-active.p-picklist-flip-enter-to,
.p-picklist-item.p-picklist-flip-leave-active.p-picklist-flip-leave-to {
transition: none !important;
transition: none;
}
}
`;
Expand Down
2 changes: 1 addition & 1 deletion components/lib/ripple/style/RippleStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const css = `
}

.p-ripple-disabled .p-ink {
display: none !important;
display: none;
}
}
`;
Expand Down
2 changes: 1 addition & 1 deletion components/lib/toast/Toast.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export default {
let breakpointStyle = '';

for (let styleProp in this.breakpoints[breakpoint]) {
breakpointStyle += styleProp + ':' + this.breakpoints[breakpoint][styleProp] + '!important;';
breakpointStyle += styleProp + ':' + this.breakpoints[breakpoint][styleProp] + ';';
}

innerHTML += `
Expand Down
2 changes: 1 addition & 1 deletion components/lib/treetable/style/TreeTableStyle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ const css = `

.p-treetable .p-column-resizer {
display: block;
position: absolute !important;
position: absolute;
top: 0;
right: 0;
margin: 0;
Expand Down
8 changes: 4 additions & 4 deletions doc/timeline/TemplateDoc.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,10 @@ export default {
@media screen and (max-width: 960px) {
::v-deep(.customized-timeline) {
.p-timeline-event:nth-child(even) {
flex-direction: row !important;
flex-direction: row;

.p-timeline-event-content {
text-align: left !important;
text-align: left;
}
}

Expand Down Expand Up @@ -181,10 +181,10 @@ const events = ref([
@media screen and (max-width: 960px) {
::v-deep(.customized-timeline) {
.p-timeline-event:nth-child(even) {
flex-direction: row !important;
flex-direction: row;

.p-timeline-event-content {
text-align: left !important;
text-align: left;
}
}

Expand Down
Loading