Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small reactions fixes #3411

Merged
merged 3 commits into from
Aug 2, 2023
Merged

Small reactions fixes #3411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e78c9ee
Small reactions fixes
samerton Jul 7, 2023
1b13887
Add close button to reactions modal and style updates
samerton Jul 7, 2023
7aaf807
Add scroll bar back to reaction menu
samerton Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/classes/Core/Validate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
samerton marked this conversation as resolved.
Show resolved Hide resolved
$missing = true;
}

Expand Down
2 changes: 1 addition & 1 deletion custom/panel_templates/Default/core/reactions_form.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
tadhgboyle marked this conversation as resolved.
Show resolved Hide resolved
<option value="3" {if $TYPE_VALUE eq 3} selected{/if}>{$CUSTOM_SCORE}</option>
</select>
</div>
Expand Down
42 changes: 39 additions & 3 deletions custom/templates/DefaultRevamp/css/custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%;
}

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -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;
tadhgboyle marked this conversation as resolved.
Show resolved Hide resolved
}

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
*/
Expand Down
1 change: 1 addition & 0 deletions custom/templates/DefaultRevamp/forum/view_topic.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions custom/templates/DefaultRevamp/profile.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion custom/templates/DefaultRevamp/reactions_modal.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="ui menu" style="overflow: scroll;">
samerton marked this conversation as resolved.
Show resolved Hide resolved
<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})
Expand Down