Merge branch 'feature/cedric' of https://devops.dsp-archiwebo21-ad-ec-cb-mt.fr:8080/cedric/The_Tip_Top into develop
This commit is contained in:
commit
cce6fa777d
8 files changed
+7809
-118
No files matched your search
@@ -3,8 +3,9 @@
|
||||
/* margin-top:auto; */
|
||||
width:100%;
|
||||
display: table-footer-group;
|
||||
}
|
||||
|
||||
.footerContent{
|
||||
background-color: #006600e6;
|
||||
}
|
||||
|
||||
/* .footerContent{
|
||||
background-color: #006600e6;
|
||||
} */
|
||||
+30
-1
@@ -91,7 +91,10 @@
|
||||
}
|
||||
|
||||
@keyframes blinking {
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
0%,
|
||||
50%,
|
||||
100% {
|
||||
@@ -112,12 +115,20 @@
|
||||
display: block;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
.aButton {
|
||||
position: relative;
|
||||
z-index: 9992;
|
||||
}
|
||||
|
||||
.aButton:after {
|
||||
=======
|
||||
.masthead .aButton {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.masthead .aButton:after {
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
content: "";
|
||||
position: absolute;
|
||||
|
||||
@@ -131,12 +142,19 @@
|
||||
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));
|
||||
@@ -170,10 +188,14 @@
|
||||
}
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
.feuilleGauche,
|
||||
.feuilleDroite,
|
||||
.cadeau,
|
||||
.jeuConcours {
|
||||
=======
|
||||
.feuilleGauche, .feuilleDroite, .cadeau, .jeuConcours {
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
@@ -246,6 +268,7 @@
|
||||
bottom: -20px;
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
@keyframes inAnimation {
|
||||
0% {
|
||||
@@ -270,6 +293,8 @@
|
||||
}
|
||||
}
|
||||
|
||||
=======
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
/* @keyframes moveLeftRight {
|
||||
0%,
|
||||
100% {
|
||||
@@ -278,4 +303,8 @@
|
||||
50% {
|
||||
right: 0;
|
||||
}
|
||||
} */
|
||||
<<<<<<< HEAD
|
||||
} */
|
||||
=======
|
||||
} */
|
||||
>>>>>>> e3ede7484e3484cf4585da285d221d44f9b9e437
|
||||
Reference in new issue
Block a user