Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle

mod/forum/pix/t/subscribed.svg

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="12px" height="12px" viewBox="0 -1 12 12" style="overflow:visible;enable-background:new 0 -1 12 12;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M0,0v10h12V0H0z M1,2.7l2.7,2.7L1,8.1V2.7z M4.4,6.1l1.2,1.2C5.7,7.4,5.9,7.5,6,7.5s0.3,0,0.4-0.1
-	l1.2-1.2L10.4,9H1.6L4.4,6.1z M8.3,5.4L11,2.7v5.4L8.3,5.4z M11,1v0.3L6.4,5.9c-0.2,0.2-0.5,0.2-0.7,0L1,1.3V1H11z"/>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 12 12" style="enable-background:new 0 0 12 12;" xml:space="preserve">
+<path style="fill:#808080;" d="M0,1v10h12V1H0z M11,2L6,5.7L1,2H11z M11,10H1V1.9L6,7l5-5.1V10z"/>
 </svg>

mod/forum/pix/t/unsubscribed.svg

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
-]>
-<svg version="1.1"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-	 x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"
-	 xml:space="preserve" preserveAspectRatio="xMinYMid meet">
-<defs>
-</defs>
-<path style="fill:#999999;" d="M12,2.8V11H3.8l1-1h5.7L7.6,7.2l0.7-0.7L11,9.1V3.8L12,2.8z M1,9.1V3.7l2.7,2.7l0.7-0.7L1,2.3V2h7.1
-	l1-1H0v9.1L1,9.1z M12,1.2V0h-0.2L0,11.8V12h1.2L12,1.2z"/>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 12 12" style="enable-background:new 0 0 12 12;" xml:space="preserve">
+<circle style="fill:#808080;" cx="6" cy="6" r="2.3"/>
 </svg>

mod/forum/styles.css

@@ -137,3 +137,8 @@ span.unread {
 .path-mod-forum .discussion-nav .prev-discussion {
     float: left;
 }
+
+.path-mod-forum .discussiontoggle {
+    display: inline-block;
+    width: 12px;
+}

theme/bootstrapbase/less/moodle/modules.less

@@ -71,10 +71,6 @@ select {
             }
         }
     }
-    .discussiontoggle {
-        display: inline-block;
-        width: 12px;
-    }
 }
 
 .path-mod-feedback .feedback_bar_image {