Skip to content

Commit 3e7d3d0

Browse files
author
Christopher Werner
committed
Merge remote-tracking branch 'refs/remotes/origin/master'
2 parents cace889 + cfe5323 commit 3e7d3d0

File tree

2 files changed

+90
-8
lines changed

2 files changed

+90
-8
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ static/images/autoeq.app.png
2121
static/images/qudelix-5k-app.png
2222
static/js/bracket-v0.6.2-alpha.js
2323
static/js/bracket-v0.6.4-alpha.js
24-
static/images/Screenshot\ 2025-12-23\ at\ 07-59-46\ 🏆\ Tournament\ for\ Anime\ Pics.png
24+
static/images/Screenshot\ 2025-12-23\ at\ 07-59-46\ 🏆\ Tournament\ for\ Anime\ Pics.png
25+
resources/_gen/

assets/sass/main.sass

Lines changed: 88 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -817,13 +817,21 @@ footer
817817

818818
// Media Queries
819819
820-
@media (max-width: 1920px)
821-
.match-competitor
822-
img
823-
height: 300px
824-
.match-window
825-
width: 46%
820+
//<<<<<<< HEAD
821+
//@media (max-width: 1920px)
822+
// .match-competitor
823+
// img
824+
// height: 300px
825+
// .match-window
826+
// width: 46%
826827
828+
//=======
829+
//<<<<<<< Updated upstream
830+
//@media (max-width: 1920px)
831+
// .match-competitor
832+
// img
833+
// height: 300px
834+
//>>>>>>> refs/remotes/origin/master
827835
828836
// Tablets und kleinere Desktops
829837
@media (max-width: 1200px)
@@ -843,6 +851,79 @@ footer
843851
.match-vs
844852
transform: rotate(90deg)
845853
margin: 20px 0
854+
//=======
855+
// Bessere Ansatz: Setze Standard-Breite direkt in .match-window
856+
// und überschreibe nur für kleinere Bildschirme
857+
858+
// Media Queries für Bracket
859+
860+
// 4K und größer - schmalere Window
861+
@media (min-width: 2560px)
862+
.match-window
863+
width: 33%
864+
865+
// FullHD bis 4K - mittlere Breite
866+
@media (min-width: 1201px) and (max-width: 2559px)
867+
.match-window
868+
width: 46%
869+
.match-competitor
870+
max-width: 266px
871+
padding: 16px
872+
img
873+
width: 100%
874+
height: auto
875+
876+
//@media (max-width: 1200px)
877+
// .bracket
878+
// gap: 60px
879+
//
880+
// .bracket-column
881+
// min-width: 180px
882+
//
883+
// .match-window
884+
// width: 53%
885+
// .match-competitor
886+
// max-width: 236px
887+
// padding: 16px
888+
// img
889+
// width: 100%
890+
// height: auto
891+
892+
//@media (max-width: 2000px)
893+
// .match-window
894+
// width: 46% // oder was auch immer besser aussieht
895+
//
896+
// .bracket
897+
// gap: 40px
898+
//
899+
// .bracket-column
900+
// min-width: 160px
901+
//
902+
// .match-content
903+
// flex-direction: column
904+
//
905+
// .match-vs
906+
// transform: rotate(90deg)
907+
// margin: 20px 0
908+
//
909+
// Tablets und kleinere Desktops
910+
//@media (max-width: 1200px)
911+
// .bracket
912+
// gap: 40px
913+
//
914+
// .bracket-column
915+
// min-width: 160px
916+
//
917+
// .match-content
918+
// flex-direction: column
919+
//
920+
// .match-window
921+
// width: 46%
922+
//
923+
// .match-vs
924+
// transform: rotate(90deg)
925+
// margin: 20px 0
926+
//>>>>>>> Stashed changes
846927
847928
// Tablets
848929
@media (max-width: 768px)
@@ -1247,4 +1328,4 @@ footer
12471328
height: 180px
12481329

12491330
.winner-card img
1250-
height: 200px
1331+
height: 200px

0 commit comments

Comments
 (0)