Merge branch 'MDL-65144-35' of git://github.com/damyon/moodle into MO…

…ODLE_35_STABLE
moodle · Apr 2, 2019 · 80c1b6b · 80c1b6b
2 parents e9c0b71 + 61adf3b
commit 80c1b6b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/theme/boost/classes/output/core_renderer.php b/theme/boost/classes/output/core_renderer.php
@@ -132,7 +132,7 @@ public function context_header($headerinfo = null, $headinglevel = 1) {
         if ($this->should_display_main_logo($headinglevel)) {
             $sitename = format_string($SITE->fullname, true, array('context' => context_course::instance(SITEID)));
             return html_writer::div(html_writer::empty_tag('img', [
-                'src' => $this->get_logo_url(null, 150), 'alt' => $sitename]), 'logo');
+                'src' => $this->get_logo_url(null, 150), 'alt' => $sitename, 'class' => 'img-fluid']), 'logo');
         }
 
         return parent::context_header($headerinfo, $headinglevel);

diff --git a/theme/boost/templates/core/loginform.mustache b/theme/boost/templates/core/loginform.mustache
@@ -99,7 +99,7 @@
 <div class="card">
     <div class="card-block">
         {{#logourl}}
-            <h2 class="card-header text-center" ><img src="{{logourl}}" title="{{sitename}}" alt="{{sitename}}"/></h2>
+            <h2 class="card-header text-center" ><img src="{{logourl}}" class="img-fluid" title="{{sitename}}" alt="{{sitename}}"/></h2>
         {{/logourl}}
         {{^logourl}}
             <h2 class="card-header text-center">{{sitename}}</h2>

diff --git a/theme/boost/templates/core/signup_form_layout.mustache b/theme/boost/templates/core/signup_form_layout.mustache
@@ -15,7 +15,7 @@
                 <div class="card-body">
                     <div class="card-title text-xs-center">
                         {{#logourl}}
-                            <h2><img src="{{logourl}}" title="{{sitename}}" alt="{{sitename}}"/></h2>
+                            <h2><img src="{{logourl}}" class="img-fluid" title="{{sitename}}" alt="{{sitename}}"/></h2>
                         {{/logourl}}
                         {{^logourl}}
                             <h2>{{sitename}}</h2>

diff --git a/theme/clean/style/custom.css b/theme/clean/style/custom.css
@@ -2,6 +2,7 @@
 -------------------------*/
 div.logo {
     background: url([[setting:logo]]) 0 0 no-repeat;
+    background-size: contain;
     display: block;
     float: left;
     height: 75px;