fix - noms produits
This commit is contained in:
1 parent
cce6fa777d
commit
3d8f792d7e
12 files changed
+18
-136
No files matched your search
@@ -91,10 +91,6 @@
|
||||
}
|
||||
|
||||
@keyframes blinking {
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
0%,
|
||||
50%,
|
||||
100% {
|
||||
@@ -115,20 +111,12 @@
|
||||
display: block;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.aButton {
|
||||
position: relative;
|
||||
z-index: 9992;
|
||||
}
|
||||
|
||||
.aButton:after {
|
||||
=======
|
||||
.masthead .aButton {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.masthead .aButton:after {
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
content: "";
|
||||
position: absolute;
|
||||
|
||||
@@ -142,19 +130,11 @@
|
||||
height: calc(100% + var(--aButton-base-padding));
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.aButton:hover:after {
|
||||
=======
|
||||
.masthead .aButton:hover:after {
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
display: block;
|
||||
animation: 0.7s linear infinite alternate expand;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
@keyframes expand {
|
||||
to {
|
||||
left: calc(var(--aButton-base-padding) - var(--aButton-grow-padding));
|
||||
@@ -188,14 +168,10 @@
|
||||
}
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
.feuilleGauche,
|
||||
.feuilleDroite,
|
||||
.cadeau,
|
||||
.jeuConcours {
|
||||
=======
|
||||
.feuilleGauche, .feuilleDroite, .cadeau, .jeuConcours {
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
@@ -268,7 +244,6 @@
|
||||
bottom: -20px;
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
@keyframes inAnimation {
|
||||
0% {
|
||||
@@ -293,8 +268,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
/* @keyframes moveLeftRight {
|
||||
0%,
|
||||
100% {
|
||||
@@ -303,8 +276,4 @@
|
||||
50% {
|
||||
right: 0;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
} */
|
||||
=======
|
||||
} */
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
Reference in new issue
Block a user