Small reactions fixes (#3411)

* Small reactions fixes * Add close button to reactions modal and style updates * Add scroll bar back to reaction menu
NamelessMC · Aug 2, 2023 · 093d4b3 · 093d4b3
1 parent 3cbca4a
commit 093d4b3
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 6 deletions.
diff --git a/core/classes/Core/Validate.php b/core/classes/Core/Validate.php
@@ -159,7 +159,7 @@ public static function check(array $source, array $items = []): Validate {
                         if (empty($source[$array][$matches[1]])) {
                             $missing = true;
                         }
-                    } else if (empty($value)) {
+                    } else if (empty($value) && $value !== '0') {
                         $missing = true;
                     }
 

diff --git a/custom/panel_templates/Default/core/reactions_form.tpl b/custom/panel_templates/Default/core/reactions_form.tpl
@@ -73,7 +73,7 @@
                                         <select name="type" class="form-control" id="InputReactionType">
                                             <option value="2" {if $TYPE_VALUE eq 2} selected{/if}>{$POSITIVE}</option>
                                             <option value="1" {if $TYPE_VALUE eq 1} selected{/if}>{$NEUTRAL}</option>
-                                            <option value="-1" {if $TYPE_VALUE eq 0} selected{/if}>{$NEGATIVE}</option>
+                                            <option value="0" {if $TYPE_VALUE eq 0} selected{/if}>{$NEGATIVE}</option>
                                             <option value="3" {if $TYPE_VALUE eq 3} selected{/if}>{$CUSTOM_SCORE}</option>
                                         </select>
                                     </div>

diff --git a/custom/templates/DefaultRevamp/css/custom.css b/custom/templates/DefaultRevamp/css/custom.css
@@ -288,13 +288,17 @@ body.pushable>.pusher {
 }
 
 #topic-post #post-content {
-    margin-top: auto;
     padding: .7em 1.2em .7em 1.2em;
     min-height: 32.5px;
-    font-size: .85em;
+}
+
+#post-content #reactions {
+    margin-top: auto;
 }
 
 .reaction-button {
+    margin-left: 5px;
+    margin-right: 5px;
     opacity: 50%;
 }
 
@@ -1238,6 +1242,11 @@ body.dark .ui.threaded.comments .comment .text {
     color: #fff;
 }
 
+body.dark .ui.segment .forum_post a,
+body.dark .ui.comments .comment .forum_post a {
+    color: #62b6f7;
+}
+
 body.dark .ui.card .meta,
 .ui.cards>.card .meta,
 body.dark .ui.header,
@@ -1331,6 +1340,7 @@ body.dark .ui.form input[type=url] {
     color: #fff;
 }
 
+body.dark .ui.mini.message,
 body.dark .ui.mini.info.message {
     background-color: #282828;
     box-shadow: 0 0 0 1px #282828 inset, 0 0 0 0 transparent;
@@ -1387,7 +1397,12 @@ body.dark .ui.table tbody tr td.selectable:hover {
     }
 }
 
-body.dark .forum_post {
+body.dark .forum_post,
+body.dark .ui.comments .forum_post.text {
+    color: #fff;
+}
+
+body.dark .ui.comments .comment .author {
     color: #fff;
 }
 
@@ -1486,6 +1501,27 @@ body.dark .cc-window.cc-floating .cc-highlight .cc-btn.cc-allow {
     border-color: transparent;
 }
 
+body.dark #modal-reactions .ui.menu {
+    background-color: #282828;
+    overflow-x: auto;
+}
+
+body.dark #modal-reactions .ui.menu .item {
+    color: #fff;
+}
+
+body.dark #modal-reactions .ui.menu .item.active {
+    background-color: #222;
+}
+
+body.dark #modal-reactions .ui.large.selection.divided.list.middle.aligned .item .content {
+    color: #fff;
+}
+
+body.dark ::-webkit-scrollbar-corner {
+    background-color: transparent;
+}
+
 /*
    * Colours
    */

diff --git a/custom/templates/DefaultRevamp/forum/view_topic.tpl b/custom/templates/DefaultRevamp/forum/view_topic.tpl
@@ -291,6 +291,7 @@
 
 {if $REACTIONS_ENABLED}
     <div class="ui small modal" id="modal-reactions">
+        <i class="close icon"></i>
         <div class="header">
             {$REACTIONS_TEXT}
         </div>

diff --git a/custom/templates/DefaultRevamp/profile.tpl b/custom/templates/DefaultRevamp/profile.tpl
@@ -291,6 +291,7 @@
 
 {if count($WALL_POSTS)}
     <div class="ui small modal" id="modal-reactions">
+        <i class="close icon"></i>
         <div class="header">
             {$REACTIONS_TEXT}
         </div>

diff --git a/custom/templates/DefaultRevamp/reactions_modal.tpl b/custom/templates/DefaultRevamp/reactions_modal.tpl
@@ -1,4 +1,4 @@
-<div class="ui menu" style="overflow: scroll;">
+<div class="ui menu">
     {foreach from=$REACTIONS item=reaction}
         <a class="{if $ACTIVE_TAB == $reaction.id}active {/if}item" data-tab="{$reaction.id}">
             {if $reaction.id != 0}{$reaction.html} &nbsp; {/if}{$reaction.name} ({$reaction.count})