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.

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

Addiotnal Theme tweak #3794

Merged
merged 6 commits into from
Apr 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 install/install_2-0.php
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ public function insert_membergroups()
'{db_prefix}membergroups',
array('group_name' => 'string', 'description' => 'string', 'online_color' => 'string', 'min_posts' => 'int', 'icons' => 'string', 'group_type' => 'int'),
array(
array('{$default_administrator_group}', '', '#ED0000', -1, '5#iconadmin.png', 1),
array('{$default_administrator_group}', '', '#AF0000', -1, '5#iconadmin.png', 1),
array('{$default_global_moderator_group}', '', '#0066FF', -1, '5#icongmod.png', 0),
array('{$default_moderator_group}', '', '', -1, '5#iconmod.png', 0),
array('{$default_newbie_group}', '', '', 0, '1#icon.png', 0),
Expand Down
3 changes: 2 additions & 1 deletion sources/ElkArte/AdminController/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,8 @@ public function action_credits()
'title' => 'support_credits_title',
'description' => 'support_credits_desc',
]);
Txt::load('Who');
Txt::load('About');
require_once(SUBSDIR . '/About.subs.php');
$context += prepareCreditsData();

// This makes it easier to get the latest news with your time format.
Expand Down
10 changes: 5 additions & 5 deletions themes/default/Display.template.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function template_messages()
<a class="post_anchor" id="msg' . $message['id'] . '"></a>' : '';

echo '
<article class="post_wrapper forumposts', $message['classes'], $message['approved'] ? '' : ' approvebg', '">';
<article class="post_wrapper', empty($options['hide_poster_area']) ? '' : '2', ' forumposts', $message['classes'], $message['approved'] ? '' : ' approvebg', '">';

if (!empty($settings['show_keyinfo_above']))
{
Expand Down Expand Up @@ -306,8 +306,9 @@ function template_keyinfo($message, $ignoring, $above = false)

echo '
<header class="keyinfo', ($above ? ' above' : ''), '">
', (empty($options['hide_poster_area']) ? '' : '<ul class="poster poster2">' . template_build_poster_div($message, $ignoring) . '</ul>');
', (empty($options['hide_poster_area']) ? '' : '<ul class="poster no_js poster2">' . template_build_poster_div($message, $ignoring) . '</ul>');

// Follow-up button when required
if (!empty($context['follow_ups'][$message['id']]))
{
echo '
Expand Down Expand Up @@ -340,7 +341,6 @@ function template_keyinfo($message, $ignoring, $above = false)
</h3>
<div id="msg_', $message['id'], '_quick_mod"', $ignoring ? ' class="hide"' : '', '></div>
</header>';

}

/**
Expand Down Expand Up @@ -377,7 +377,7 @@ function template_quickreply_below()
</h3>
<div id="quickreplybox">
<section>
<article class="post_wrapper forumposts">';
<article class="post_wrapper', empty($options['hide_poster_area']) ? '' : '2', ' forumposts">';

if (empty($options['hide_poster_area']))
{
Expand Down Expand Up @@ -556,7 +556,7 @@ function template_quickreply_below()
funcOnAfterCreate: function () {
// Attach AtWho to the quick edit box
add_elk_mention("#quick_edit_body_container textarea");
var i = all_elk_mentions.length - 1;
let i = all_elk_mentions.length - 1;
all_elk_mentions[i].oMention = new elk_mentions(all_elk_mentions[i].oOptions);
}
});
Expand Down
53 changes: 41 additions & 12 deletions themes/default/css/_blue/icons_svg_blue.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,22 @@
Some areas, for example board icons, are custom content, from font awesome, as well */

/* Top Menu icons */
#button_home .i-home::before {
content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' stroke='white' stroke-width='1px' fill='black' viewBox='0 0 32 32'%3E%3Cpath d='M32 18.45L16 6.03 0 18.45v-5.063L16 .967l16 12.42zM28 18v12h-8v-8h-8v8H4V18l12-9z'/%3E%3C/svg%3E");
}

/* Attention menu icons, like new messages */
.i-menu-pm-on::before, .i-menu-pm-on.enabled::before,
.i-menu-mentions-on::before, .i-menu-mentions-on.enabled::before {
filter: invert(66%) sepia(32%) saturate(4068%) hue-rotate(2deg) brightness(107%) contrast(102%);
--hexcode: #FFA500;
}

/* normal color of top menu icons */
.i-menu-pm-off::before,
#button_home .i-home::before,
.i-menu-mentions-off::before,
.i-menu-admin::before,
.i-menu-profile::before, .i-menu-profile.enabled::before,
.i-menu-unread.enabled::before,
.i-menu-unreadreplies.enabled::before,
.i-menu-login::before, .i-menu-login.enabled::before,
Expand All @@ -32,12 +38,36 @@
--hexcode: #557ea0;
}

/* Hover and active states need some contrast due to background */
#button_home:hover .i-home::before, #button_home .active .i-home::before,
#button_pm:hover i::before, #button_pm .active i::before,
#button_mentions:hover i::before, #button_mentions .active i::before,
#button_admin:hover i::before, #button_admin .active i::before,
#button_unread:hover i::before, #button_unread .active i::before,
#button_unreadreplies:hover i::before, #button_unreadreplies .active i::before,
#button_login:hover i::before, #button_login .active i::before,
#button_register:hover i::before, #button_register .active i::before,
.i-menu-profile::before, .i-menu-profile.enabled::before {
filter: invert(73%) sepia(18%) saturate(848%) hue-rotate(168deg) brightness(91%) contrast(85%);
}

/* Communication icons */
.i-envelope-o::before, .i-envelope-blank::before {
.i-envelope-o::before, .i-envelope-blank::before, .fred.i-profile::before {
filter: invert(63%) sepia(41%) saturate(641%) hue-rotate(157deg) brightness(86%) contrast(99%);
--hexcode: #43A8DA;
}

.i-directory::before, .i-calendar::before,
.i-contact::before,
.i-sort-amount-up::before, .i-sortup::before,
.i-sort-amount-down::before, .i-sortdown::before,
.i-users::before,
.i-post-text::before, .i-xx::before, .i-normal::before,
.i-switch-off::before {
filter: invert(100%) sepia(100%) saturate(0%) hue-rotate(164deg) brightness(101%) contrast(101%);
--hexcode: #ffffff;
}

.i-envelope::before {
filter: invert(66%) sepia(32%) saturate(4068%) hue-rotate(2deg) brightness(107%) contrast(102%);
--hexcode: #FFA500;
Expand All @@ -49,26 +79,25 @@
--hexcode: #1AB31A;
}

/* Was bar-chart */
.i-poll::before, .i-user::before {
filter: invert(31%) sepia(72%) saturate(1247%) hue-rotate(185deg) brightness(90%) contrast(93%);
--hexcode: #1966B3;
}

.i-comment::before, .i-profile::before,
.i-comment::before, .i-profile::before, .i-user::before,
.i-comment-blank::before, .i-comments-blank::before, .i-comments::before,
.i-bell-blank::before, .i-account::before, .i-register::before,
.i-cog::before, .i-sign-in::before, .i-sign-out::before, .i-phone::before {
filter: invert(63%) sepia(41%) saturate(641%) hue-rotate(157deg) brightness(86%) contrast(99%);
--hexcode: #43A8DA;
filter: invert(83%) sepia(13%) saturate(1903%) hue-rotate(183deg) brightness(102%) contrast(110%);
--hexcode: #b4dcff;
}

.i-bell::before {
filter: invert(66%) sepia(32%) saturate(4068%) hue-rotate(2deg) brightness(107%) contrast(102%);
--hexcode: #FFA500;
}

/* beSocial Board icons are from Font Awesome */
.i-modify::before, .i-pencil::before, .i-package::before, .i-menu-login::before, .i-menu-login.enabled::before {
filter: invert(78%) sepia(98%) saturate(658%) hue-rotate(334deg) brightness(104%) contrast(102%);
--hexcode: #FFD923;
}

/* Manic Board icons are based on Font Awesome speech balloon */
.i-board-redirect::before {
content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23ACACAC' viewBox='0 0 56 56'%3E%3Cpath d='M34 28q0 1.03-.84 1.63l-14 10q-.97.7-2.07.15Q16 39.25 16 38V18q0-1.25 1.1-1.78 1.1-.56 2.06.16l14 10q.84.6.84 1.62zm6 15V13q0-.44-.28-.72T39 12H9q-.44 0-.72.28T8 13v30q0 .44.28.72T9 44h30q.44 0 .72-.28T40 43zm8-30v30q0 3.72-2.64 6.36T39 52H9q-3.72 0-6.36-2.64T0 43V13q0-3.72 2.64-6.36T9 4h30q3.72 0 6.36 2.64T48 13z'/%3E%3C/svg%3E");
}
Expand Down
32 changes: 26 additions & 6 deletions themes/default/css/_blue/index_blue.css
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@
*/

.wrapper {
/* Next controls forum width, when it is not set in admin. */
/* Next controls the overall forum font */
font-size: var(--font14);
}

Expand Down Expand Up @@ -386,7 +386,7 @@ strong {
text-shadow: -1px -1px 1px var(--box_shadow);
line-height: 1.5;
font-size: var(--font15);
padding: .4rem .8rem 0 .8rem;
padding: .2rem .8rem .2rem .8rem;
}

/* Single ones a bit darker than board index ones. */
Expand All @@ -409,6 +409,11 @@ strong {
color: var(--category_header_text);
}

.hdicon::before {
width: 2rem;
height: 2rem;
}

/* Custom highlighted text style for modern browsers.
Nicer than default. Needs two separate rules. */
::-moz-selection {
Expand Down Expand Up @@ -727,7 +732,7 @@ sup.bbc_footnotes, sup.bbc_footnotes a {
.linklevel1, .linklevel1:link, .linklevel1:visited {
color: var(--menu_text);
border-color: var(--transparent);
background: transparent;
background: var(--transparent);
box-shadow: none;
}

Expand Down Expand Up @@ -1362,6 +1367,10 @@ sup.bbc_footnotes, sup.bbc_footnotes a {
color: var(--topic_name);
}

.keyinfo.above {
background: var(--menu_background);
}

/* The icon selection dropdown you get by clicking on the icon in message view */
.keyinfo .messageicon .dropdown {
border-color: var(--transparent);
Expand All @@ -1387,10 +1396,14 @@ sup.bbc_footnotes, sup.bbc_footnotes a {
background: var(--menu_button_hover_background);
}

.messageContent {
.messageContent:not(.above) {
border-top-color: var(--secondary_border);
}

.messageContent.above {
border-top-color: var(--transparent);
}

.messageContent .bbc_img.ila_pending {
border-color: var(--primary_border);
}
Expand Down Expand Up @@ -1465,7 +1478,6 @@ sup.bbc_footnotes, sup.bbc_footnotes a {
border-color: var(--primary_border);
background: var(--notice);
box-shadow: 0 0 8px 1px var(--opacity30);

}

/* Used by share topic */
Expand Down Expand Up @@ -1610,7 +1622,7 @@ sup.bbc_footnotes, sup.bbc_footnotes a {

/* Hover effect */
.ui-tabs .ui-tabs-nav li.ui-state-hover .ui-tabs-anchor {
color: var(--menu_text);
color: var(--contrast_text);
border-color: var(--menu_border_hover);
border-top-color: var(--menu_border_hover_top);
border-left-color: var(--menu_border_hover_left);
Expand Down Expand Up @@ -1802,6 +1814,14 @@ ul.cf_icons {
border-color: var(--primary_border);
}

.previous_month, .next_month {
margin-top: 0;
}

#month_grid .category_header {
padding-bottom: .4rem;
}

/* -------------------------------------------------------
* $HELP
* -------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion themes/default/css/_gold/icons_svg_gold.css
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
--hexcode: #FFA500;
}

/* beSocial Board icons are from Font Awesome */
/* Gold Board icons */
.i-board-redirect::before {
content: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' xml:space='preserve' viewBox='0 0 57.75 58.131'%3E%3Cpath d='M54.016 42.026a28.415 28.415 0 0 0 3.234-13.151C57.25 13.229 44.521.5 28.875.5S.5 13.229.5 28.875 13.228 57.25 28.875 57.25c4.376 0 8.56-.976 12.452-2.882l2.699 2.699c.365.364.851.564 1.367.564s1.002-.2 1.367-.565l9.79-9.791c.364-.364.565-.85.565-1.367a1.92 1.92 0 0 0-.565-1.367zm-4.651-4.616a70.194 70.194 0 0 0 4.99-1.748 26.256 26.256 0 0 1-1.833 4.881zm-.996-10.621c-.21-.508-.729-.812-1.39-.812h-6.71a69.925 69.925 0 0 0-.454-5.522 68.038 68.038 0 0 1 14.938 4.264c.056.023.114.022.172.034.212 1.344.324 2.72.324 4.122 0 1.503-.138 2.999-.391 4.474-.035.01-.071.006-.105.02a67.917 67.917 0 0 1-6.988 2.454l-3.656-3.628 3.851-3.85c.467-.467.619-1.048.409-1.556zm-22.907 1.122v10.508a68.103 68.103 0 0 1-5.486-.493 66.766 66.766 0 0 1 .002-17.778 66.75 66.75 0 0 1 17.776-.002c.255 1.93.425 3.875.514 5.833H27.395a1.932 1.932 0 0 0-1.933 1.932zM2.887 33.348a26.385 26.385 0 0 1-.387-4.473c0-1.402.112-2.779.324-4.122.057-.013.116-.01.172-.034a68.114 68.114 0 0 1 14.928-4.262 68.71 68.71 0 0 0-.002 17.159 67.425 67.425 0 0 1-14.926-4.247c-.036-.015-.073-.011-.109-.021zm51.57-10.887a70.032 70.032 0 0 0-14.946-4.089A69.258 69.258 0 0 0 35.404 3.32c9.345 2.388 16.706 9.781 19.053 19.141ZM33.139 2.85a.964.964 0 0 0 .062.315 67.46 67.46 0 0 1 4.249 14.926 68.678 68.678 0 0 0-17.161.002 68.122 68.122 0 0 1 4.262-14.927.969.969 0 0 0 .062-.315 26.254 26.254 0 0 1 4.262-.351c1.452 0 2.875.123 4.264.35zm-10.792.469a70.02 70.02 0 0 0-4.139 15.058 70.054 70.054 0 0 0-14.916 4.084C5.64 13.1 13.002 5.707 22.347 3.319ZM3.391 35.668a69.34 69.34 0 0 0 14.811 4.012 70.036 70.036 0 0 0 3.999 14.713c-9.149-2.395-16.373-9.592-18.81-18.725Zm21.145 19.219a68.094 68.094 0 0 1-4.25-14.906c1.715.212 3.441.355 5.176.44v7.074c0 1.018.664 1.482 1.28 1.482.268 0 .672-.087 1.087-.502l3.756-3.85 3.894 3.894a68.25 68.25 0 0 1-2.266 6.372 26.304 26.304 0 0 1-8.677-.004zm11.009-.493a69.909 69.909 0 0 0 1.519-4.289l2.762 2.762a25.972 25.972 0 0 1-4.281 1.527zm9.848 1.212L32.999 43.211a1.917 1.917 0 0 0-1.367-.565c-.517 0-1.003.201-1.367.565l-2.808 2.808-.062-18.042h18.103l-2.804 2.804a1.937 1.937 0 0 0 .001 2.733l12.441 12.347z' style='fill:%235f4724;fill-opacity:1;stroke:%235f4724;stroke-opacity:1'/%3E%3C/svg%3E");
}
Expand Down
4 changes: 4 additions & 0 deletions themes/default/css/_gold/index_gold.css
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,10 @@ sup.bbc_footnotes, sup.bbc_footnotes a {
* -------------------------------------------------------
*/

#header {
padding: 1.2rem .2rem 1.2rem .2rem;
}

/* The top bar. */
#top_section {
border-top: none;
Expand Down
4 changes: 2 additions & 2 deletions themes/default/css/_light/index_light.css
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@
--hr_background: #E4E4E4;

/* Misc */
--links: #49643D; /* normal links */
--bbclinks: #49643D; /* bbc links */
--links: #435C38; /* normal links */
--bbclinks: #435C38; /* bbc links */
--valid: #EBFFD8; /* used as valid input background color */
--invalid: #FFEEEE; /* very pale red, used as invalid input color */
--information: #F0F6F0; /* information box background */
Expand Down
2 changes: 1 addition & 1 deletion themes/default/css/icons_svg.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading