Merge branch 'MDL-68825-master' of git://github.com/ferranrecio/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 Jun 2020 00:40:18 +0000 (08:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 Jun 2020 00:40:18 +0000 (08:40 +0800)
mod/h5pactivity/pix/icon.svg
theme/boost/scss/moodle/blocks.scss
theme/boost/style/moodle.css
theme/classic/style/moodle.css

index 97fef57..b3185ab 100644 (file)
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" preserveAspectRatio="xMinYMid meet"><title>h5p finalArtboard 1</title><rect width="24" height="24" rx="3" ry="3" fill="#0882c8"/><path d="M22.1,8a3.37,3.37,0,0,0-2.42-.77H16.05v2H11.71l-.36,1.46a6.32,6.32,0,0,1,1-.35,3.49,3.49,0,0,1,.86-.06,3.24,3.24,0,0,1,2.35.88,2.93,2.93,0,0,1,.9,2.2A3.72,3.72,0,0,1,16,15.19a3.16,3.16,0,0,1-1.31,1.32,3.41,3.41,0,0,1-.67.27H17.7V13.28h1.65A3.8,3.8,0,0,0,22,12.46a3,3,0,0,0,.88-2.28A2.9,2.9,0,0,0,22.1,8Zm-2.44,3a1.88,1.88,0,0,1-1.21.29H17.7V9.2h.87a1.56,1.56,0,0,1,1.13.31,1,1,0,0,1,.3.76A.94.94,0,0,1,19.66,11Z" fill="#fff"/><path d="M12.27,12.05a1.33,1.33,0,0,0-1.19.74l-2.6-.37,1.17-5.2H7.29v4.08H4V7.23H1.1v9.55H4V13.28H7.29v3.49h3.57a3.61,3.61,0,0,1-1.13-.53A3.2,3.2,0,0,1,9,15.43a4,4,0,0,1-.48-1.09L11.09,14a1.32,1.32,0,1,0,1.18-1.92Z" fill="#fff"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><title>h5p</title><rect width="24" height="24" rx="3" ry="3" fill="#0882c8"/><path d="M22.1,8a3.37,3.37,0,0,0-2.42-.77H16.05v2H11.71l-.36,1.46a6.33,6.33,0,0,1,1-.35,3.49,3.49,0,0,1,.86-.06,3.24,3.24,0,0,1,2.35.88,2.93,2.93,0,0,1,.9,2.2A3.72,3.72,0,0,1,16,15.19a3.16,3.16,0,0,1-1.31,1.32,3.41,3.41,0,0,1-.67.27H17.7V13.28h1.65A3.8,3.8,0,0,0,22,12.46a3,3,0,0,0,.88-2.28A2.9,2.9,0,0,0,22.1,8Zm-2.44,3a1.88,1.88,0,0,1-1.21.29H17.7V9.2h.87a1.56,1.56,0,0,1,1.13.31,1,1,0,0,1,.3.76A.94.94,0,0,1,19.66,11Zm-6.07,2.36a1.32,1.32,0,0,1-2.5.59l-2.61.38A4,4,0,0,0,9,15.43a3.2,3.2,0,0,0,.77.81,3.61,3.61,0,0,0,1.13.53H7.29V13.28H4v3.49H1.1V7.23H4v4.08H7.29V7.23H9.65l-1.17,5.2,2.6.37a1.32,1.32,0,0,1,2.51.59Z" fill="#fff"/></svg>
\ No newline at end of file
index 77607a3..8ca7510 100644 (file)
@@ -296,8 +296,8 @@ body.drawer-open-left #region-main.has-blocks {
 
 .block_recentlyaccesseditems {
     img.icon {
-        height: auto;
-        width: auto;
+        height: 24px;
+        width: 24px;
         margin-right: 6px;
     }
 }
index e7e4ed0..dd12fd6 100644 (file)
@@ -12617,8 +12617,8 @@ body.h5p-embed .h5pmessages {
   margin-top: 0; }
 
 .block_recentlyaccesseditems img.icon {
-  height: auto;
-  width: auto;
+  height: 24px;
+  width: 24px;
   margin-right: 6px; }
 
 .block_myoverview .content {
index 97ff4c0..6ba6f7e 100644 (file)
@@ -12832,8 +12832,8 @@ body.h5p-embed .h5pmessages {
   margin-top: 0; }
 
 .block_recentlyaccesseditems img.icon {
-  height: auto;
-  width: auto;
+  height: 24px;
+  width: 24px;
   margin-right: 6px; }
 
 .block_myoverview .content {