Skip to content

Commit

Permalink
Merge branch 'master' into LightningCSS-Migration
Browse files Browse the repository at this point in the history
  • Loading branch information
Woedenaz committed Jan 7, 2024
2 parents 173f1fb + a125b23 commit 3737a79
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"prettier": "^3.0.0",
"stylelint": "^16.0.2",
"stylelint-config-property-sort-order-smacss": "^10.0.0",
"stylelint-config-standard": "^35.0.0",
"stylelint-config-standard": "^36.0.0",
"svgo": "^3.0.2"
},
"scripts": {
Expand Down
7 changes: 4 additions & 3 deletions src/css/parts/elements.css
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ a.math-equation-error {
z-index: 100;
width: fit-content !important; /* Overwriting JS-injected inline styling */
max-width: calc(var(--body-width-on-desktop) - 2rem);
animation: fade-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards;
animation: bhl-fade-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards;
border: none !important; /* Overwriting JS-injected inline styling */
opacity: 0;
background-color: rgb(var(--hoverblock-bg)) !important; /* Overwriting JS-injected inline styling */
Expand All @@ -400,7 +400,7 @@ a.math-equation-error {
height: 100%;
margin: 0;
padding: 0;
animation: lift-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards, slide-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards;
animation: bhl-lift-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards, bhl-slide-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards;
background-color: transparent;
box-shadow: 0 0 0 0 rgba(var(--swatch-alternate-color), 0.25), inset 0 0 0 0.0625rem rgb(var(--swatch-primary-darkest));
}
Expand All @@ -412,7 +412,7 @@ a.math-equation-error {
margin: 0;
padding: 0.25em 0.5em;
translate: 0 0;
animation: slide-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards;
animation: bhl-slide-in 0.2s var(--ease-in-out) 0.1s 1 alternate forwards;
font-family: var(--UI-font);
font-size: 0.9em;

Expand Down Expand Up @@ -469,6 +469,7 @@ a.math-equation-error {
flex-flow: column nowrap;
align-items: center;
min-width: 30%;
max-width: 100%;
gap:0.0625rem;

&,
Expand Down
10 changes: 5 additions & 5 deletions src/css/parts/root.css
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@
--ease-in-out: cubic-bezier(0.4, 0, 0.2, 1);
}

@keyframes fade-in {
@keyframes bhl-fade-in {
from {
opacity: 0;
}
Expand All @@ -713,7 +713,7 @@
}
}

@keyframes slide-in {
@keyframes bhl-slide-in {
from {
translate: 1rem 1rem;
}
Expand All @@ -725,7 +725,7 @@


@supports not (translate: 1rem 1rem) {
@keyframes slide-in {
@keyframes bhl-slide-in {
from {
transform: translate(1rem, 1rem);
}
Expand All @@ -736,7 +736,7 @@
}
}

@keyframes slide-down {
@keyframes bhl-slide-down {
from {
max-height: 0;
}
Expand All @@ -746,7 +746,7 @@
}
}

@keyframes lift-in {
@keyframes bhl-lift-in {
from {
box-shadow: 0 0 0 0 rgba(var(--swatch-alternate-color), 0.25), inset 0 0 0 0.0625rem rgb(var(--swatch-primary-darkest));
}
Expand Down
6 changes: 3 additions & 3 deletions src/css/parts/wikidot-structure.css
Original file line number Diff line number Diff line change
Expand Up @@ -3863,7 +3863,7 @@ div.odialog-shader-iframe {
height: 1.5rem;
margin: -0.9rem auto;
margin-top: 0.6rem;
animation: loading 1.2s linear infinite;
animation: bhl-loading 1.2s linear infinite;
border-top: 0.3rem solid rgb(var(--modal-header-stripe));
border-right: 0.3rem solid transparent;
border-bottom: 0.3rem solid rgb(var(--modal-header-stripe));
Expand Down Expand Up @@ -4257,7 +4257,7 @@ div.odialog-shader-iframe {
}
}

@keyframes loading {
@keyframes bhl-loading {
0% {
rotate: 0deg;
}
Expand All @@ -4268,7 +4268,7 @@ div.odialog-shader-iframe {
}

@supports not (rotate: 0) {
@keyframes loading {
@keyframes bhl-loading {
0% {
transform: rotate(0deg);
}
Expand Down

0 comments on commit 3737a79

Please sign in to comment.