Merge branch '6.0/clean-up-button-styles'

bestpractical · Feb 13, 2025 · bb88aca · bb88aca
2 parents b0865dc + 81613de
commit bb88aca
Show file tree

Hide file tree

Showing 95 changed files with 230 additions and 325 deletions.
diff --git a/devel/third-party/bootstrap/README b/devel/third-party/bootstrap/README
@@ -27,6 +27,6 @@ Then manually remove the line of "/# sourceMappingURL=bootstrap.bundle.js.map",
     sass bootstrap.scss bootstrap.css
     postcss --config postcss.config.js --replace bootstrap.css
 
-    cp bootstrap.css RT_PATH/share/static/css/elevator-light/bootstrap.css
+    cp bootstrap.css RT_PATH/share/static/css/elevator/bootstrap.css
 
 5. Update bootstrap version in devel/third-party/README
diff --git a/devel/third-party/bootstrap/bootstrap.scss b/devel/third-party/bootstrap/bootstrap.scss
@@ -31,4 +31,7 @@ $body-tertiary-bg-dark: #2c3539;
 $link-color-dark: #ededed;
 $link-hover-color-dark: #ededed;
 
+/* Set base default RT color */
+$primary: #3858a3;
+
 @import "scss/bootstrap";
diff --git a/share/html/Admin/Articles/Classes/index.html b/share/html/Admin/Articles/Classes/index.html
@@ -76,7 +76,7 @@ <h1><%$caption%>:</h1>
   </div>
   <div class="row mt-2">
     <div class="col-12 text-end">
-      <input type="submit" class="form-control btn btn-primary" value="<&|/l&>Go!</&>" />
+      <input type="submit" class="btn btn-primary" value="<&|/l&>Go!</&>" />
     </div>
   </div>
 </form>

diff --git a/share/html/Admin/Assets/Catalogs/index.html b/share/html/Admin/Assets/Catalogs/index.html
@@ -99,7 +99,7 @@ <h1><% $caption %></h1>
 
   <div class="row mt-2">
     <div class="col-12 text-end">
-      <input type="submit" class="form-control btn btn-primary button" value="<&|/l&>Search</&>" />
+      <input type="submit" class="btn btn-primary" value="<&|/l&>Search</&>" />
     </div>
   </div>
 </form>

diff --git a/share/html/Admin/CustomFields/index.html b/share/html/Admin/CustomFields/index.html
@@ -80,7 +80,7 @@ <h1><% $Type ? loc("Custom Fields for [_1]", $Type) : loc('All Custom Fields') %
 
   <div class="row mt-2">
     <div class="col-12 text-end">
-      <input type="submit" class="form-control btn btn-primary" value="<% loc('Go!') %>" />
+      <input type="submit" class="btn btn-primary" value="<% loc('Go!') %>" />
     </div>
   </div>
 </form>

diff --git a/share/html/Admin/CustomRoles/index.html b/share/html/Admin/CustomRoles/index.html
@@ -84,7 +84,7 @@ <h1><%$title%></h1>
 
 <div class="row mt-2">
   <div class="col-12 text-end">
-    <input type="submit" class="button btn btn-sm" value="<&|/l&>Go!</&>" />
+    <input type="submit" class="btn btn-primary" value="<&|/l&>Go!</&>" />
   </div>
 </div>
 </form>

diff --git a/share/html/Admin/Elements/AddCustomFieldValue b/share/html/Admin/Elements/AddCustomFieldValue
@@ -94,7 +94,7 @@
     </div>
 % }
     <div class="col-1">
-      <input type="submit" class="btn btn-primary btn-sm form-control" name="AddValue" value="<&|/l&>Add</&>" />
+      <input type="submit" class="btn btn-primary btn-sm" name="AddValue" value="<&|/l&>Add</&>" />
     </div>
   </div>
 % $m->callback(CallbackName => 'AfterCustomFieldValueInput', CustomFieldObj => $CustomField, ARGSRef => \%ARGS );

diff --git a/share/html/Admin/Elements/EditCustomFieldValues b/share/html/Admin/Elements/EditCustomFieldValues
@@ -126,7 +126,7 @@
   </div>
 % }
   <div class="col-1">
-    <input type="button" class="delete_custom_field_value button btn btn-primary" data-cfv-id="<% $value->id %>" value="<&|/l&>Delete</&>" onclick="delete_custom_field_value(<% $value->id %>)" />
+    <input type="button" class="delete_custom_field_value btn btn-primary" data-cfv-id="<% $value->id %>" value="<&|/l&>Delete</&>" onclick="delete_custom_field_value(<% $value->id %>)" />
   </div>
 % $m->callback(CallbackName => 'AfterCustomFieldValueInput', CustomFieldObj => $CustomField, CustomFieldValueObj => $value, ARGSRef => \%ARGS );
 </div>

diff --git a/share/html/Admin/Elements/EditRights b/share/html/Admin/Elements/EditRights
@@ -209,8 +209,8 @@ if ( $AddPrincipal ) {
         </p>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-primary button form-control" data-bs-dismiss="modal"><&|/l&>No</&></button>
-        <button type="button" class="btn btn-primary button form-control" id="grant-own-dashboard-rights-confirm"><&|/l&>Yes</&></button>
+        <button type="button" class="btn btn-primary" data-bs-dismiss="modal"><&|/l&>No</&></button>
+        <button type="button" class="btn btn-primary" id="grant-own-dashboard-rights-confirm"><&|/l&>Yes</&></button>
       </div>
     </div>
   </div>

diff --git a/share/html/Admin/Groups/index.html b/share/html/Admin/Groups/index.html
@@ -136,7 +136,7 @@ <h1><% $caption %></h1>
 
       <div class="row mt-2">
         <div class="col-12 text-end">
-          <input type="submit" class="form-control btn btn-primary button" name="Go" value="<&|/l&>Go!</&>" />
+          <input type="submit" class="btn btn-primary" name="Go" value="<&|/l&>Go!</&>" />
         </div>
       </div>
     </div>

diff --git a/share/html/Admin/Lifecycles/index.html b/share/html/Admin/Lifecycles/index.html
@@ -58,7 +58,7 @@
       </div>
     </div>
     <div class="col-auto">
-      <input type="submit" name="Go" class="form-control btn btn-primary" value="<&|/l&>Go!</&>" />
+      <input type="submit" name="Go" class="btn btn-primary" value="<&|/l&>Go!</&>" />
     </div>
   </div>
 
@@ -118,7 +118,7 @@
   <div class="row mt-2">
     <div class="col-12">
       <div align="right">
-        <input type="submit" name="Submit" class="form-control btn btn-primary" value="<&|/l&>Update</&>" />
+        <input type="submit" name="Submit" class="btn btn-primary" value="<&|/l&>Update</&>" />
       </div>
     </div>
   </div>

diff --git a/share/html/Admin/PageLayouts/index.html b/share/html/Admin/PageLayouts/index.html
@@ -88,7 +88,7 @@
 %# no indent here is intentional to avoid extra spaces among buttons
 <span draggable="<% $type eq 'Default' ? 'false' : 'true' %>" class="pagelayout-order <% $type eq 'Default' ? 'default' : '' %>" id="Order-<% $i %>" data-index="<% $i %>">
           <span class="pagelayout-order-placeholder border border-warning btn mx-1 mt-1"><% loc('Place here') %></span>
-          <button type="button" class="button btn btn-primary mx-1 mt-1">
+          <button type="button" class="btn btn-primary mx-1 mt-1">
             <% $type =~ /^CustomField.\{(.+)\}/ ? loc('Custom Field [_1]', $1) : loc($type) %>
           </button>
         </span>\

diff --git a/share/html/Admin/Queues/People.html b/share/html/Admin/Queues/People.html
@@ -78,7 +78,7 @@ <h3><&|/l&>New watchers</&></h3>
       <div class="row mt-2">
         <& /Elements/SelectUsers &>
         <div class="col-auto">
-          <input type="submit" class="button btn btn-primary form-control" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
+          <input type="submit" class="btn btn-primary" name="OnlySearchForPeople" value="<&|/l&>Go!</&>" />
         </div>
       </div>
       <br />
@@ -87,7 +87,7 @@ <h3><&|/l&>New watchers</&></h3>
       <div class="row mt-2">
         <& /Elements/SelectGroups &>
         <div class="col-auto">
-          <input type="submit" class="button btn btn-primary form-control" name="OnlySearchForGroup" value="<&|/l&>Go!</&>" />
+          <input type="submit" class="btn btn-primary" name="OnlySearchForGroup" value="<&|/l&>Go!</&>" />
         </div>
       </div>
 

diff --git a/share/html/Admin/Queues/index.html b/share/html/Admin/Queues/index.html
@@ -86,7 +86,7 @@ <h1><%$caption%></h1>
   <div class="row mt-2">
     <div class="col-12">
       <div align="right">
-        <input type="submit" class="form-control btn btn-primary" value="<&|/l&>Go!</&>" />
+        <input type="submit" class="btn btn-primary" value="<&|/l&>Go!</&>" />
       </div>
     </div>
   </div>

diff --git a/share/html/Admin/Scrips/index.html b/share/html/Admin/Scrips/index.html
@@ -63,7 +63,7 @@ <h1><%$caption%></h1>
   <div class="row mt-2">
     <div class="col-12">
       <div align="right">
-        <input type="submit" class="form-control btn btn-primary" value="<&|/l&>Go!</&>" />
+        <input type="submit" class="btn btn-primary" value="<&|/l&>Go!</&>" />
       </div>
     </div>
   </div>

diff --git a/share/html/Admin/Tools/Configuration.html b/share/html/Admin/Tools/Configuration.html
@@ -159,7 +159,7 @@
 % }
 
 %   } else {
-    <a class="mt-2 button btn btn-primary" href="?LoadSize=1"><&|/l&>Load Size</&></a>
+    <a class="mt-2 btn btn-primary" href="?LoadSize=1"><&|/l&>Load Size</&></a>
 %   }
 </&>
 
@@ -177,7 +177,7 @@
   <div class="mason-cache-info py-1 d-inline-block">
     <&|/l&>Cache created</&>: <% $mason_obj_date->AsString %>
   </div>
-  <a class="button btn btn-primary btn-sm clear-mason-cache float-end" href="javascript:;"><&|/l&>Clear Mason Cache</&></a>
+  <a class="btn btn-primary btn-sm clear-mason-cache float-end" href="javascript:;"><&|/l&>Clear Mason Cache</&></a>
 </div>
 <script type="text/javascript">
 jQuery('a.clear-mason-cache').click( function() {

diff --git a/share/html/Admin/Tools/GnuPG.html b/share/html/Admin/Tools/GnuPG.html
@@ -58,7 +58,7 @@
   <&| /Elements/LabeledValue, Label => '' &>
     <div class="input-group">
       <input name="Query" class="form-control" value="<% $ARGS{Query} // '' %>" size="40" />
-      <input name="Search" type="submit" class="button btn btn-primary" value="<&|/l&>Search</&>" />
+      <input name="Search" type="submit" class="btn btn-primary" value="<&|/l&>Search</&>" />
     </div>
   </&>
 % if ( @search_results ) {

diff --git a/share/html/Admin/Tools/ScheduledProcesses/index.html b/share/html/Admin/Tools/ScheduledProcesses/index.html
@@ -94,7 +94,7 @@
 <div class="row mt-2 align-items-center">
   <div class="col-12">
     <div class="text-end">
-      <input type="submit" name="Submit" class="form-control btn btn-primary" value="<&|/l&>Update</&>" />
+      <input type="submit" name="Submit" class="btn btn-primary" value="<&|/l&>Update</&>" />
     </div>
   </div>
 </div>

diff --git a/share/html/Admin/Tools/Theme.html b/share/html/Admin/Tools/Theme.html
@@ -71,8 +71,8 @@ <h3>Logo</h3>
           <&|/l, $valid_image_types &>Your system supports automatic color suggestions for: [_1]</&>
 % }
         </div>
-        <input class="button btn btn-primary mt-1" name="reset_logo" value="<&|/l&>Reset to default RT Logo</&>" type="submit" />
-        <input class="button btn btn-primary mt-1" type="submit" value="<&|/l&>Upload</&>" />
+        <input class="btn btn-primary mt-1" name="reset_logo" value="<&|/l&>Reset to default RT Logo</&>" type="submit" />
+        <input class="btn btn-primary mt-1" type="submit" value="<&|/l&>Upload</&>" />
       </form>
     </div>
 
@@ -91,10 +91,10 @@ <h3><&|/l&>Customize the RT theme</&></h3>
       <&| /Elements/LabeledValue, Label => loc('Select a color for the section') &>
         <div class="row">
 % if ($colors) {
-          <div class="col button btn btn-primary primary-colors">
+          <div class="col btn btn-primary primary-colors">
 %   for (@$colors) {
 %     my $fg = $_->{l} >= $text_threshold ? 'black' : 'white';
-            <button type="button" class="button btn btn-primary color-template form-control"
+            <button type="button" class="btn btn-primary color-template"
                     style="background-color: rgb(<% $_->{c} %>); color: <% $fg %>;">
     <&|/l&>Text</&>
             </button>
@@ -115,10 +115,10 @@ <h3><&|/l&>Custom CSS (Advanced)</&></h3>
 
     <form method="POST" id="custom-css-form" action="">
       <textarea class="form-control mb-2" rows="20" id="user_css" name="user_css" wrap="off"><% $user_css %></textarea>
-      <input id="try" type="button" class="button btn btn-primary" value="<&|/l&>Try</&>" />
-      <input id="reset" type="reset" class="button btn btn-primary" value="<&|/l&>Reset</&>" type="submit" />
-      <input name="reset_css" class="button btn btn-primary" value="<&|/l&>Reset to default RT Theme</&>" type="submit" />
-      <input class="button btn btn-primary" value="<&|/l&>Save</&>" type="submit" />
+      <input id="try" type="button" class="btn btn-primary" value="<&|/l&>Try</&>" />
+      <input id="reset" type="reset" class="btn btn-primary" value="<&|/l&>Reset</&>" type="submit" />
+      <input name="reset_css" class="btn btn-primary" value="<&|/l&>Reset to default RT Theme</&>" type="submit" />
+      <input class="btn btn-primary" value="<&|/l&>Save</&>" type="submit" />
     </form>
   </div>
 </div>
@@ -130,8 +130,8 @@ <h3><&|/l&>Custom CSS (Advanced)</&></h3>
     ['Title bar'    => ['div#header']],
     ['Page title'   => ['div#header h1']],
     ['Page content' => ['div#body, .body-content-class']],
-    ['Buttons'      => ['input[type="reset"], input[type="submit"], input[class="button"]']],
-    ['Button hover' => ['input[type="reset"]:hover, input[type="submit"]:hover, input[class="button"]:hover']],
+    ['Buttons'      => ['input[type="reset"], input[type="submit"], input[class="btn"]']],
+    ['Button hover' => ['input[type="reset"]:hover, input[type="submit"]:hover, input[class="btn"]:hover']],
     ['Search results' => ['table.collection-as-table th.collection-as-table a']],
     ['Portlet Text'   => ['.titlebox .titlebox-title .left a, .titlebox .titlebox-title .left']],
     ['Selected bubble'          => ['.ts-wrapper.multi .ts-control > .item']],

diff --git a/share/html/Admin/Users/DashboardsInMenu.html b/share/html/Admin/Users/DashboardsInMenu.html
@@ -71,7 +71,7 @@
 <div class="mt-3 mb-1 ms-3">
   <form method="post" action="DashboardsInMenu.html">
     <input type="hidden" name="id" value="<% $id %>" />
-    <input type="submit" name="ResetDashboards" class="button form-control btn btn-primary" value="<% loc('Reset dashboards to default') %>">
+    <input type="submit" name="ResetDashboards" class="btn btn-primary" value="<% loc('Reset dashboards to default') %>">
   </form>
 </div>
 </&>
@@ -97,7 +97,7 @@
 <div class="mt-3 mb-1 ms-3">
   <form method="post" action="DashboardsInMenu.html">
     <input type="hidden" name="id" value="<% $id %>" />
-    <input type="submit" name="ResetReports" class="button form-control btn btn-primary" value="<% loc('Reset reports to default') %>">
+    <input type="submit" name="ResetReports" class="btn btn-primary" value="<% loc('Reset reports to default') %>">
   </form>
 </div>
 </&>

diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
@@ -169,7 +169,7 @@
 %     if ( $UserObj->Image ) {
         <div class="row mt-2">
           <div class="col text-end">
-            <a href="?id=<% $UserObj->Id %>&DeleteImage=1" class="button btn btn-primary"><% loc('Delete Image') %></a>
+            <a href="?id=<% $UserObj->Id %>&DeleteImage=1" class="btn btn-primary"><% loc('Delete Image') %></a>
           </div>
         </div>
 %     }
@@ -257,7 +257,7 @@ <h5 class="modal-title"><&|/l&>Anonymize User</&></h5>
 
           <div class="row mt-2 justify-content-end">
             <div class="col-auto">
-              <button type="Submit" data-bs-dismiss="modal" class="button btn-primary btn form-control"><&|/l&>Anonymize</&></button>
+              <button type="Submit" data-bs-dismiss="modal" class="btn-primary btn"><&|/l&>Anonymize</&></button>
             </div>
           </div>
         </form>

diff --git a/share/html/Admin/Users/index.html b/share/html/Admin/Users/index.html
@@ -232,7 +232,7 @@
 
   <div class="row mt-2">
     <div class="col-12 text-end">
-      <input type="submit" class="button btn btn-primary" value="<&|/l&>Go!</&>" name="Go" />
+      <input type="submit" class="btn btn-primary" value="<&|/l&>Go!</&>" name="Go" />
     </div>
   </div>
   </form>

diff --git a/share/html/Articles/Article/Elements/ShowSavedSearches b/share/html/Articles/Article/Elements/ShowSavedSearches
@@ -75,11 +75,11 @@
 
   <div class="col-auto">
 %     if ($CurrentSearch && $CurrentSearch ne 'new') {
-<input class="form-control btn btn-primary" value="<%loc('Update')%>" name="Update" type="submit" />&nbsp;
-<input class="form-control btn btn-primary" value="<%loc('Save new')%>" name="Save" type="submit" />&nbsp;
-<input class="form-control btn btn-primary" value="<%loc('Delete')%>" name="Delete" type="submit" />&nbsp;
+<input class="btn btn-primary" value="<%loc('Update')%>" name="Update" type="submit" />&nbsp;
+<input class="btn btn-primary" value="<%loc('Save new')%>" name="Save" type="submit" />&nbsp;
+<input class="btn btn-primary" value="<%loc('Delete')%>" name="Delete" type="submit" />&nbsp;
 %     } else {
-<input class="form-control btn btn-primary" value="<%loc('Save')%>" name="Save" type="submit" />
+<input class="btn btn-primary" value="<%loc('Save')%>" name="Save" type="submit" />
 %     }
   </div>
 </div>
@@ -92,7 +92,7 @@
     <& SelectSavedSearches, Name => 'LoadSavedSearch', Default => $CurrentSearch &>
   </div>
   <div class="col-auto">
-    <input class="form-control btn btn-primary" value="<%loc('Load')%>" name="Load" type="submit">
+    <input class="btn btn-primary" value="<%loc('Load')%>" name="Load" type="submit">
   </div>
 </div>
 <& /Widgets/TitleBoxEnd &>

diff --git a/share/html/Articles/Article/ExtractIntoClass.html b/share/html/Articles/Article/ExtractIntoClass.html
@@ -67,7 +67,7 @@ <h2><&|/l&>Create a new article in</&>:</h2>
                         &>
 <div class="row mt-2">
   <div class="col-12">
-    <input class="form-control btn btn-primary" type="submit" value="<%loc('Create')%>" />
+    <input class="btn btn-primary" type="submit" value="<%loc('Create')%>" />
   </div>
 </div>
 </form>

diff --git a/share/html/Articles/Article/ExtractIntoTopic.html b/share/html/Articles/Article/ExtractIntoTopic.html
@@ -59,7 +59,7 @@
                         &>
 <div class="row mt-2">
   <div class="col-12">
-    <input class="form-control btn btn-primary" type="submit" value="<%loc('Create')%>" />
+    <input class="btn btn-primary" type="submit" value="<%loc('Create')%>" />
   </div>
 </div>
 </form>

diff --git a/share/html/Articles/Article/Search.html b/share/html/Articles/Article/Search.html
@@ -74,7 +74,7 @@
     <& Elements/SelectSavedSearches, Name => 'LoadSavedSearch', Default => $CurrentSearch &>
   </div>
   <div class="col-auto">
-    <input class="btn btn-primary form-control" value="<%loc('Load')%>" name="Load" type="submit" />
+    <input class="btn btn-primary" value="<%loc('Load')%>" name="Load" type="submit" />
   </div>
 </div>
 <& /Widgets/TitleBoxEnd &>

diff --git a/share/html/Articles/Elements/BeforeMessageBox b/share/html/Articles/Elements/BeforeMessageBox
@@ -64,7 +64,6 @@
         </option>
 % }
     </select>
-    <& /Elements/Submit, Name => 'Go', Value => 'Go', Label => loc("Go") &>
   </&>
 
 % if ( $ARGS{$name_prefix .'Articles-Include-Topic'} ) {
@@ -75,7 +74,6 @@
       <option value="<% $art->id %>"><%$art->Name||loc('(no name)')%>: <%$art->Summary%></option>
 % }
     </select>
-    <& /Elements/Submit, Name => 'Go', Value => 'Go', Label => loc("Go") &>
   </&>
 % } # End if Articles-Include-Topic
 % } # End if @$topics

diff --git a/share/html/Asset/Elements/ShowSummary b/share/html/Asset/Elements/ShowSummary
@@ -135,7 +135,7 @@ my $modify_inline
 %           }
             <div class="row mt-2">
               <div class="col-12 text-end">
-                <input type="submit" class="button btn btn-primary" value="<&|/l&>Save</&>" />
+                <input type="submit" class="btn btn-primary" value="<&|/l&>Save</&>" />
               </div>
             </div>
           </form>

diff --git a/share/html/Asset/Search/Bulk.html b/share/html/Asset/Search/Bulk.html
@@ -79,7 +79,7 @@
     <div class="row mt-2">
       <div class="buttons col-12">
         <span class="caption"></span>
-          <input type="submit" id="bulk-update-create-linked-ticket" name="CreateLinkedTicket"  value="Create Linked Ticket" class="button btn btn-primary form-control" alt="Create a ticket with checked assets linked" />
+          <input type="submit" id="bulk-update-create-linked-ticket" name="CreateLinkedTicket"  value="Create Linked Ticket" class="btn btn-primary" alt="Create a ticket with checked assets linked" />
       </div>
     </div>
   </div>

diff --git a/share/html/Asset/Widgets/Display/Basics b/share/html/Asset/Widgets/Display/Basics
@@ -63,7 +63,7 @@
     <& /Asset/Elements/EditBasics, AssetObj => $AssetObj &>
     <div class="row mt-2">
       <div class="col-12 text-end">
-        <input type="submit" class="button btn btn-primary" value="<&|/l&>Save</&>" />
+        <input type="submit" class="btn btn-primary" value="<&|/l&>Save</&>" />
       </div>
     </div>
     <& /Widgets/Spinner &>

diff --git a/share/html/Asset/Widgets/Display/Dates b/share/html/Asset/Widgets/Display/Dates
@@ -65,7 +65,7 @@
     </div>
     <div class="row mt-2">
       <div class="col-12 text-end">
-        <input type="submit" class="button btn btn-primary" value="<&|/l&>Save</&>" />
+        <input type="submit" class="btn btn-primary" value="<&|/l&>Save</&>" />
       </div>
     </div>
     <& /Widgets/Spinner &>

diff --git a/share/html/Asset/Widgets/Display/Links b/share/html/Asset/Widgets/Display/Links
@@ -68,7 +68,7 @@
 
     <div class="row mt-2">
       <div class="col-12 text-end">
-        <input type="submit" class="button btn btn-primary" value="<&|/l&>Save</&>" />
+        <input type="submit" class="btn btn-primary" value="<&|/l&>Save</&>" />
       </div>
     </div>
     <& /Widgets/Spinner &>