Skip to content

Commit

Permalink
Merge pull request #91 from HE-Arc/simon-plumey-65-refactor-css-and-r…
Browse files Browse the repository at this point in the history
…esponsive

Simon plumey 65 refactor css and responsive
  • Loading branch information
Krucksy authored Dec 15, 2023
2 parents 620e246 + cfa9e16 commit da17531
Show file tree
Hide file tree
Showing 10 changed files with 140 additions and 98 deletions.
Binary file modified public/favicon.ico
Binary file not shown.
183 changes: 106 additions & 77 deletions resources/css/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ body {

#bg-bricks {
background: url("../../public/img/bricks.png"), $background;
background-size: 100%;
background-size: 300%;
position: absolute;
top: 0;
right: 0;
Expand Down Expand Up @@ -52,6 +52,11 @@ h5 {
font-size: 1.2rem;
}

.instructions {
text-align: center;
margin-bottom: 1rem;
}

h2 {
margin-top: 2.5rem;
margin-bottom: 1.25rem;
Expand All @@ -60,33 +65,44 @@ h2 {

.neon-text-effect-magenta {
color: white;
-webkit-text-stroke: 1px;
-webkit-text-stroke: 0px;
-webkit-text-stroke-color: $magenta;
text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $magenta, 0 0 20px $magenta, 0 0 30px $magenta, 0 0 40px $magenta, 0 0 70px $magenta, 0 0 80px $magenta, 0 0 100px $magenta, 0 0 150px $magenta;

text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $magenta, 0 0 20px $magenta, 0 0 30px $magenta, 0 0 40px $magenta, 0 0 70px $magenta, 0 0 80px $magenta;
}

.neon-text-effect-cyan {
color: white;
-webkit-text-stroke: 1px;
-webkit-text-stroke: 0px;
-webkit-text-stroke-color: $cyan;
text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $cyan, 0 0 20px $cyan, 0 0 30px $cyan, 0 0 40px $cyan;
}

.neon-effect-cyan {
background: none;
border: 7px solid cyan;
border: 7px solid $cyan;
outline: 3px solid white;
outline-offset: -5px;
box-shadow: 0 .3rem 2px rgba(0, 0, 0, .5), 0 0 10px $cyan, 0 0 10px $cyan, 0 0 10px $cyan, inset 0 0 10px $cyan, inset 0 0 10px $cyan, inset 0 0 10px $cyan;
}

.neon-effect-cyan-off {
background: none;
border: 7px solid cyan;
outline: 2px solid rgb(0, 0, 0);
border: 7px solid $cyan-off;
outline-offset: -5px;
box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
color: white;

&::placeholder {
color: white;
}

&:active {
@extend .neon-effect-cyan;
}

&:focus {
@extend .neon-effect-cyan;
}
}

.neon-effect-magenta {
Expand All @@ -101,39 +117,42 @@ h2 {
border-radius: 2.5rem;
}

.btn
{
padding : 0.75rem 1.25rem;
.btn {
padding: 0.75rem 1.25rem;
border-radius: 2.5rem;
outline: 2px solid white;
outline-offset: -3px;
transition: all .3s ease-in-out;
background: none;
}
.btn-cyan
{

.btn-cyan {
border: 4px solid cyan;
box-shadow: 0 .3rem 2px rgba(0, 0, 0, .5), 0 0 10px $cyan, 0 0 10px $cyan, 0 0 10px $cyan, inset 0 0 10px $cyan, inset 0 0 10px $cyan, inset 0 0 10px $cyan;
&:hover{

&:hover {
cursor: pointer;
background-color: $cyan;
color: $cyan-off;
color: $background;
}
}
.btn-magenta
{

.btn-magenta {
border: 4px solid $magenta;
box-shadow: 0 .3rem 2px rgba(0, 0, 0, .5), 0 0 10px $magenta, 0 0 10px $magenta, 0 0 10px $magenta, inset 0 0 10px $magenta, inset 0 0 10px $magenta, inset 0 0 10px $magenta;
&:hover{

&:hover {
cursor: pointer;
background-color: $magenta;
color: $magenta-off;
color: $background;
}
}

header {
display: flex;
justify-content: center;
align-items: center;
margin-top: 4rem;

.header-container {
display: flex;
Expand All @@ -148,13 +167,14 @@ header {

#main-title {
font-family: $neon-font;
font-size: 7.75rem;
font-size: 3rem;
text-align: center;
}

#subtitle {
font-family: $secondary-neon-font;
font-size: 1.75rem;
font-size: 0.65rem;
display: none;
position: absolute;
right: 0;
bottom: 0;
Expand Down Expand Up @@ -200,8 +220,8 @@ header {
-webkit-text-stroke-color: $magenta;
text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $magenta, 0 0 20px $magenta, 0 0 30px $magenta, 0 0 40px $magenta, 0 0 70px $magenta, 0 0 80px $magenta, 0 0 100px $magenta, 0 0 150px $magenta;
}
&.closeNavBtn
{

&.closeNavBtn {
font-size: 2.5rem;
}
}
Expand All @@ -217,6 +237,7 @@ header {
cursor: pointer;
}
}

.icon-burger {
div {
width: 30px;
Expand Down Expand Up @@ -245,21 +266,16 @@ header {
.vue-container {
margin-top: 1.5rem;
margin-bottom: 3.125rem;

.instructions {
text-align: center;
margin-bottom: 1rem;
}
}

/**************************/
/***** SUCCESS *****/
/**************************/
.success-container {
.nb-tries
{
.nb-tries {
margin-top: 1rem;
}

margin-bottom: 3.125rem;

.music-container {
Expand All @@ -285,8 +301,8 @@ header {
background-color: $background;
}
}
.button-container
{

.button-container {
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -300,11 +316,12 @@ header {
/**************************/

.stats-container {
.stats{
.stats {
padding: 1.5rem 1.75rem;
display: grid;
grid-template-columns: 3fr 2fr;
row-gap: 1rem;

span:nth-child(even) {
text-align: right;
}
Expand All @@ -315,20 +332,74 @@ header {
/***** MEDIA QUERIES *****/
/**************************/
@media (min-width: 576px) {
#bg-bricks {
background-size: 200%;
}
header {
margin-top: 0;
.title-container {
#main-title {
font-size: 5rem;
}

#subtitle {
display: inline;
font-size: 1.125rem;
}
}
}

.container {
max-width: 540px;
}

.small-container {
max-width: 420px;
}

.neon-text-effect-magenta {
-webkit-text-stroke: 0px;
-webkit-text-stroke-color: $magenta;
text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $magenta, 0 0 20px $magenta, 0 0 30px $magenta, 0 0 40px $magenta, 0 0 70px $magenta, 0 0 80px $magenta;
}

.neon-text-effect-cyan {
-webkit-text-stroke: 0px;
-webkit-text-stroke-color: $cyan;
text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $cyan, 0 0 20px $cyan, 0 0 30px $cyan, 0 0 40px $cyan;
}
}

@media (min-width: 768px) {
#bg-bricks {
background-size: 100%;
}
header .title-container {
#main-title {
font-size: 7.75rem;
}

#subtitle {
font-size: 1.75rem;
}
}

.container {
max-width: 720px;
}

.neon-text-effect-magenta {
-webkit-text-stroke: 1px;
-webkit-text-stroke-color: $magenta;
text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $magenta, 0 0 20px $magenta, 0 0 30px $magenta, 0 0 40px $magenta, 0 0 70px $magenta, 0 0 80px $magenta, 0 0 100px $magenta, 0 0 150px $magenta;
}

.neon-text-effect-cyan {
-webkit-text-stroke: 1px;
-webkit-text-stroke-color: $cyan;
text-shadow: 0 .4rem 3px rgba(0, 0, 0, .5), 0 0 10px $cyan, 0 0 20px $cyan, 0 0 30px $cyan, 0 0 40px $cyan;
}

}


Expand Down Expand Up @@ -372,48 +443,6 @@ header {
/**************************/
/******* Component *******/
/**************************/
// TODO duplication ?
.neon-effect-cyan {
background: none;
border: 7px solid cyan;
outline: 3px solid white;
outline-offset: -5px;
box-shadow: 0 .3rem 2px rgba(0, 0, 0, .5), 0 0 10px cyan, 0 0 10px cyan, 0 0 10px cyan, inset 0 0 10px cyan, inset 0 0 10px cyan, inset 0 0 10px cyan;
}

.neon-effect-magenta {
background: none;
border: 7px solid magenta;
outline: 3px solid white;
outline-offset: -5px;
box-shadow: 0 .3rem 2px rgba(0, 0, 0, .5), 0 0 10px magenta, 0 0 10px magenta, 0 0 10px magenta, inset 0 0 10px magenta, inset 0 0 10px magenta, inset 0 0 10px magenta;
}

.rounded-input {
border-radius: 20px;
padding: 8px 12px;
background-color: transparent;
color: #ffffff;

// Style par défaut
@extend .neon-effect-cyan-off;

// Style pour l'état :active
&:active {
@extend .neon-effect-cyan;
}

// Style pour l'état :focus
&:focus {
@extend .neon-effect-cyan;
}

// Style pour l'état :hover
&:hover {
@extend .neon-effect-cyan;
}
}


.tamerecestautrechose {
position: relative;
Expand All @@ -423,7 +452,8 @@ header {
position: relative;
z-index: 1;
border: 7px solid cyan;
border-radius: 20px; /* Ajustez la valeur selon vos préférences */
border-radius: 20px;
/* Ajustez la valeur selon vos préférences */
padding: 8px 12px;
background: none;
color: #4a5568;
Expand All @@ -437,4 +467,3 @@ header {
}
}
}

2 changes: 1 addition & 1 deletion resources/css/variables.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$magenta: #FA00FF;
$magenta-off: #550B5E;
$cyan: #00D1FF;
$cyan-off: #0B5E5E;
$cyan-off: #125e87;
$background: #05010B;


Expand Down
15 changes: 14 additions & 1 deletion resources/js/components/comparaison.vue
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ watch(data, (proxyObject) => {
}
.criterions {
display: flex;
display: grid;
grid-template-columns: 1fr;
justify-content: space-between;
align-items: center;
margin-top: 20px;
Expand All @@ -363,4 +364,16 @@ watch(data, (proxyObject) => {
justify-content: center;
margin-top: 40px;
}
@media (min-width: 576px) {
.criterions
{
grid-template-columns: repeat(3, 1fr);
}
}
@media (min-width: 768px) {
.criterions
{
grid-template-columns: repeat(5, 1fr);
}
}
</style>
2 changes: 1 addition & 1 deletion resources/js/components/search-bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function sendProposition(songId) {
<path fill="white"
d="M 21 3 C 11.601563 3 4 10.601563 4 20 C 4 29.398438 11.601563 37 21 37 C 24.355469 37 27.460938 36.015625 30.09375 34.34375 L 42.375 46.625 L 46.625 42.375 L 34.5 30.28125 C 36.679688 27.421875 38 23.878906 38 20 C 38 10.601563 30.398438 3 21 3 Z M 21 7 C 28.199219 7 34 12.800781 34 20 C 34 27.199219 28.199219 33 21 33 C 13.800781 33 8 27.199219 8 20 C 8 12.800781 13.800781 7 21 7 Z" />
</svg>
<input v-model="userInput" id="search-bar" @input="getSongs(userInput)" v-on:keyup.enter="songs.length > 0 ? sendProposition(songs[0].id):null" class="neon-effect-cyan" type="text"
<input v-model="userInput" id="search-bar" @input="getSongs(userInput)" v-on:keyup.enter="songs.length > 0 ? sendProposition(songs[0].id):null" class="neon-effect-cyan-off" type="text"
placeholder="Taper le nom d'une musique">
<ul class="propositions-list">
<li v-for="song in songs" @click="sendProposition(song.id)">"{{ song.track_name }}" de {{ song.artist_name }},
Expand Down
Loading

0 comments on commit da17531

Please sign in to comment.