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

feat: update to oruga v0.10.0 #90

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
},
"devDependencies": {
"@eslint/compat": "^1.2.7",
"@oruga-ui/examples": "0.9.3",
"@oruga-ui/oruga-next": "0.9.3",
"@oruga-ui/examples": "0.10.0-pre.3",
"@oruga-ui/oruga-next": "0.10.0-pre.3",
"@vitejs/plugin-vue": "5.2.1",
"@vue/eslint-config-prettier": "^10.2.0",
"@vue/eslint-config-typescript": "^14.5.0",
Expand Down
6 changes: 3 additions & 3 deletions src/assets/scss/components/_autocomplete.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
$autocomplete-item-hover-background-color: #f5f5f5 !default;
/* @docs */

.o-acp {
.o-autocomplete {
&__item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;

&-group-title,
&--empty {
@extend .o-drop--disabled;
@extend .o-dropdown--disabled;
}

&--hover {
&--focused {
background-color: var(
--#{$prefix}autocomplete-item-hover-background-color,
$autocomplete-item-hover-background-color
Expand Down
6 changes: 3 additions & 3 deletions src/assets/scss/components/_button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ $button-outlined-border-color: var(--#{$prefix}grey-light) !default;
}
}

.o-btn {
.o-button {
@include unselectable;

position: relative;
display: inline-flex;
cursor: pointer;
Expand All @@ -42,8 +44,6 @@ $button-outlined-border-color: var(--#{$prefix}grey-light) !default;
justify-content: center;
vertical-align: top;
text-decoration: none;

@include unselectable;
-moz-appearance: none;
-webkit-appearance: none;

Expand Down
47 changes: 33 additions & 14 deletions src/assets/scss/components/_carousel.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ $carousel-arrow-border-radius: var(
$carousel-arrow-border: 1px solid $carousel-arrow-background !default;
$carousel-arrow-transition: var(--#{$prefix}transition-duration)
var(--#{$prefix}transition-timing) !default;
$carousel-autoplay-top: 1em !default;
$carousel-autoplay-left: $carousel-arrow-icon-spaced !default;
$carousel-autoplay-right: unset !default;
$carousel-autoplay-bottom: unset !default;
$carousel-indicators-background: rgba(var(--#{$prefix}white), 0.5) !default;
$carousel-indicators-padding: 0.5rem !default;
$carousel-indicator-margin: 0 0.5rem 0 0 !default;
Expand All @@ -33,13 +37,15 @@ $carousel-overlay-background: hsla(0, 0%, 4%, 0.86) !default;
$carousel-overlay-zindex: 40 !default;
/* @docs */

.o-car {
.o-carousel {
@include unselectable;

position: relative;
overflow: hidden;
width: 100%;

&__overlay {
position: fixed;
bottom: 0;
left: 0;
right: 0;
Expand All @@ -49,7 +55,6 @@ $carousel-overlay-zindex: 40 !default;
justify-content: center;
display: flex;
max-height: 100vh;
position: fixed;

background-color: var(
--#{$prefix}carousel-overlay-background,
Expand Down Expand Up @@ -104,14 +109,14 @@ $carousel-overlay-zindex: 40 !default;

&--inside {
position: absolute;
}

&--bottom {
bottom: 0;
}
&--bottom {
bottom: 0;
}

&--top {
top: 0;
}
&--top {
top: 0;
}
}

Expand Down Expand Up @@ -190,7 +195,7 @@ $carousel-overlay-zindex: 40 !default;
}
}

&__arrow__icon {
&__icon {
cursor: pointer;
background: var(
--#{$prefix}carousel-arrow-background,
Expand All @@ -208,26 +213,40 @@ $carousel-overlay-zindex: 40 !default;
--#{$prefix}carousel-arrow-transition,
$carousel-arrow-transition
);
z-index: 1;
}

&__arrow__icon-prev,
&__arrow__icon-next {
&__icon-autoplay {
position: absolute;
top: var(--#{$prefix}carousel-autoplay-top, $carousel-autoplay-top);
left: var(--#{$prefix}carousel-autoplay-left, $carousel-autoplay-left);
right: var(
--#{$prefix}carousel-autoplay-right,
$carousel-autoplay-right
);
bottom: var(
--#{$prefix}carousel-autoplay-bottom,
$carousel-autoplay-bottom
);
}

&__icon-prev,
&__icon-next {
position: absolute;
top: var(--#{$prefix}carousel-arrow-top, $carousel-arrow-top);
transform: translateY(
var(--#{$prefix}carousel-arrow-top, -$carousel-arrow-top)
);
z-index: 1;
}

&__arrow__icon-prev {
&__icon-prev {
left: var(
--#{$prefix}carousel-arrow-icon-spaced,
$carousel-arrow-icon-spaced
);
}

&__arrow__icon-next {
&__icon-next {
right: var(
--#{$prefix}carousel-arrow-icon-spaced,
$carousel-arrow-icon-spaced
Expand Down
33 changes: 19 additions & 14 deletions src/assets/scss/components/_checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ $checkbox-line-height: 1.5 !default;
@return svg-encode("#{$start}#{$content}#{$end}");
}

.o-chk {
.o-checkbox {
@include unselectable;

display: inline-flex;
align-items: center;
cursor: pointer;
Expand Down Expand Up @@ -92,7 +93,7 @@ $checkbox-line-height: 1.5 !default;
$checkbox-border-style
);

&--checked {
&:checked {
background-color: var(
--#{$prefix}checkbox-active-background-color,
$checkbox-active-background-color
Expand All @@ -104,7 +105,7 @@ $checkbox-line-height: 1.5 !default;
background-image: url(svg_checkmark($checkbox-checkmark-color));
}

&--indeterminate {
&:indeterminate {
background-color: var(
--#{$prefix}checkbox-active-background-color,
$checkbox-active-background-color
Expand Down Expand Up @@ -136,7 +137,7 @@ $checkbox-line-height: 1.5 !default;
&--#{$name} {
font-size: var(--#{$prefix}checkbox-font-size-#{$name}, $value);

.o-chk__input {
.o-checkbox__input {
width: var(--#{$prefix}checkbox-font-size-#{$name}, $value);
height: var(--#{$prefix}checkbox-font-size-#{$name}, $value);
}
Expand All @@ -151,24 +152,28 @@ $checkbox-line-height: 1.5 !default;
&--#{$name} {
--#{$prefix}focus: #{createFocus($color)};

.o-chk__input {
.o-checkbox__input {
border-color: var(--#{$prefix}variant-#{$name}, $color);
background-color: var(--#{$prefix}variant-#{$name}, $color);
}

.o-chk__input--checked {
background-image: url(svg_checkmark($color-invert));
}
&:checked {
background-image: url(svg_checkmark($color-invert));
}

.o-chk__input--indeterminate {
background-image: url(svg_indeterminate($color-invert));
&:indeterminate {
background-image: url(svg_indeterminate($color-invert));
}
}
}
}

// focus effect
&:focus &__input,
&:focus-within &__input {
box-shadow: 0 0 0 0.25rem var(--#{$prefix}focus);
&:focus,
&:focus-visible,
&:focus-within {
.o-checkbox__input {
box-shadow: 0 0 0 0.25rem var(--#{$prefix}focus);
outline: none;
}
}
}
8 changes: 5 additions & 3 deletions src/assets/scss/components/_collapse.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
/* @docs */
/* @docs */

.o-clps {
width: 100%;

.o-collapse {
&__trigger {
cursor: pointer;
display: inline-block;

&--expanded {
width: 100%;
}
}

&__content {
Expand Down
Loading