From 71fa2be9321b512f11e4be0d85d4f401b3313f8e Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Thu, 8 Dec 2016 15:41:04 +0800
Subject: [PATCH] MDL-57114 filemanager: apply btn-sm class to buttons

This commit also creates a new css rule to fix the file picker icons misalignment.
---
 theme/boost/scss/moodle/icons.scss             |  5 +++++
 .../filemanager_modal_generallayout.mustache   | 18 +++++++++---------
 .../filemanager_page_generallayout.mustache    | 14 +++++++-------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/theme/boost/scss/moodle/icons.scss b/theme/boost/scss/moodle/icons.scss
index 65b0c5c87fe..0e040c27b42 100644
--- a/theme/boost/scss/moodle/icons.scss
+++ b/theme/boost/scss/moodle/icons.scss
@@ -61,3 +61,8 @@ span:first-of-type > .icon {
 [data-action=toggle-drawer] .icon {
     margin: 0;
 }
+
+// Apply in special cases where the default icons styles does not work properly. Eg file picker buttons.
+.icon-no-spacing a > .icon {
+    margin: 0;
+}
diff --git a/theme/boost/templates/core/filemanager_modal_generallayout.mustache b/theme/boost/templates/core/filemanager_modal_generallayout.mustache
index e7f40bab2a7..e3b41e22026 100644
--- a/theme/boost/templates/core/filemanager_modal_generallayout.mustache
+++ b/theme/boost/templates/core/filemanager_modal_generallayout.mustache
@@ -7,45 +7,45 @@
     </div>
     <div class="col-md-9">
         <div class="fp-repo-items" tabindex="0">
-            <div class="fp-navbar bg-faded card m-b-0 clearfix">
+            <div class="fp-navbar bg-faded card m-b-0 clearfix icon-no-spacing">
                 <div>
                     <div class="fp-toolbar">
                         <div class="fp-tb-back">
-                            <a href="#" class="btn btn-secondary">{{#str}}back, repository{{/str}}</a>
+                            <a href="#" class="btn btn-secondary btn-sm">{{#str}}back, repository{{/str}}</a>
                         </div>
                         <div class="fp-tb-search">
                             <form></form>
                         </div>
                         <div class="fp-tb-refresh">
-                            <a title="{{#str}}refresh, repository{{/str}}" class="btn btn-secondary" href="#">
+                            <a title="{{#str}}refresh, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
                                 {{#pix}}a/refresh{{/pix}}
                             </a>
                         </div>
                         <div class="fp-tb-logout">
-                            <a title="{{#str}}logout, repository{{/str}}" class="btn btn-secondary" href="#">
+                            <a title="{{#str}}logout, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
                                 {{#pix}}a/logout{{/pix}}
                             </a>
                         </div>
                         <div class="fp-tb-manage">
-                            <a title="{{#str}}settings, repository{{/str}}" class="btn btn-secondary" href="#">
+                            <a title="{{#str}}settings, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
                                 {{#pix}}a/setting{{/pix}}
                             </a>
                         </div>
                         <div class="fp-tb-help">
-                            <a title="{{#str}}help, repository{{/str}}" class="btn btn-secondary" href="#">
+                            <a title="{{#str}}help, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
                                 {{#pix}}a/help{{/pix}}
                             </a>
                         </div>
                         <div class="fp-tb-message"></div>
                     </div>
                     <div class="fp-viewbar btn-group pull-xs-right">
-                        <a role="button" title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary" href="#">
+                        <a role="button" title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary btn-sm" href="#">
                             {{#pix}}fp/view_icon_active, theme{{/pix}}
                         </a>
-                        <a role="button" title="{{#str}}displaydetails, repository{{/str}}" class="fp-vb-details btn btn-secondary" href="#">
+                        <a role="button" title="{{#str}}displaydetails, repository{{/str}}" class="fp-vb-details btn btn-secondary btn-sm" href="#">
                             {{#pix}}fp/view_list_active, theme{{/pix}}
                         </a>
-                        <a role="button" title="{{#str}}displaytree, repository{{/str}}" class="fp-vb-tree btn btn-secondary" href="#">
+                        <a role="button" title="{{#str}}displaytree, repository{{/str}}" class="fp-vb-tree btn btn-secondary btn-sm" href="#">
                             {{#pix}}fp/view_tree_active, theme{{/pix}}
                         </a>
                     </div>
diff --git a/theme/boost/templates/core/filemanager_page_generallayout.mustache b/theme/boost/templates/core/filemanager_page_generallayout.mustache
index a24fba5675e..15c2223ec36 100644
--- a/theme/boost/templates/core/filemanager_page_generallayout.mustache
+++ b/theme/boost/templates/core/filemanager_page_generallayout.mustache
@@ -4,20 +4,20 @@
         <span class="dnduploadnotsupported-message"> - {{#str}}dndnotsupported_insentence{{/str}}{{{helpicon}}}</span>
     </div>
     <div class="fp-navbar bg-faded card m-b-0">
-        <div class="filemanager-toolbar">
+        <div class="filemanager-toolbar icon-no-spacing">
             <div class="fp-toolbar">
                 <div class="fp-btn-add">
-                    <a role="button" title="{{#str}}addfile, repository{{/str}}" class="btn btn-secondary" href="#">
+                    <a role="button" title="{{#str}}addfile, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
                         {{#pix}}a/add_file{{/pix}}
                     </a>
                 </div>
                 <div class="fp-btn-mkdir">
-                    <a role="button" title="{{#str}}makeafolder{{/str}}" class="btn btn-secondary" href="#">
+                    <a role="button" title="{{#str}}makeafolder{{/str}}" class="btn btn-secondary btn-sm" href="#">
                         {{#pix}}a/create_folder{{/pix}}
                     </a>
                 </div>
                 <div class="fp-btn-download">
-                    <a role="button" title="{{#str}}downloadfolder, repository{{/str}}" class="btn btn-secondary" href="#">
+                    <a role="button" title="{{#str}}downloadfolder, repository{{/str}}" class="btn btn-secondary btn-sm" href="#">
                         {{#pix}}a/download_all{{/pix}}
                     </a>
                 </div>
@@ -27,13 +27,13 @@
                 </span>
             </div>
             <div class="fp-viewbar btn-group pull-xs-right">
-                <a title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary" href="#">
+                <a title="{{#str}}displayicons, repository{{/str}}" class="fp-vb-icons btn btn-secondary btn-sm" href="#">
                     {{#pix}}fp/view_icon_active, theme{{/pix}}
                 </a>
-                <a title="{{#str}}displaydetails, repository{{/str}}" class="fp-vb-details btn btn-secondary" href="#">
+                <a title="{{#str}}displaydetails, repository{{/str}}" class="fp-vb-details btn btn-secondary btn-sm" href="#">
                     {{#pix}}fp/view_list_active, theme{{/pix}}
                 </a>
-                <a title="{{#str}}displaytree, repository{{/str}}" class="fp-vb-tree btn btn-secondary" href="#">
+                <a title="{{#str}}displaytree, repository{{/str}}" class="fp-vb-tree btn btn-secondary btn-sm" href="#">
                     {{#pix}}fp/view_tree_active, theme{{/pix}}
                 </a>
             </div>
-- 
2.17.1