Skip to content

Commit

Permalink
Merge pull request #19 from WildCodeSchool-2023-09/S6_DEVFIX
Browse files Browse the repository at this point in the history
S6 DEVFIX
  • Loading branch information
Baptiste1828 authored Feb 1, 2024
2 parents 71294a4 + b2f3990 commit 7e5680b
Show file tree
Hide file tree
Showing 53 changed files with 1,011 additions and 896 deletions.
17 changes: 12 additions & 5 deletions assets/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,28 @@ import './bootstrap.js';

// any CSS you import will output into a single css file (app.css in this case)
import './styles/reset.scss';

import './styles/app.scss';
import './styles/desktop.scss';

import './styles/header.scss';
import './styles/navbar.scss';
import './styles/dashboard.scss';
import './styles/adminGameAdd.scss';
import './styles/dashboardAdmin.scss';

import './styles/searchbar.scss';
import './styles/toggle.scss';
import './styles/register.scss';

import './styles/dashboard.scss';

import './styles/game-index.scss';
import './styles/game-show.scss';
import './styles/game-scores.scss';
import './styles/searchbar.scss';
import './styles/game-add.scss';

import './styles/leaderboard.scss';
import './styles/gamePlayed.scss';

import './styles/dashboard-admin.scss';
import './styles/register.scss';

// start the Stimulus application
import './bootstrap';
25 changes: 22 additions & 3 deletions assets/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ table {

// TEXT

h2, h3, h4, h5, h6, span, td, a,
h2, h3, h4, h5, h6, span, td, th, a,
p, ul, label, input, input::placeholder, select, button, img[alt],
.text
{
Expand All @@ -122,17 +122,36 @@ h1, h2, h3, p {
text-align: center;
}

h1 {
h1, h2, h3 {
text-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);

&.neon {
background: $colorGradient4;
-webkit-background-clip: text;
background-clip: text;
}
}

#site-name,
#page-title,
a {
a, a h2, a h3,
label {
&:hover {
background: $colorGradient4;
-webkit-background-clip: text;
background-clip: text;

transform: scale(102%);
}

transition: ease-in-out 100ms;
}

button {
transition: ease-in-out 100ms;

&:hover {
transform: scale(102%);
}
}

Expand Down
61 changes: 61 additions & 0 deletions assets/styles/dashboard-admin.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
@import "_variables";

#dashboard {
.cell-played-admin {
.content {

.nav-admin {
display: flex;
flex-direction: column;

a {
text-align: center;
border: 2px solid #06CCF8;
border-radius: $borderRadiusLarge;
background: $colorGradient1;

min-width: 95%;
margin: 0 10px 10px;
padding: 10px 14px;
}

h1 {
font-size: 2rem;
color: #fff;
}

h1, img {
padding-left: 20px;
}
}
}
}
}

//

@media screen and (min-width: $desktopWidth) {

#dashboard {
.cell-played-admin {
grid-area: 1 / 1 / 4 / 9;

.content {

.nav-admin {
flex-direction: row;
gap: 1rem;
flex-wrap: wrap;
margin-top: 10rem;

a {
display: flex;
padding: 10px;
min-width: 150px;
min-height: 50px;
}
}
}
}
}
}
184 changes: 0 additions & 184 deletions assets/styles/dashboardAdmin.scss

This file was deleted.

21 changes: 21 additions & 0 deletions assets/styles/desktop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,15 @@
.full-size {
width: 1240px;
height: 820px;

h2:first-of-type {
font-size: 2rem;
margin: .5rem 0 1rem;
}

.container {
height: calc(100% - 4rem);
}
}

.small-card {
Expand Down Expand Up @@ -99,6 +108,12 @@
flex-direction: column;
justify-content: center;
gap: 1rem;

transition: ease-in-out 150ms;

&:hover {
transform: scale(105%);
}
}

.slider-btn {
Expand All @@ -108,6 +123,12 @@
width: 24px;
height: 24px;
cursor: pointer;

transition: ease-in-out 100ms;

&:hover {
transform: scale(115%);
}
}

.current-slide {
Expand Down
Loading

0 comments on commit 7e5680b

Please sign in to comment.