Skip to content

Commit

Permalink
Merge Upstream 20.01.2025 (2) (#1030)
Browse files Browse the repository at this point in the history
This pull request merges upstream/master. Resolve possible conflicts
manually and make sure all the changes are applied correctly.

## Changelog
:cl: tgstation
qol: Торговым автоматам добавлен новый дизайн с двумя вариантами
расположения: Список и Сетка (по умолчанию используется Список). <!--
Vending machines got new design with 2 layouts: List and Grid (List by
default) (www.github.com/tgstation/tgstation/pull/89137) -->
/:cl:

## Summary by Sourcery

New Features:
- Introduce a new design for vending machines with two layout options:
list and grid.
  • Loading branch information
AyIong authored Jan 20, 2025
2 parents d064748 + ae086de commit 8e7e684
Show file tree
Hide file tree
Showing 3 changed files with 162 additions and 162 deletions.
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-89137.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "AyIong"
delete-after: True
changes:
- qol: "Vending machines got new design with 2 layouts: List and Grid (List by default)"
1 change: 1 addition & 0 deletions html/statbrowser.css
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ img {
}

.grid-item:hover .grid-item-text {
height: 100%;
overflow: visible;
white-space: normal;
background-color: #ececec;
Expand Down
Loading

0 comments on commit 8e7e684

Please sign in to comment.