Skip to content

fix: fix theme for oruga v0.8.3 #106

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

Merged
merged 1 commit into from
Feb 7, 2024
Merged

fix: fix theme for oruga v0.8.3 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/assets/scss/components/_autocomplete.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ $autocomplete-menu-max-height: 200px !default;

.autocomplete-wrapper {
--#{$prefix}autocomplete-menu-max-height: #{$autocomplete-menu-max-height};
display: inline-block;

.dropdown-menu {
max-height: var(--#{$prefix}autocomplete-menu-max-height);
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@ $btn-hover-box-shadow: $box-shadow-sm !default;
}
}

.btn:not(:last-child):not(.btn-expanded) {
.btn:not(:last-child):not(.btn-expanded):has(+.btn) {
margin-right: var(--#{$prefix}btn-spacer);
}
12 changes: 8 additions & 4 deletions src/assets/scss/components/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,13 @@ $dropdown-modal-backdrop-zindex: $zindex-modal-backdrop !default;
}
}

&.inline .dropdown-menu {
--#{$prefix}dropdown-zindex: 10;
position: relative;
top: 0;
&.inline {
display: inline-block;

.dropdown-menu {
--#{$prefix}dropdown-zindex: 10;
position: relative;
top: 0;
}
}
}
8 changes: 6 additions & 2 deletions src/assets/scss/components/_field.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ $input-field-btn-border-color: $input-border-color !default;
@extend .col;
}

.form-label {
display: block;
}

&.grouped-multiline {
flex-wrap: wrap;

Expand Down Expand Up @@ -105,8 +109,8 @@ $input-field-btn-border-color: $input-border-color !default;
.input-group {
flex-shrink: 0;

// prevent nested componentss
*:not(.dropdown-menu) {
// prevent nested components
> *:not(.dropdown-menu) {
// remove margin
.input,
.select,
Expand Down
9 changes: 8 additions & 1 deletion src/assets/scss/components/_steps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,24 @@ $steps-vertical-padding: 1em 0 !default;
position: relative;
flex-grow: 1;
flex-basis: 1em;
list-style: none;
display: flex;
justify-content: center;

.step-link {
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
text-decoration: none;
background: transparent;
border: transparent;

&.clickable .step-marker {
cursor: pointer;
}
&:not(.clickable) {
cursor: auto;
}
}

.step-marker {
Expand Down
9 changes: 4 additions & 5 deletions src/plugins/bootstrap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export const bootstrapConfig: OrugaOptions = {
autocomplete: {
override: true,
rootClass: "autocomplete-wrapper",
itemClass: "dropdown-item",
itemHoverClass: "active",
itemEmptyClass: "disabled",
itemGroupTitleClass: "fw-bold",
Expand Down Expand Up @@ -72,7 +71,7 @@ export const bootstrapConfig: OrugaOptions = {
},
dropdown: {
override: true,
rootClass: "dropdown btn-group",
rootClass: "dropdown",
triggerClass: "dropdown-trigger",
disabledClass: "disabled",
expandedClass: "expanded",
Expand All @@ -81,7 +80,7 @@ export const bootstrapConfig: OrugaOptions = {
menuClass: "dropdown-menu",
menuPositionClass: "position-",
menuActiveClass: "show",
itemTag: "a",
itemTag: "button",
itemClass: "dropdown-item",
itemActiveClass: "active",
itemClickableClass: "clickable",
Expand All @@ -104,7 +103,7 @@ export const bootstrapConfig: OrugaOptions = {
tableHeadClass: "datepicker-header",
tableHeadCellClass: "datepicker-cell",
tableRowClass: "datepicker-row",
tableCellClass: "datepicker-cell",
tableCellClass: "datepicker-cell focus-ring",
tableCellSelectableClass: "selectable",
tableCellUnselectableClass: "unselectable",
tableCellTodayClass: "today",
Expand Down Expand Up @@ -477,7 +476,7 @@ export const bootstrapConfig: OrugaOptions = {
else if (position === "right") return "justify-content-end";
},
itemWrapperClass: "nav-item",
itemTag: "a",
itemTag: "button",
itemHeaderClass: "nav-link",
itemHeaderActiveClass: () => "active",
itemHeaderDisabledClass: () => "disabled",
Expand Down