Resolution merge conflicts

This commit is contained in:
2026-03-31 11:32:40 +02:00
committed by M1n-0
parent 4d1ed00f03
commit 63c4244e92
2 changed files with 150 additions and 15 deletions

View File

@@ -17,6 +17,7 @@ body {
align-items: center;
justify-content: center;
font-family: 'Arial', sans-serif;
user-select: none;
}
main {
@@ -28,6 +29,36 @@ main {
border-radius: 10px;
min-width: fit-content;
flex-shrink: 0;
gap: 16px;
}
.game-layout {
width: min(95vw, 1000px);
}
.toolbox {
width: 100%;
background: #dfe5f8;
border-radius: 10px;
padding: 14px;
display: flex;
flex-direction: column;
gap: 10px;
}
.toolbox h2 {
font-size: 1rem;
}
.toolbox p {
font-size: 0.9rem;
color: #334;
}
.glass-palette {
display: flex;
gap: 10px;
flex-wrap: wrap;
}
/* ================================
@@ -63,6 +94,12 @@ main {
margin: 0;
position: relative;
background-color: #2a2a2a;
user-select: none;
overflow: hidden;
}
.cell.can-drop {
outline: 2px dashed rgba(0, 0, 0, 0.2);
}
/* ================================
@@ -71,7 +108,6 @@ main {
.empty {
background-color: #DADEEF;
border-color: #DADEEF;
}
.empty:hover {
@@ -118,6 +154,10 @@ main {
background-position: center;
}
.door-open {
opacity: 0.5;
}
.button {
background-color: #DADEEF;
background-image: url("../img/tiles/ButtonComplete.svg"), url("../img/tiles/Tuile.svg");
@@ -126,6 +166,10 @@ main {
background-position: center;
}
.button-active {
opacity: 0.7;
}
.demi-wall {
background-color: #DADEEF;
background-image: url("../img/tiles/VerticaleSemi.svg");
@@ -174,7 +218,6 @@ main {
background-position: center;
}
/* ================================
LIGHT LASER
================================ */
@@ -221,6 +264,16 @@ main {
object-fit: contain;
}
.button-door {
background: none;
border: none;
cursor: pointer;
width: 100%;
height: 100%;
position: absolute;
inset: 0;
}
/* ================================
RESPONSIVE
================================ */