Merge branch '6.0' into 6

silverstripe · Jan 14, 2025 · 4eb6bd5 · 4eb6bd5
2 parents 305700c + 70089c4
commit 4eb6bd5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/client/src/styles/legacy/_CMSMain.scss b/client/src/styles/legacy/_CMSMain.scss
@@ -40,10 +40,6 @@
 }
 
 /**
- * DEPRECATED:
- * .cms-content-tools will be removed in 4.0
- * Use .cms-content-filters instead.
- *
  * Hide certain elements when shown in "sidebar mode"
  */
 .cms-content-tools {

diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Filter.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Filter.ss
@@ -1,6 +1,6 @@
 <div class="view-controls">
     <% if not $TreeIsFiltered %>
-        <button id="filters-button" class="btn btn-secondary icon-button font-icon-search btn--icon-large no-text" title="<% _t('SilverStripe\CMS\Controllers\CMSMain.FILTER', 'Filter') %>"></button>
+        <button id="filters-button" class="btn btn-secondary icon-button font-icon-search btn--icon-large no-text" title="<%t SilverStripe\CMS\Controllers\CMSMain.FILTER 'Filter' %>"></button>
     <% end_if %>
 </div>