Merge remote-tracking branch 'origin/dev' into dev

src/frontend/views/teacher-manager/add.php

@@ -23,7 +23,6 @@ AppAsset::addCss($this, '@web/assets/css/teacher_form.css');
 
 		<div class="teacher-info">
 			<textarea id="teacher-intro" name="intro" placeholder="请输入讲师介绍..."></textarea>
-			<p class="text-number">20 / 500</p>
 		</div>
 			
 		<input type="hidden" name="avatar" value="{{avatar}}">

src/frontend/web/css/login.css

@@ -150,14 +150,15 @@ a,a:hover,a:link {
 }
 .input-wrapper input {
     width: 100%;
-    height: 50px;
-    line-height: 50px;
+    height:50px;
+    line-height: 30px;
     border: none;
     border-bottom: 1px solid #f3f3f3;
     font-size: 14px;
     background-color: transparent;
     outline: none;
     padding: 10px;
+    box-sizing: border-box;
 }
 
 .last-wrapper input {

src/frontend/web/fonts/icomoon.svg

@@ -90,7 +90,7 @@
 <glyph unicode="&#xe902;" glyph-name="fav-empty" d="M509.607 816.886c9.083 0 17.328-4.84 20.996-12.332l97.262-197.442c5.614-11.404 16.664-19.359 29.438-21.216l223.739-32.552c8.421-1.216 15.604-6.851 18.233-14.255 2.52-7.184 0.596-15.062-5.085-20.587l-163.938-160.114c-8.95-8.751-12.995-21.171-10.917-33.37l38.012-222.061c1.325-7.737-2.165-15.426-8.906-19.978-4.088-2.741-8.862-4.156-13.813-4.156-4.023 0-7.999 0.972-11.425 2.74l-195.055 102.765c-5.768 3.006-12.156 4.553-18.542 4.553-6.365 0-12.728-1.547-18.519-4.553l-194.833-102.678c-3.559-1.855-7.602-2.828-11.669-2.828-4.862 0-9.723 1.459-13.547 4.023-6.962 4.685-10.476 12.42-9.128 20.155l38.012 222.017c2.078 12.199-1.988 24.62-10.939 33.37l-163.96 160.17c-5.635 5.492-7.558 13.348-5.061 20.454 2.631 7.481 9.812 13.117 18.299 14.332l223.674 32.552c12.839 1.857 23.868 9.814 29.481 21.216l97.195 197.397c3.714 7.525 11.979 12.377 20.995 12.377zM509.607 855.096c-24.044 0-45.923-13.226-56.177-33.956l-97.24-197.442-223.674-32.542c-22.983-3.304-42.101-18.718-49.482-39.659-7.381-21.048-1.812-44.232 14.432-60.033l163.916-160.126-38.012-222.017c-3.868-22.408 6.032-44.82 25.459-57.947 10.697-7.116 23.204-10.785 35.757-10.785 10.299 0 20.664 2.475 30.056 7.337l194.988 102.721 195.033-102.719c9.369-4.862 19.713-7.337 29.99-7.337 12.575 0 25.082 3.669 35.779 10.785 19.426 13.127 29.305 35.538 25.461 57.947l-38.013 222.017 163.938 160.126c16.221 15.812 21.811 38.985 14.408 60.033-7.403 20.941-26.519 36.354-49.503 39.659l-223.674 32.541-97.241 197.442c-10.187 20.729-32.111 33.956-56.2 33.956v0z" />
 <glyph unicode="&#xe903;" glyph-name="fav-full" d="M507.612 890.572c-11.287 0-20.219-3.343-26.677-10.176-6.577-6.687-11.667-14.873-15.132-24.178l-102.462-236.562-275.021-24.689c-6.458-1.237-12.406-4.097-17.739-8.794-5.339-4.726-8.698-11.169-9.812-19.481-1.236-8.186 0.755-16.26 5.718-24.201 5.091-7.924 11.16-15.12 18.222-21.711l9.812-8.312 22.705-19.479c9.304-7.922 19.598-16.741 31.255-26.411l35.104-29.531c27.913-23.551 59.289-50.346 94.4-80.363l-30.262-123.563c-4.214-15.869-8.19-31.375-12.031-46.764-3.839-15.262-7.33-29.263-10.299-41.936-2.979-12.649-5.583-23.429-7.933-32.611l-4.468-17.248c-1.25-5.213-0.618-10.419 1.733-15.384 2.36-4.968 6.078-9.306 11.169-12.771 4.965-3.609 10.659-5.718 16.861-6.71 1.381-0.195 2.75-0.268 4.116-0.268 4.775 0 9.492 1.163 14.129 3.367 2.979 1.259 8.809 4.213 17.371 8.818 8.677 4.7 18.849 10.662 30.759 17.733 11.787 7.077 25.069 14.635 39.583 22.946 14.507 8.187 29.264 16.499 44.021 24.689 34.5 19.355 72.701 41.43 114.884 66.115l232.342-134.1 12.916-4.822c5.575-2.107 9.909-3.1 12.889-3.1 8.941 0 16.873 1.986 24.071 5.693 7.061 3.85 9.805 11.65 7.935 23.452-0.619 2.353-1.731 8.064-3.467 17.248l-6.71 32.972c-2.728 13.039-5.572 27.43-8.43 43.3-2.979 15.89-6.322 31.761-9.802 47.63-7.814 37.723-16.62 79.786-26.783 126.154l184.337 164.126c7.689 8.94 14.016 16.381 19.103 22.581s7.57 13.399 7.57 21.589c0 8.794-2.359 15.263-7.077 19.478-4.844 4.098-13.152 7.558-24.931 10.542l-275.142 25.559-99.63 236.561c-1.236 2.352-2.847 5.208-4.956 8.794-2.106 3.465-4.588 7.077-7.572 10.541-2.978 3.607-6.686 6.707-11.032 9.301-4.476 2.618-9.686 3.976-15.637 3.976z" />
 <glyph unicode="&#xe904;" glyph-name="zan-empty" d="M684.937 22.109c-158.554 0-297.911 0-351.748 0-10.176-8.954-23.491-14.429-38.115-14.429h-173.274c-31.899 0-57.757 25.84-57.757 57.713v432.851c0 31.874 25.859 57.713 57.757 57.713h173.275c16.772 0 31.827-7.188 42.379-18.596 35.875 29.206 130.893 120.127 130.893 263.878 0 86.12 86.635 86.57 86.635 86.57s187.713 26.604 187.713-201.998c0-49.597-28.88-129.854-28.88-129.854h43.319c0 0 202.152 33.816 202.152-216.425-0.001-250.243-70.842-317.424-274.349-317.424zM295.074 469.388c0 15.938-12.932 28.857-28.88 28.857h-115.516c-15.949 0-28.88-12.919-28.88-28.857v-375.137c0-15.937 12.932-28.857 28.88-28.857h115.515c15.949 0 28.88 12.92 28.88 28.857v375.137zM771.575 498.245h-173.275c0 0 86.637 85.217 86.637 201.997s-82.574 129.858-115.515 129.858c-32.94 0-43.319-10.371-43.319-28.858 0-215.975-173.272-331.853-173.272-331.853v-389.566c0 0 190.869 0 346.545 0s202.152 52.752 202.152 245.282c0 192.528-129.953 173.14-129.953 173.14z" />
-<glyph unicode="&#xe905;" glyph-name="zan-full" horiz-adv-x="1025" d="M43.040 558.32c-23.728 0.048-43-19.152-43.040-42.88 0-0.136 0-0.264 0-0.4v-520c-0.048-23.632 19.008-42.864 42.64-43.040 1.040 0 1.92 0.56 2.96 0.56h120.4v605.68h-121.2c-0.64-0.24-1.2 0.080-1.76 0.080zM1022.4 466.56c1.616 25.912-4.72 51.704-18.16 73.92-21.704 35.392-59.56 57.696-101.040 59.52-2.6 0.832-5.28 1.392-8 1.68h-238.16c16.696 48.112 25.216 98.68 25.2 149.6-0.080 33.288-3.752 66.464-10.96 98.96h-0.72c-14.392 66.776-80.192 109.232-146.968 94.832-57.808-12.456-98.704-64.104-97.592-123.232 0-2.16 0.56-4.24 0.64-6.4-0.616-111.104-72.096-209.408-177.6-244.24v-618.72h561.92c23.968-0.136 47.456 6.704 67.6 19.68 18.096 12.032 32.744 28.576 42.48 48 0.8 1.040 1.36 2.16 2.080 3.28s0.4 0.56 0.56 0.88v0c2.568 3.672 4.536 7.72 5.84 12l92.080 412.48c0.856 4.128 1.104 8.36 0.72 12.56 0 0.56 0 1.12 0 1.68s0.24 2.32 0.080 3.52z" />
+<glyph unicode="&#xe905;" glyph-name="zan-full" horiz-adv-x="1025" d="M117.6 540.8c-19.958 0.038-36.17-16.112-36.204-36.070 0-0.116 0-0.224 0-0.34v-437.42c-0.038-19.882 15.988-36.054 35.87-36.204 0.875 0 1.614 0.47 2.49 0.47h101.28v509.49h-101.95c-0.54-0.2-1.010 0.070-1.48 0.070zM941.42 463.61c1.356 21.797-3.97 43.494-15.282 62.18-18.254 29.772-50.1 48.536-84.99 50.070-2.19 0.702-4.44 1.172-6.73 1.41h-200.34c14.046 40.472 21.212 83.010 21.2 125.84-0.070 27.998-3.153 55.905-9.22 83.24h-0.608c-12.104 56.172-67.454 91.882-123.628 79.772-48.628-10.476-83.026-53.924-82.092-103.662 0-1.82 0.47-3.57 0.54-5.38-0.516-93.458-60.646-176.148-149.391-205.45v-520.46h472.68c20.158-0.116 39.916 5.642 56.861 16.551 15.226 10.122 27.544 24.036 35.73 40.38 0.67 0.875 1.14 1.82 1.75 2.76s0.34 0.47 0.47 0.74v0c2.158 3.092 3.816 6.49 4.91 10.089l77.46 346.97c0.714 3.468 0.928 7.030 0.608 10.568 0 0.47 0 0.94 0 1.41s0.2 1.95 0.070 2.96z" />
 <glyph unicode="&#xe906;" glyph-name="jian" d="M512 940c-271.744 0-492-220.288-492-492s220.256-491.968 492-491.968c271.712 0 492 220.256 492 491.968s-220.32 492-492 492zM282.432 635.072c35.328-2.816 79.552-4.192 132.704-4.192-0.704 26.592-1.76 45.632-3.168 57.184 13.984-2.080 26.752-3.136 38.304-3.136 3.488 0 5.248-1.152 5.248-3.392 0-2.272-1.056-4.128-3.168-5.504-3.84-2.080-5.76-7.52-5.76-16.256v-28.832h133.76c0 23.424-1.056 42.144-3.168 56.128 14.016-2.080 26.752-3.136 38.304-3.136 3.456 0 5.216-0.896 5.216-2.624 0-1.76-1.024-3.328-3.136-4.704-3.84-2.464-5.792-7.872-5.792-16.256v-29.376c52.8 0 96.864 1.376 132.192 4.192v-33.568c-35.328 2.784-79.36 4.192-132.192 4.192v-46.144h-31.456v46.144h-133.76v-44.064h-31.456v44.064c-53.152 0-97.376-1.408-132.704-4.192v33.472zM379.456 208.64c3.136 33.92 4.704 66.976 4.704 99.136v90.752c-26.592-29.024-53.504-53.152-80.768-72.384-8.032 13.632-17.312 23.072-27.808 28.32 59.456 32.192 110.336 81.12 152.64 146.848-55.584-0.352-101.952-1.568-139.008-3.68v34.080c37.056-1.76 88.992-3.136 155.776-4.192 10.848 18.176 19.744 38.464 26.752 60.832 11.552-6.656 21.504-10.752 29.92-12.32s12.576-3.776 12.576-6.56-2.432-5.056-7.328-6.816c-4.896-1.76-14.528-13.472-28.832-35.136 105.984 0 191.296 1.376 255.968 4.192v-34.080c-40.896 2.784-131.456 4.192-271.712 4.192-15.744-25.184-32-48.256-48.768-69.248v-124.832c0-31.136 1.76-64.16 5.248-99.136h-39.36zM746.080 332.928c-37.408 3.488-82.688 5.248-135.84 5.248v-88.672c0-13.632-5.44-23.328-16.288-29.12-10.848-5.76-31.456-8.8-61.888-9.152-1.056 13.28-6.112 26.016-15.232 38.272 18.528-2.784 32.096-4.192 40.672-4.192s14.688 1.12 18.336 3.392c3.68 2.272 5.536 6.72 5.536 13.376v76.064c-61.568 0-109.824-1.76-144.768-5.248v35.648c41.6-3.488 89.856-5.248 144.768-5.248v23.616l63.456 45.088h-89.728c-32.864 0-60.128-1.216-81.824-3.68v32c29.376-2.080 65.568-3.136 108.576-3.136 43.040 0 84.48 1.056 124.32 3.136v-27.808c-11.52 0-21.856-3.328-30.944-9.984l-65.024-48.256v-11.040c51.744 0 97.024 1.76 135.84 5.248v-35.552z" />
 <glyph unicode="&#xe907;" glyph-name="shen" d="M1023.048 447.048c0-282.244-228.805-511.048-511.048-511.048s-511.048 228.805-511.048 511.048 228.805 511.048 511.048 511.048 511.048-228.805 511.048-511.048zM271.834 555.184h42.042v61.985h409.098v-61.985h42.042v100.793h-238.236l25.333 15.631c-11.142 16.886-24.079 34.673-38.808 53.361l-37.191-22.099c11.677-16.352 22.099-31.982 31.262-46.893h-235.541v-100.793zM319.805 279.218h39.885v25.333h137.444v-117.501h42.042v117.502h137.983v-25.333h39.885v264.108h-177.868v58.211h-42.042v-58.211h-177.33v-264.109zM359.69 505.597h137.444v-63.062h-137.444v63.062zM359.69 405.882h137.444v-63.602h-137.444v63.602zM677.16 442.535h-137.983v63.062h137.983v-63.062zM539.177 405.882h137.983v-63.602h-137.983v63.602z" />
 <glyph unicode="&#xe908;" glyph-name="home" d="M950.348 504.040l-122.161 96.253v106.356c0 17.976-14.407 32.581-32.159 32.581h-61.304c-17.754 0-32.133-14.605-32.133-32.581v-14.659l-150.758 115.553c-0.633 0.476-1.288 0.9-1.968 1.277-11.1 7.55-24.064 11.605-37.548 11.605-14.068 0-27.523-4.321-38.995-12.509-0.128-0.135-0.315-0.292-0.498-0.374l-398.515-303.502c-10.606-7.822-12.915-22.771-5.265-33.456 7.702-10.681 22.492-13.093 33.073-5.33l398.176 303.347c0.081 0.027 0.184 0.081 0.263 0.133 3.432 2.466 7.516 3.792 11.761 3.792s8.324-1.326 11.73-3.792c0.157-0.106 0.339-0.182 0.525-0.292l397.94-303.188c10.605-7.763 25.402-5.351 33.077 5.33 7.674 10.686 5.365 25.634-5.241 33.456zM820.408 454.364l-276.17 213.479c-0.054 0.054-0.161 0.102-0.187 0.13-9.319 6.732-20.294 10.287-31.735 10.34-11.394 0-22.343-3.582-31.635-10.233-0.080-0.109-0.182-0.135-0.291-0.238l-276.142-213.479c-6.178-4.56-9.793-11.77-9.793-19.381v-270.289c0-46.234 37.186-83.798 82.801-83.798h133.844v201.501c0 35.551 28.412 64.287 63.477 64.287h65.865c35.065 0 63.5-28.735 63.5-64.287v-201.501h143.404c45.668 0 82.802 37.564 82.802 83.798v270.289c0.001 7.612-3.642 14.821-9.739 19.381z" />