Theme changes

Sources/Actions/Calendar.php

@@ -147,7 +147,7 @@ public function show(): void
 
  // This is gonna be needed...
  Theme::loadTemplate('Calendar');
- Theme::loadCSSFile('calendar.css', ['force_current' => false, 'validate' => true, 'rtl' => 'calendar.rtl.css'], 'smf_calendar');
+ Theme::loadCSSFile('calendar.css', ['force_current' => false, 'validate' => true], 'smf_calendar');
 
  // Did the specify an individual event ID? If so, let's splice the year/month in to what we would otherwise be doing.
  if (isset($_GET['event'])) {

Sources/Actions/Profile/BuddyIgnoreLists.php

@@ -119,7 +119,7 @@ public function execute(): void
  Menu::$loaded['profile']->tab_data = [
  'title' => Lang::$txt['editBuddyIgnoreLists'],
  'description' => Lang::$txt['buddy_ignore_desc'],
- 'icon_class' => 'main_icons profile_hd',
+ 'icon_class' => 'main_icons profile medium_icon',
  'tabs' => [
  'buddies' => [],
  'ignore' => [],

Sources/Actions/Profile/Main.php

@@ -425,7 +425,7 @@ class Main implements ActionInterface
  'report' => [
  'label' => 'report_profile',
  'custom_url' => '{scripturl}?action=reporttm;{session_var}={session_id}',
- 'icon' => 'warning',
+ 'icon' => 'report',
  'enabled' => true,
  'permission' => [
  'own' => [],

Sources/Actions/Profile/ShowPosts.php

@@ -114,7 +114,7 @@ public function execute(): void
  Menu::$loaded['profile']->tab_data = [
  'title' => Lang::$txt['showPosts'],
  'description' => Lang::$txt['showPosts_help'],
- 'icon_class' => 'main_icons profile_hd',
+ 'icon_class' => 'main_icons profile medium_icon',
  'tabs' => [
  'messages' => [
  ],

Sources/Actions/Profile/Summary.php

@@ -69,7 +69,7 @@ public function execute(): void
  // Menu tab
  Menu::$loaded['profile']->tab_data = [
  'title' => Lang::$txt['summary'],
- 'icon_class' => 'main_icons profile_hd',
+ 'icon_class' => 'main_icons profile medium_icon',
  ];
 
  // Set up the stuff and load the user.

Sources/Actions/Profile/Tracking.php

@@ -145,7 +145,7 @@ public function execute(): void
  Menu::$loaded['profile']->tab_data = [
  'title' => Lang::$txt['tracking'],
  'description' => Lang::$txt['tracking_description'],
- 'icon_class' => 'main_icons profile_hd',
+ 'icon_class' => 'main_icons profile medium_icon',
  'tabs' => [],
  ];
 

Sources/Theme.php

@@ -2746,6 +2746,12 @@ protected function loadCss()
  self::loadCSSFile('https://use.fontawesome.com/releases/v' . FONTAWESOME_VERSION . '/css/all.css', ['external' => true, 'order_pos' => -100], 'smf_fontawesome');
  }
 
+ // Icons
+ self::loadCSSFile('icons.css', ['minimize' => true, 'order_pos' => -200], 'smf_icons');
+
+ // Variables
+ self::loadCSSFile('variables.css', ['minimize' => true, 'order_pos' => 0], 'smf_variables');
+
  // And of course, let's load the default CSS file.
  self::loadCSSFile('index.css', ['minimize' => true, 'order_pos' => 1], 'smf_index');
 

Themes/default/Admin.template.php

@@ -1326,12 +1326,12 @@ function template_admin_search_results()
 {
  echo '
  <div id="section_header" class="cat_bar">
- ', template_admin_quick_search(), '
  <h3 class="catbg">
  <span id="quick_search_results">
  ', sprintf(Lang::$txt['admin_search_results_desc'], Utils::$context['search_term']), '
  </span>
  </h3>
+ ', template_admin_quick_search(), '
  </div><!-- #section_header -->
  <div class="windowbg generic_list_wrapper">';
 

Themes/default/BoardIndex.template.php

@@ -35,17 +35,15 @@ function template_newsfader()
  {
  echo '
  <div class="news_section">
- <div class="news_section_left"><i class="fa-solid fa-exclamation"></i></div>
- <div class="news_section_right">
- <ul id="smf_slider">';
+ <div class="icon"><i class="fa-solid fa-exclamation"></i></div>
+ <ul id="smf_slider">';
 
  foreach (Utils::$context['news_lines'] as $news)
  echo '
- <li>', $news, '</li>';
+  <li>', $news, '</li>';
 
  echo '
- </ul>
- </div>
+ </ul>
  </div>
  <script>
  jQuery("#smf_slider").slippry({
@@ -79,16 +77,17 @@ function template_main()
  echo '
  <div class="main_container">
  <div class="cat_bar ', $category['is_collapsed'] ? 'collapsed' : '', '" id="category_', $category['id'], '">
- <h3 class="catbg">';
+ <h3 class="catbg">
+ ', $category['link'], '
+ </h3>';
 
  // If this category even can collapse, show a link to collapse it.
  if ($category['can_collapse'])
  echo '
-  <span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', ' floatright" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? Lang::$txt['hide_category'] : Lang::$txt['show_category'], '" style="display: none;"></span>';
+ <span id="category_', $category['id'], '_upshrink" class="', $category['is_collapsed'] ? 'toggle_down' : 'toggle_up', '" data-collapsed="', (int) $category['is_collapsed'], '" title="', !$category['is_collapsed'] ? Lang::$txt['hide_category'] : Lang::$txt['show_category'], '" style="display: none;"></span>';
 
  echo '
- ', $category['link'], '
- </h3>', !empty($category['description']) ? '
+ ', !empty($category['description']) ? '
  <div class="desc">' . $category['description'] . '</div>' : '', '
  </div>
  <div id="category_', $category['id'], '_boards" ', (!empty($category['css_class']) ? ('class="' . $category['css_class'] . '"') : ''), $category['is_collapsed'] ? ' style="display: none;"' : '', '>';
@@ -306,9 +305,9 @@ function template_info_center()
  <div id="info_center">
  <div class="title_bar">
  <h3 class="titlebg">
- <span class="toggle_up floatright" id="upshrink_ic" title="', Lang::$txt['hide_infocenter'], '" style="display: none;"></span>
  <a href="#" id="upshrink_link">', sprintf(Lang::$txt['info_center_title'], Utils::$context['forum_name_html_safe']), '</a>
  </h3>
+ <span class="toggle_up" id="upshrink_ic" title="', Lang::$txt['hide_infocenter'], '" style="display: none;"></span>
  </div>
  <div id="upshrink_stats"', empty(Theme::$current->options['collapse_header_ic']) ? '' : ' style="display: none;"', '>';
 
@@ -366,13 +365,12 @@ function template_ic_block_recent()
 {
  // This is the "Recent Posts" bar.
  echo '
- <div class="info_center_container">
- <div class="info_block row">
- <div class="info_block_icon column _0">
- <a href="', Config::$scripturl, '?action=recent"><span class="main_icons recent_posts"></span></a>
- </div>
- <div class="info_block_information column _100">
- <div id="recent_posts_content">';
+ <div class="info_block">
+ <div class="info_block_icon">
+ <a href="', Config::$scripturl, '?action=recent"><span class="main_icons recent_posts"></span></a>
+ </div>
+ <div class="info_block_information">
+ <div id="recent_posts_content">';
 
  // Only show one post.
  if (Theme::$current->settings['number_recent_posts'] == 1)
@@ -413,9 +411,7 @@ function template_ic_block_recent()
  </div><!-- #recent_posts_content -->';
  echo '
  </div>
- </div>
- </div>
-';
+ </div>';
 }
 
 /**
@@ -425,12 +421,11 @@ function template_ic_block_calendar()
 {
  // Show information about events, birthdays, and holidays on the calendar.
  echo '
- <div class="info_center_container">
- <div class="info_block row">
- <div class="info_block_icon column _0">
- <a href="', Config::$scripturl, '?action=calendar' . '"><span class="main_icons calendar"></span> ', '</a>
- </div>
- <div class="info_block_information column _100">';
+ <div class="info_block">
+ <div class="info_block_icon">
+ <a href="', Config::$scripturl, '?action=calendar' . '"><span class="main_icons calendar"></span> ', '</a>
+ </div>
+ <div class="info_block_information">';
 
  // Holidays like "Christmas", "Chanukah", and "We Love [Unknown] Day" :P
  if (!empty(Utils::$context['calendar_holidays']))
@@ -471,8 +466,8 @@ function template_ic_block_calendar()
  </p>';
  }
  echo'
- </div></div></div>
- ';
+  </div>
+ </div>';
 }
 
 /**
@@ -482,19 +477,17 @@ function template_ic_block_stats()
 {
  // Show statistical style information...
  echo '
- <div class="info_center_container">
- <div class="info_block row">
- <div class="info_block_icon column _0">
- ', Utils::$context['show_stats'] ? '<a href="' . Config::$scripturl . '?action=stats" title="' . Lang::$txt['more_stats'] . '">' : '', '<span class="main_icons stats"></span> ', Utils::$context['show_stats'] ? '</a>' : '', '
- </div>
- <div class="info_block_information column _100">
+ <div class="info_block">
+ <div class="info_block_icon">
+ ', Utils::$context['show_stats'] ? '<a href="' . Config::$scripturl . '?action=stats" title="' . Lang::$txt['more_stats'] . '">' : '', '<span class="main_icons stats"></span> ', Utils::$context['show_stats'] ? '</a>' : '', '
+ </div>
+ <div class="info_block_information">
  <p class="inline">
  ', Utils::$context['common_stats']['boardindex_total_posts'], '', !empty(Theme::$current->settings['show_latest_member']) ? ' - ' . Lang::$txt['latest_member'] . ': <strong> ' . Utils::$context['common_stats']['latest_member']['link'] . '</strong>' : '', '<br>
  ', (!empty(Utils::$context['latest_post']) ? Lang::$txt['latest_post'] . ': <strong>&quot;' . Utils::$context['latest_post']['link'] . '&quot;</strong> (' . Utils::$context['latest_post']['time'] . ')<br>' : ''), '
  <a href="', Config::$scripturl, '?action=recent">', Lang::$txt['recent_view'], '</a>
  </p>';
  echo '
- </div>
  </div>
  </div>';
 }
@@ -506,12 +499,11 @@ function template_ic_block_online()
 {
  // "Users online" - in order of activity.
  echo '
- <div class="info_center_container">
- <div class="info_block row">
- <div class="info_block_icon column _0">
- ', Utils::$context['show_who'] ? '<a href="' . Config::$scripturl . '?action=who">' : '', '<span class="main_icons people"></span> ', Utils::$context['show_who'] ? '</a>' : '', '
- </div>
- <div class="info_block_information column _100">
+ <div class="info_block">
+ <div class="info_block_icon">
+ ', Utils::$context['show_who'] ? '<a href="' . Config::$scripturl . '?action=who">' : '', '<span class="main_icons people"></span> ', Utils::$context['show_who'] ? '</a>' : '', '
+ </div>
+ <div class="info_block_information">
  <p class="inline">
  ', Utils::$context['show_who'] ? '<a href="' . Config::$scripturl . '?action=who">' : '', '<strong>', Lang::$txt['online'], ': </strong>', Lang::numberFormat(Utils::$context['num_guests']), ' ', Utils::$context['num_guests'] == 1 ? Lang::$txt['guest'] : Lang::$txt['guests'], ', ', Lang::numberFormat(Utils::$context['num_users_online']), ' ', Utils::$context['num_users_online'] == 1 ? Lang::$txt['user'] : Lang::$txt['users'];
 
@@ -550,7 +542,6 @@ function template_ic_block_online()
  echo '
  </p>';
  echo '
- </div>
  </div>
  </div>';
 }

Themes/default/Calendar.template.php

@@ -287,7 +287,7 @@ function template_show_month_grid($grid_name, $is_mini = false)
  if (empty($calendar_data['disable_day_titles']))
  {
  echo '
- <tr>';
+ <tr class="title_bar">';
 
  // If we're showing week links, there's an extra column ahead of the week links, so let's think ahead and be prepared!
  if ($show_week_links === true)
@@ -567,7 +567,7 @@ function template_show_week_grid($grid_name)
  // The main table grid for $this week.
  echo '
  <table class="table_grid calendar_week">
- <tr>
+ <tr class="title_bar">
  <th class="days" scope="col">', Lang::$txt['calendar_day'], '</th>';
  if (!empty($calendar_data['show_events']))
  echo '
@@ -747,14 +747,11 @@ function template_calendar_top($calendar_data)
 {
  echo '
  <div class="calendar_top roundframe', empty($calendar_data['disable_title']) ? ' noup' : '', '">
- <div id="calendar_viewselector" class="buttonrow floatleft">
+ <div id="calendar_viewselector" class="buttonrow">
  <a href="', Config::$scripturl, '?action=calendar;viewlist;year=', Utils::$context['current_year'], ';month=', Utils::$context['current_month'], ';day=', Utils::$context['current_day'], '" class="button', Utils::$context['calendar_view'] == 'viewlist' ? ' active' : '', '">', Lang::$txt['calendar_list'], '</a>
  <a href="', Config::$scripturl, '?action=calendar;viewmonth;year=', Utils::$context['current_year'], ';month=', Utils::$context['current_month'], ';day=', Utils::$context['current_day'], '" class="button', Utils::$context['calendar_view'] == 'viewmonth' ? ' active' : '', '">', Lang::$txt['calendar_month'], '</a>
  <a href="', Config::$scripturl, '?action=calendar;viewweek;year=', Utils::$context['current_year'], ';month=', Utils::$context['current_month'], ';day=', Utils::$context['current_day'], '" class="button', Utils::$context['calendar_view'] == 'viewweek' ? ' active' : '', '">', Lang::$txt['calendar_week'], '</a>
  </div>
- ', template_button_strip(Utils::$context['calendar_buttons'], 'right');
-
- echo '
  <form action="', Config::$scripturl, '?action=calendar;', Utils::$context['calendar_view'], '" id="', !empty($calendar_data['end_date']) ? 'calendar_range' : 'calendar_navigation', '" method="post" accept-charset="', Utils::$context['character_set'], '">
  <input type="text" name="start_date" id="start_date" value="', trim($calendar_data['start_date']), '" class="date_input start" data-type="date">';
 
@@ -766,6 +763,7 @@ function template_calendar_top($calendar_data)
  echo '
  <input type="submit" class="button" style="float:none" id="view_button" value="', Lang::$txt['view'], '">
  </form>
+ ', template_button_strip(Utils::$context['calendar_buttons'], 'right'), '
  </div><!-- .calendar_top -->';
 }
 

Themes/default/Display.template.php

@@ -37,7 +37,7 @@ function template_main()
 
  // Show new topic info here?
  echo '
- <div id="display_head" class="information">
+ <div id="display_head">
  <h2 class="display_title">
  <span id="top_subject">', Utils::$context['subject'], '</span>', (Utils::$context['is_locked']) ? ' <span class="main_icons lock"></span>' : '', (Utils::$context['is_sticky']) ? ' <span class="main_icons sticky"></span>' : '', '
  </h2>
@@ -230,12 +230,12 @@ function template_main()
  // Show the page index... "Pages: [1]".
  echo '
  <div class="pagesection top">
- ', template_button_strip(Utils::$context['normal_buttons'], 'right'), '
- ', Utils::$context['menu_separator'], '
  <div class="pagelinks floatleft">
  <a href="#bot" class="button">', Lang::$txt['go_down'], '</a>
  ', Utils::$context['page_index'], '
- </div>';
+ </div>
+ ', Utils::$context['menu_separator'], '
+ ', template_button_strip(Utils::$context['normal_buttons'], 'right'), '';
 
  // Mobile action - moderation buttons (top)
  if (!empty(Utils::$context['normal_buttons']))
@@ -267,12 +267,12 @@ function template_main()
  // Show the page index... "Pages: [1]".
  echo '
  <div class="pagesection">
- ', template_button_strip(Utils::$context['normal_buttons'], 'right'), '
- ', Utils::$context['menu_separator'], '
  <div class="pagelinks floatleft">
  <a href="#main_content_section" class="button" id="bot">', Lang::$txt['go_up'], '</a>
  ', Utils::$context['page_index'], '
- </div>';
+ </div>
+ ', Utils::$context['menu_separator'], '
+ ', template_button_strip(Utils::$context['normal_buttons'], 'right'), '';
 
  // Mobile action - moderation buttons (bottom)
  if (!empty(Utils::$context['normal_buttons']))

Themes/default/Errors.template.php

@@ -108,10 +108,12 @@ function template_error_log()
  <div class="pagelinks">
  ', Utils::$context['page_index'], '
  </div>
- <div class="floatright" style="padding: 0 12px">
- <label for="check_all"><strong>', Lang::$txt['check_all'], '</strong></label>
- <input type="checkbox" id="check_all" onclick="invertAll(this, this.form, \'delete[]\');">
- </div>
+ <ul class="buttonlist floatright">
+ <li class="inline_mod_check">
+ <label for="check_all"><strong>', Lang::$txt['check_all'], '</strong></label>
+ <input type="checkbox" id="check_all" onclick="invertAll(this, this.form, \'delete[]\');">
+ </li>
+ </ul>
  </div>';
 
  // We have some errors, must be some mods installed :P