Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta' into HK

lsc 2 years ago
parent
dabbac245f 3a05622f64
commit
344f00d579
11 changed files with 11 additions and 3 deletions
Unified View Show Diff Stats
  1. 4 0
      dist/index.html
  2. 1 0
      dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css
  3. 0 0
      dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css.map
  4. 1 0
      dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css
  5. 1 0
      dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css.map
  6. 0 0
      dist/static/js/app.6900b86c8fa48b6a8e12.js.map
  7. 0 0
      dist/static/js/app.d1c7cdc1742088716f20.js
  8. 1 0
      dist/static/js/app.d1c7cdc1742088716f20.js.map
  9. 0 0
      dist/static/js/manifest.f583576dfec9dfc9a295.js.map
  10. 2 2
      src/components/pages/easy/addCourse.vue
  11. 1 1
      src/components/pages/task/addCourse.vue

+ 4 - 0
dist/index.html
View File 

@@ -25,7 +25,11 @@
 
       height: 100%;
 
       height: 100%;
 
       width: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
       background: #e6eaf0;
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.26e7db2704fd831c7329543900ba59d8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.6900b86c8fa48b6a8e12.js></script></body></html><script>function stopSafari() {
 
     }</style><link href=./static/css/app.26e7db2704fd831c7329543900ba59d8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.6900b86c8fa48b6a8e12.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.d1c7cdc1742088716f20.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> beta
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css.map


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css


File diff suppressed because it is too large
+ 1 - 0
dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.6900b86c8fa48b6a8e12.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.d1c7cdc1742088716f20.js


File diff suppressed because it is too large
+ 1 - 0
dist/static/js/app.d1c7cdc1742088716f20.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.f583576dfec9dfc9a295.js.map


+ 2 - 2
src/components/pages/easy/addCourse.vue
View File 

@@ -8893,7 +8893,7 @@ export default {
 
   margin: 0 auto;
 
   margin: 0 auto;
 
   border-top: 2px solid rgb(228, 232, 237);
 
   border-top: 2px solid rgb(228, 232, 237);
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
-  border-radius: 0px 5px;
 
+  border-radius: 0px 0 5px 5px;
 
 }
 
 }
 
 
 
 .info_btn+.info_btn {
 
 .info_btn+.info_btn {
 
@@ -10561,7 +10561,7 @@ ol {
 
   justify-content: flex-start;
 
   justify-content: flex-start;
 
   align-items: center;
 
   align-items: center;
 
   width: calc(100%);
 
   width: calc(100%);
 
-  padding: 20px 0;
 
+  padding: 10px 0;
 
   margin: 0 auto;
 
   margin: 0 auto;
 
 }
 
 }

+ 1 - 1
src/components/pages/task/addCourse.vue
View File 

@@ -11464,7 +11464,7 @@ export default {
 
   margin: 0 auto;
 
   margin: 0 auto;
 
   border-top: 2px solid rgb(228, 232, 237);
 
   border-top: 2px solid rgb(228, 232, 237);
 
   box-sizing: border-box;
 
   box-sizing: border-box;
 
-  border-radius: 0px 5px;
 
+  border-radius: 0px 0 5px 5px;
 
 }
 
 }
 
 
 
 .info_btn+.info_btn {
 
 .info_btn+.info_btn {

Some files were not shown because too many files changed in this diff