From 6e473efca8c79426d6fb4c5362a001df7e7c528d Mon Sep 17 00:00:00 2001 From: MisoSquared <qusawyer@proton.me> Date: Sat, 4 May 2024 23:24:57 +0000 Subject: [PATCH 1/6] Added wardrobeOutfit block style --- modules/css/base.css | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/css/base.css b/modules/css/base.css index 9b4b068ca4..0b54ad7eff 100644 --- a/modules/css/base.css +++ b/modules/css/base.css @@ -1664,6 +1664,16 @@ body.has-images #storyCaptionContent { overflow: hidden; } +.wardrobeOutfit { + text-overflow: ellipsis; + overflow: hidden; + text-align: center; + padding: 2px; + border: solid 1px var(--300); + width: 23%; + margin: 0 3px 3px; +} + #wardrobeLinks .selected, #bodywritingMenuLinks .selected a { color: var(--yellow); -- GitLab From 856efb87989f547a58d4b8be5d1181bff63ad488 Mon Sep 17 00:00:00 2001 From: MisoSquared <qusawyer@proton.me> Date: Sat, 4 May 2024 23:27:04 +0000 Subject: [PATCH 2/6] Changed outfit listing to use wadrobeOutfit block styling --- game/base-clothing/clothing-sets.twee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/game/base-clothing/clothing-sets.twee b/game/base-clothing/clothing-sets.twee index a78b20db2f..eb57aef9c9 100644 --- a/game/base-clothing/clothing-sets.twee +++ b/game/base-clothing/clothing-sets.twee @@ -21,8 +21,8 @@ <</if>> <<set _outfitname to $_outfit.name + ($_outfit.colors is false ? "" : " [C]") + ($_outfit.location is undefined ? "" : " [L]")>> <<capture _index>> - <div class = "wardrobe-action"> - <<link _outfitname>><<set $wear_outfit to _index>><<updatewardrobe "outfits">><</link>> | + <div class= "wardrobeOutfit wardrobe-action no-numberify"> + <<link _outfitname>><<set $wear_outfit to _index>><<updatewardrobe "outfits">><</link>> </div> <</capture>> <</for>> -- GitLab From bc9082f9a8c90dc643b063085a9761a2fb842b09 Mon Sep 17 00:00:00 2001 From: MisoSquared <qusawyer@proton.me> Date: Sat, 4 May 2024 23:35:36 +0000 Subject: [PATCH 3/6] Update clothing-sets.twee --- game/base-clothing/clothing-sets.twee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/game/base-clothing/clothing-sets.twee b/game/base-clothing/clothing-sets.twee index eb57aef9c9..329733adfd 100644 --- a/game/base-clothing/clothing-sets.twee +++ b/game/base-clothing/clothing-sets.twee @@ -12,7 +12,7 @@ <label><<radiobutton "$delete_outfit" "none" checked>> Wear</label> | <label><<radiobutton "$delete_outfit" 1>> Delete</label> | <label><<radiobutton "$delete_outfit" 2>> Overwrite with current clothing</label> - <br> + <br><br> <!-- List the currently saved outfits --> <<for _index, $_outfit range $outfit>> -- GitLab From b56c0fa2e817da3440b8d023ecc0426276e314f3 Mon Sep 17 00:00:00 2001 From: MisoSquared <qusawyer@proton.me> Date: Tue, 7 May 2024 01:00:11 +0000 Subject: [PATCH 4/6] New outfitContainer to wrap wadrobeOutfit --- modules/css/base.css | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/modules/css/base.css b/modules/css/base.css index 0b54ad7eff..2651c8a493 100644 --- a/modules/css/base.css +++ b/modules/css/base.css @@ -1652,16 +1652,10 @@ body.has-images #storyCaptionContent { margin: 0 3px 3px; } -#wardrobeItemDetails { - display: block; - padding: 2px; - border: solid 1px var(--300); - height: 100%; - width: 90%; - min-width: 400px; - margin: 0 30px 9px; - /* white-space: nowrap; */ - overflow: hidden; +.outfitContainer { + display: flex; + flex-wrap: wrap; + flex-direction: row; } .wardrobeOutfit { @@ -1674,6 +1668,18 @@ body.has-images #storyCaptionContent { margin: 0 3px 3px; } +#wardrobeItemDetails { + display: block; + padding: 2px; + border: solid 1px var(--300); + height: 100%; + width: 90%; + min-width: 400px; + margin: 0 30px 9px; + /* white-space: nowrap; */ + overflow: hidden; +} + #wardrobeLinks .selected, #bodywritingMenuLinks .selected a { color: var(--yellow); -- GitLab From fc6dcb650b1f8b2096343905e7d96eaea6867d70 Mon Sep 17 00:00:00 2001 From: MisoSquared <qusawyer@proton.me> Date: Tue, 7 May 2024 01:04:30 +0000 Subject: [PATCH 5/6] Added outfitContainer to support flexbox styling --- game/base-clothing/clothing-sets.twee | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/game/base-clothing/clothing-sets.twee b/game/base-clothing/clothing-sets.twee index 329733adfd..4c076eb220 100644 --- a/game/base-clothing/clothing-sets.twee +++ b/game/base-clothing/clothing-sets.twee @@ -15,17 +15,19 @@ <br><br> <!-- List the currently saved outfits --> - <<for _index, $_outfit range $outfit>> - <<if $_outfit.location and $_outfit.location isnot $wardrobe_location>> - <<continue>> - <</if>> - <<set _outfitname to $_outfit.name + ($_outfit.colors is false ? "" : " [C]") + ($_outfit.location is undefined ? "" : " [L]")>> - <<capture _index>> - <div class= "wardrobeOutfit wardrobe-action no-numberify"> - <<link _outfitname>><<set $wear_outfit to _index>><<updatewardrobe "outfits">><</link>> - </div> - <</capture>> - <</for>> + <div class="outfitContainer"> + <<for _index, $_outfit range $outfit>> + <<if $_outfit.location and $_outfit.location isnot $wardrobe_location>> + <<continue>> + <</if>> + <<set _outfitname to $_outfit.name + ($_outfit.colors is false ? "" : " [C]") + ($_outfit.location is undefined ? "" : " [L]")>> + <<capture _index>> + <div class= "wardrobeOutfit wardrobe-action no-numberify"> + <<link _outfitname>><<set $wear_outfit to _index>><<updatewardrobe "outfits">><</link>> + </div> + <</capture>> + <</for>> + </div> <</widget>> <<widget "listoutfitsPassage">> -- GitLab From 53cc5b3df07963237b4dbaeb842e94f657f1caaf Mon Sep 17 00:00:00 2001 From: MisoSquared <qusawyer@proton.me> Date: Tue, 7 May 2024 02:44:07 +0000 Subject: [PATCH 6/6] Change from flex to grid --- modules/css/base.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/css/base.css b/modules/css/base.css index 2651c8a493..6ba8d2f0cb 100644 --- a/modules/css/base.css +++ b/modules/css/base.css @@ -1653,9 +1653,8 @@ body.has-images #storyCaptionContent { } .outfitContainer { - display: flex; - flex-wrap: wrap; - flex-direction: row; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); } .wardrobeOutfit { @@ -1664,7 +1663,6 @@ body.has-images #storyCaptionContent { text-align: center; padding: 2px; border: solid 1px var(--300); - width: 23%; margin: 0 3px 3px; } -- GitLab