Skip to content

Commit

Permalink
Merge pull request #4638 from FlipWarthog/no-important
Browse files Browse the repository at this point in the history
Fix #4637 - Component Styles: Remove use of !important now that @layer is used
  • Loading branch information
tugcekucukoglu committed Dec 21, 2023
2 parents 2c4bd88 + 6b6fe55 commit 84f735e
Show file tree
Hide file tree
Showing 18 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions components/lib/basecomponent/style/BaseComponentStyle.js
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
Original file line number Diff line number Diff line change
Expand Up @@ -2729,14 +2729,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
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
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,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
Original file line number Diff line number Diff line change
Expand Up @@ -1911,12 +1911,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
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
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,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
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
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
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
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
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
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
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

0 comments on commit 84f735e

Please sign in to comment.