diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java index ab24e8888..fb51a0b73 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java @@ -160,7 +160,12 @@ public class GempukkuHttpRequestHandler extends SimpleChannelInboundHandler .timestamp { - display: inline; - color: #5f5f5f; + display: inline; + color: #5f5f5f; } .timestamp { - color: #cfcfcf; + color: #cfcfcf; } #disclaimer { - color: #ffffff; - font-size: 80%; + color: #ffffff; + font-size: 80%; } -#latestNews { - color: #ffffff; - font-size: 90%; +#news { + flex-grow: 1; } #motd { - color: #ffffff; - font-size: 90%; + color: #ffffff; + margin: 5px; } table.tables { - width: 100%; + width: 100%; } table.tables td, table.tables th { - padding: 2px; - border: 1px solid white; + padding: 2px; + border: 1px solid white; } .ui-tabs-nav li { - font-size: 70%; } .ui-button-text-only .ui-button-text { - font-size: 70%; - padding: .2em .5em; + padding: .2em .5em; } .standings td, .standings th { - padding: 2px; - border: 1px solid white; + padding: 2px; + border: 1px solid white; } .gameHistory td, .gameHistory th { - padding: 2px; - border: 1px solid white; + padding: 2px; + border: 1px solid white; } .userList { - border-left: 1px solid #FFFFFF; + border-left: 1px solid #FFFFFF; } tr.played { - background-color: #990000; + background-color: #990000; } #chat { - display: grid; - grid-template-columns: auto 150px; - position:relative; - width:100%; - height:40%; - min-height: 300px; - grid-gap: 3px; - overflow: hidden; + display: grid; + grid-template-columns: auto 150px; + position:relative; + width:100%; + height:40%; + min-height: 300px; + grid-gap: 3px; + overflow: hidden; } #chatarea { - position:relative; - width: 100%; - height: 100%; - overflow: hidden; + position:relative; + width: 100%; + height: 100%; + overflow: hidden; } #chatMessages { - height: 100%; - max-height: 100%; - overflow-y: scroll; - display: flex; - flex-direction: column; + height: 100%; + max-height: 100%; + overflow-y: scroll; + display: flex; + flex-direction: column; } #userListColumn { - display: flex; - flex-direction: column; - overflow: auto; + display: flex; + flex-direction: column; + overflow: auto; } #userList { - flex-grow: 1; - overflow: scroll; + flex-grow: 1; + overflow: scroll; } #toggleChatButt { - flex: none; - height: 25px; + flex: none; + height: 25px; } #legacyChat { - - display: grid; - width: 100%; - height: 100%; - max-height: 100%; - grid-template-columns: auto; - grid-template-rows: auto 25px; + + display: grid; + width: 100%; + height: 100%; + max-height: 100%; + grid-template-columns: auto; + grid-template-rows: auto 25px; } #legacyChatInput { - display: flex; + display: flex; } #chatTalk { - flex-grow: 1; - resize: none; - max-height: 60px; + flex-grow: 1; + resize: none; + max-height: 60px; } #discordChat { - position: absolute; - top: 0; - width: 100%; - height: 100%; + position: absolute; + top: 0; + width: 100%; + height: 100%; } #widgetbot { - position: relative; - width: 100%; - height: 100%; + position: relative; + width: 100%; + height: 100%; } .highlight-new { - background-color: #aa2222 !important; + background-color: #aa2222 !important; } .flex-horiz { - display: flex; - flex-direction: row; - gap: 2px; + display: flex; + flex-direction: row; + gap: 2px; } .flex-vert { - display: flex; - flex-direction: column; - gap: 2px; + display: flex; + flex-direction: column; + gap: 2px; } #tabs{ - position: sticky; + position: sticky; } #buttonsDiv { - left:0px; - top: 0px; - height: 40px; - background-color:#000000; - border-top-width:1px; - border-top-color:#ffffff; - border-top-style:solid; - align-items: center; - gap: 4px; + left:0px; + top: 0px; + height: 40px; + background-color:#000000; + border-top-width:1px; + border-top-color:#ffffff; + border-top-style:solid; + align-items: center; + gap: 4px; } .hall-tab { - display: flex; - flex-direction: column; - flex-grow: 1; - gap: 5px; - overflow: scroll; + display: flex; + flex-direction: column; + flex-grow: 1; + gap: 5px; + overflow: scroll; } #main { - top: 5px; - height: 100%; - min-height: 100%; - max-height: 100%; - width: 100%; - display: flex; - flex-direction: column; + top: 5px; + height: 100%; + min-height: 100%; + max-height: 100%; + width: 100%; + display: flex; + flex-direction: column; } #disclaimer { - font-size: 60%; - position: absolute; - bottom: -15px; + font-size: 60%; + position: absolute; + bottom: -15px; } .ui-tabs-panel { - height: 100%; + height: 100%; } #tablesDiv { - overflow: auto; + overflow: auto; } #buttonsDiv a, #motd a, -#bugReport a, +#infoButtons a, .msg-content p a { - color: orange; + color: #BF6B04; +} + +#infoButtons { + flex-wrap: wrap; + padding: 3px; +} + +a:visited { + color: #A63F03; } .chatMessage h1, @@ -327,51 +333,58 @@ tr.played { .chatMessage h4, .chatMessage h5, .chatMessage h6 { - display: inline; - margin-top: 0; - margin-bottom: 0; + display: inline; + margin-top: 0; + margin-bottom: 0; } .chatMessage p { - margin-top: 0; - margin-bottom: 0; + margin-top: 0; + margin-bottom: 0; } .chatMessage blockquote { - display: inline-block; - border-left: 5px solid #505050; - margin-left: 5px; - margin-top: 0px; - margin-bottom: 5px; - font-style: italic; + display: inline-block; + border-left: 5px solid #505050; + margin-left: 5px; + margin-top: 0px; + margin-bottom: 5px; + font-style: italic; } .chatMessage blockquote br { - line-height: 0px; - margin: 0px; - content: ""; + line-height: 0px; + margin: 0px; + content: ""; } .user-mention { - background-color: #FFFF0044; + background-color: #FFFF0044; } .user-ping { - background-color: #FF000044; + background-color: #FF000044; } .message { - display: flex; - flex-direction: row; - gap: 2px; - align-items: flex-start; + display: flex; + flex-direction: row; + gap: 2px; + align-items: flex-start; } .msg-content p { - margin-left: 5px; - margin-top: 0px; - margin-bottom: 7px; + margin-left: 5px; + margin-top: 0px; + margin-bottom: 7px; +} + +.msg-content { + flex-grow: 10; } .msg-identifier { - + min-width: fit-content; + display: flex; + gap: 4px; + margin: 1px; } \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/icons.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/icons.css new file mode 100644 index 000000000..f12eb793d --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/icons.css @@ -0,0 +1,51 @@ +.icon-discord { + background: url("../../images/icons/discord-brands.svg"); +} + +.icon-bug { + background: url("../../images/icons/bug-solid.svg"); +} + +.icon-report { + background: url("../../images/icons/ban-solid.svg"); +} + +.icon-wiki { + background: url("../../images/icons/book-open-solid.svg"); +} + +.icon-hall { + background: url("../../images/icons/swords.svg"); +} + +.icon-help { + background: url("../../images/icons/circle-question-solid.svg"); +} + +.icon-events { + background: url("../../images/icons/clock-solid.svg"); +} + +.icon-stats { + background: url("../../images/icons/chart-line-solid.svg"); +} + +.icon-users { + background: url("../../images/icons/users-solid.svg"); +} + +.icon-account { + background: url("../../images/icons/gear-solid.svg"); +} + +.custom-icon { + background-color: transparent; /* make the button transparent */ + background-repeat: no-repeat; /* make the background image appear only once */ + background-position: 0px 0px; /* equivalent to 'top left' */ + border: none; /* assuming we don't want any borders */ + cursor: pointer; /* make the cursor like hovering over an element */ + height: 20px; /* make this the size of your image */ + padding-left: 30px; /* make text start to the right of the image */ + vertical-align: middle; /* align the text vertically centered */ + filter: brightness(0) invert(1);*/ +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html index acfe6a368..4bf0e62b2 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/hall.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/hall.html @@ -5,6 +5,7 @@ Gemp-LotR + @@ -144,23 +145,62 @@
-
- "If you find any problems with specific card or rules in general, please report it on TLHH forum thread here or on the PC Discord here, in the #gemp-dev channel. Please include a game replay link. +
-
+
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/ban-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/ban-solid.svg new file mode 100644 index 000000000..cb18cbe42 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/ban-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/book-bookmark-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/book-bookmark-solid.svg new file mode 100644 index 000000000..6628ee290 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/book-bookmark-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/book-open-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/book-open-solid.svg new file mode 100644 index 000000000..3b718212c --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/book-open-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/bug-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/bug-solid.svg new file mode 100644 index 000000000..4b37564f3 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/bug-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/chart-line-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/chart-line-solid.svg new file mode 100644 index 000000000..781bdc051 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/chart-line-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/circle-question-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/circle-question-solid.svg new file mode 100644 index 000000000..e8fe87291 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/circle-question-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/clock-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/clock-solid.svg new file mode 100644 index 000000000..5cb7f5f90 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/clock-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/copy-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/copy-solid.svg new file mode 100644 index 000000000..017fd0f98 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/copy-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/discord-brands.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/discord-brands.svg new file mode 100644 index 000000000..150d98f7f --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/discord-brands.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/download-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/download-solid.svg new file mode 100644 index 000000000..77c76ec05 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/download-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/file-import-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/file-import-solid.svg new file mode 100644 index 000000000..f923949f3 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/file-import-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/file-lines-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/file-lines-solid.svg new file mode 100644 index 000000000..b0da692dc --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/file-lines-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/floppy-disk-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/floppy-disk-solid.svg new file mode 100644 index 000000000..e18004992 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/floppy-disk-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/folder-open-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/folder-open-solid.svg new file mode 100644 index 000000000..501ee6397 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/folder-open-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/gear-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/gear-solid.svg new file mode 100644 index 000000000..f04515be0 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/gear-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/notes-medical-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/notes-medical-solid.svg new file mode 100644 index 000000000..3984c3c45 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/notes-medical-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/pencil-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/pencil-solid.svg new file mode 100644 index 000000000..cd5af8d19 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/pencil-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/person-dots-from-line-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/person-dots-from-line-solid.svg new file mode 100644 index 000000000..781252282 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/person-dots-from-line-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/question-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/question-solid.svg new file mode 100644 index 000000000..8be13139a --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/question-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/share-from-square-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/share-from-square-solid.svg new file mode 100644 index 000000000..d93769128 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/share-from-square-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/swords.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/swords.svg new file mode 100644 index 000000000..2c28f1fc4 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/swords.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/trash-can-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/trash-can-solid.svg new file mode 100644 index 000000000..84e0ba039 --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/trash-can-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/up-right-from-square-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/up-right-from-square-solid.svg new file mode 100644 index 000000000..90b8c182f --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/up-right-from-square-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/users-solid.svg b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/users-solid.svg new file mode 100644 index 000000000..4cf48c83b --- /dev/null +++ b/gemp-lotr/gemp-lotr-async/src/main/web/images/icons/users-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index bc81b5010..df699f06c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -47,6 +47,10 @@ var GempLotrHallUI = Class.extend({ this.initTable(hallSettings[4] == "1", "activeTournamentsHeader", "activeTournamentsContent"); this.buttonsDiv = $("#buttonsDiv"); + $("#bug-button").button(); + $("#report-button").button(); + $("#discord-button").button(); + $("#wiki-button").button(); var that = this;