Merge branch 'third' into preview

src/icons/svg/collectedCourse.svg

@@ -1,15 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="32px" height="20px" viewBox="0 0 32 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+<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" width="64px" height="40px" viewBox="0 0 64 40" enable-background="new 0 0 64 40" xml:space="preserve">  <image id="image0" width="64" height="40" x="0" y="0"
-        <g id="1.首页备份" transform="translate(-387.000000, -954.000000)">
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAoCAMAAAB5EAzbAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-            <g id="编组-6备份" transform="translate(116.000000, 954.000000)">
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABKVBMVEUAAAD/+Pj/+Pb/9/T/
-                <g id="编组-18备份" transform="translate(271.000000, 0.000000)">
++PT/+PT/+PX/////9/X/+PT/////+fX/+fb/9/T/////+PX/////+PX/9/X/+PT/9/T/9vP/8+//
-                    <path d="M10,0 L22,0 C27.5228475,-1.01453063e-15 32,4.4771525 32,10 C32,15.5228475 27.5228475,20 22,20 L10,20 C4.4771525,20 6.76353751e-16,15.5228475 0,10 C-6.76353751e-16,4.4771525 4.4771525,1.01453063e-15 10,0 Z" id="矩形" fill="#FF5100" opacity="0.05"></path>
+6N//u6D/on//kWj/lnD/q4z/0b//9fH/zbr/pIL/jGH/h1r/i1//rY//5Nr/wqz/il//lW7/1sf/
-                    <g id="shoucang" transform="translate(10.000000, 4.000000)" fill="#FE5C11" fill-rule="nonzero" opacity="0.737776802">
+0cD/k2r/iV3/war/q4v/v6f/2cr/1cb/nnn/mXP/3dD/1sb/vKP/vKL/poX/spX/nXj/uJ7/p4b/
-                        <path d="M3.51111722,11.8358841 C3.00606047,12.157725 2.34560166,11.9912662 2.03884758,11.4672748 C1.89342872,11.2184847 1.84823239,10.9213787 1.91284589,10.6389807 L2.56655461,7.77979671 C2.58241634,7.71199121 2.5606958,7.64072905 2.51000386,7.59426129 L0.370225308,5.6819849 C-0.0742306183,5.28506832 -0.125531303,4.59092584 0.254423758,4.12816419 C0.437033108,3.90516747 0.698955059,3.76625534 0.981933462,3.74232435 L3.79012094,3.5077128 C3.85132176,3.50248211 3.90607248,3.46109818 3.93112283,3.39817613 L5.01308726,0.684220572 C5.23854026,0.118845213 5.86554864,-0.151150366 6.41260593,0.0862303529 C6.67350855,0.199948757 6.87993807,0.414928183 6.98681359,0.684220572 L8.06877804,3.3980223 C8.09382837,3.46109818 8.14857911,3.50263596 8.20977992,3.5077128 L11.0182674,3.74247818 C11.6071753,3.79170814 12.0432311,4.3260071 11.9965805,4.93261256 C11.9746663,5.22209277 11.8429987,5.49123316 11.6298256,5.68229258 L9.49004701,7.59456897 C9.44024635,7.63902978 9.41774605,7.7110286 9.43349624,7.77995054 L10.087205,10.6391345 C10.2225068,11.2306633 9.87120209,11.8266535 9.29774444,11.9692666 C9.02158512,12.0380065 8.73007522,11.9899974 8.48878365,11.836038 L6.08440156,10.3037554 C6.03276544,10.2705141 5.96713542,10.2705141 5.9154993,10.3037554 L3.51096721,11.836038 L3.51111722,11.8358841 Z" id="路径"></path>
+yrb/xK7/6eH/8u3/j2b/zbv/3M//qor/sZP/8Ov/l3H/lW3/7+n/5tz/jmT/i2D/4tj/3dH/2Mn/
-                    </g>
+iFz/08P/il7/iFv/2sv/3tL/j2X/jWL/4db/6eL/mHL/lm//7uj/n3r/7eb/9PD/zLn/zLj////r
-                </g>
+SAPTAAAAFHRSTlMAI3Klv9nzFoLTDH9S6AH+CaqD8iL1SmAAAAABYktHRAcWYYjrAAAAB3RJTUUH
-            </g>
+5gwcBw4ofY/E6AAAAbtJREFUSMetVudawkAQPFKB0DlEsRIBFbGhKPbesSH2gr7/S5iESMnuftT5
-        </g>
+dd/ezORus7d3jLXAJYiSrHACiiyJgouRUN0e3gE8bhWVezWlE7m1Es0L9T5/p3ITfp9DHtCC3eg5
-    </g>
+D2qBZn0o3J3cRDjU9P0e9IZDYw1aO25sCItq9fzB/ceHRxKjY+MxczwxOZXUp1NpmAc7k16Y/8yM
-</svg>
+bmF2jvPsfG2cy8B/4SU2sKDXkVpsjJfwTaigfpZ1AitOpmLWZAT45imD1ZiT6jYMQP2v6SQKTq7H
+OH9gAeu0wQYgu5gAYkXaYBOQBSaC2BZtsA3IIpNAbIc22AVkickgtkcb7AOyzGAXOTik9EXA5QqL
+wuARZXAMuVFkC5yf4PpThCojSeT87BzTX1wiVAn5jQaurqG+dIMxRaSQTNyWnPpcASUKSClbuMu1
+6u8fcJ4LOUw1FMrN+scszjIOE3PjU7ySbOjLxPet46xSF9LT87/+pUJQrIZC9+S03Q0TrxRDo5qq
+jbd3U/8Rp+btpoq1dRufX7qe/6Zmg772F0v157dKTmqDu9r6vlz7v977f2AM4Ilj1mSkr0dWj8+8
+P+Wm0GT+SFi7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDIyLTEyLTI4VDA3OjE0OjQwKzAwOjAwpWzq
+VQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAyMi0xMi0yOFQwNzoxNDo0MCswMDowMNQxUukAAAAASUVO
+RK5CYII=" />
+</svg>

src/icons/svg/collectionCourse.svg

@@ -1,15 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="32px" height="20px" viewBox="0 0 32 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+<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" width="64px" height="40px" viewBox="0 0 64 40" enable-background="new 0 0 64 40" xml:space="preserve">  <image id="image0" width="64" height="40" x="0" y="0"
-        <g id="2.课程页" transform="translate(-387.000000, -876.000000)" fill="#04243C">
+    href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAAAoCAMAAAB5EAzbAAAABGdBTUEAALGPC/xhBQAAACBjSFJN
-            <g id="编组-12备份-11" transform="translate(86.000000, 562.000000)">
+AAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABBVBMVEUAAAAAgIAAKlUAOTkA
-                <g id="收藏" transform="translate(301.000000, 314.000000)">
+M00AKkAAJzsASUkALkYA//8AJEkAMzOqtbrS2NrY3N/Y3eHX3d/T2N2zvcJAUGDJ0dTW297a3+Hb
-                    <path d="M10,0 L22,0 C27.5228475,-1.01453063e-15 32,4.4771525 32,10 C32,15.5228475 27.5228475,20 22,20 L10,20 C4.4771525,20 6.76353751e-16,15.5228475 0,10 C-6.76353751e-16,4.4771525 4.4771525,1.01453063e-15 10,0 Z" id="矩形" opacity="0.05"></path>
+3+LY3uDR2dt6hY8kN0nQ2Nrb3+LY3N+orrnJ0dPa3uLa3+LCyc/T2N3b4OPR19vBy9HL0tWirrRZ
-                    <g id="shoucang" transform="translate(10.000000, 4.000000)" fill-rule="nonzero" opacity="0.1">
+ZoDV2t/K0tTb4OOhqK7W293Kz9La3uLO1dnb4OPO1dfZ3+LAx87V2t7a4ONVY3G2vsfU2dzU2d7a
-                        <path d="M3.51111722,11.8358841 C3.00606047,12.157725 2.34560166,11.9912662 2.03884758,11.4672748 C1.89342872,11.2184847 1.84823239,10.9213787 1.91284589,10.6389807 L2.56655461,7.77979671 C2.58241634,7.71199121 2.5606958,7.64072905 2.51000386,7.59426129 L0.370225308,5.6819849 C-0.0742306183,5.28506832 -0.125531303,4.59092584 0.254423758,4.12816419 C0.437033108,3.90516747 0.698955059,3.76625534 0.981933462,3.74232435 L3.79012094,3.5077128 C3.85132176,3.50248211 3.90607248,3.46109818 3.93112283,3.39817613 L5.01308726,0.684220572 C5.23854026,0.118845213 5.86554864,-0.151150366 6.41260593,0.0862303529 C6.67350855,0.199948757 6.87993807,0.414928183 6.98681359,0.684220572 L8.06877804,3.3980223 C8.09382837,3.46109818 8.14857911,3.50263596 8.20977992,3.5077128 L11.0182674,3.74247818 C11.6071753,3.79170814 12.0432311,4.3260071 11.9965805,4.93261256 C11.9746663,5.22209277 11.8429987,5.49123316 11.6298256,5.68229258 L9.49004701,7.59456897 C9.44024635,7.63902978 9.41774605,7.7110286 9.43349624,7.77995054 L10.087205,10.6391345 C10.2225068,11.2306633 9.87120209,11.8266535 9.29774444,11.9692666 C9.02158512,12.0380065 8.73007522,11.9899974 8.48878365,11.836038 L6.08440156,10.3037554 C6.03276544,10.2705141 5.96713542,10.2705141 5.9154993,10.3037554 L3.51096721,11.836038 L3.51111722,11.8358841 Z" id="路径"></path>
+3+Kos7jZ3+HQ1tzb4OPa4OOmrLjByNDR1trS1tvCy9LDytHO1de8xMjI0NPa3+K0ucPDydDZ3eGd
-                    </g>
+qrG7w8fX3OCAiZvR19ra3+L///8XAzeHAAAAVXRSTlMAAgYJCgwNBwsBBwUwgrbSwZA2EGSz6PDY
-                </g>
+hRkOg/i1LGPj5EuW9YBOZykUpWb9Jq9g4Xj2beVJrPQSO5ug+S/gif7sK0aKjk9Nc0Fi+jNR1SdA
-            </g>
+xByL+4UbJgAAAAFiS0dEVgoN6YkAAAAHdElNRQfmDBwHDxKimCwbAAABlElEQVRIx61W51oCMRDM
-        </g>
+tVxBxF5QUEBUsCFYwC5W7C3v/yrC3cEn7KyCx/zKt5kZbpfNJkJ0QdMN05IsLNPQNcFCsx3ZBxwb
-    </g>
+e7heP+oAnkv1Mat/fTOXWISfRx/hGoPqpTTcaPouh4G/P8yiUz+6NxIfTYyNT/jryanpmdm5+SRl
+hZV0Sf0XFlPKR3pJyuVMsM7miIHlMgmsqDbyq+nOOrWGk9BIeF1h5AuE2upJuzdYzDIGaoMY2E0D
+0v+bnF5tbfdyHZTBDmugSiAHncR2eYMyIeuCNmGFN9gjZEOYJLbPGxwQsinoKT5k9dUaIVuChOQR
+a3BMyRIYyBNGf3qGDMAgSp5jgwugt0ARm0nAPyJRBFRTwFlSuqT6+hViGqCRWigTff4aEnXQyj5u
+evSVHOZp4DAFuO3Sp+4wy0HHOUT8ZwfdMyQbDpQQjU4l6w8cR/t1Jj8+BfrMM8fwmKHaxku1pX99
+4/bDoYrGeoj3ulIfn+x27O+LpfDVqLGb3vCutsiXa/TrPfoDYwhPnOiPrH8+874Bg2PFFM1zJS0A
+AAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMTItMjhUMDc6MTU6MTgrMDA6MDAxocFoAAAAJXRFWHRk
+YXRlOm1vZGlmeQAyMDIyLTEyLTI4VDA3OjE1OjE4KzAwOjAwQPx51AAAAABJRU5ErkJggg==" />
 </svg>