diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e8b320..76f3e4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,91 @@ # Changelog +## [1.2.8](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.7...v1.2.8) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([bd5117f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/bd5117ff2c6f471322e4e4e3e5df127af4c3292a)) + +## [1.2.7](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.6...v1.2.7) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([f18f3a0](https://github.com/School-of-Website-Engineering/TinyWaste/commit/f18f3a0b9f4cd2ffd50f41207ae1075d9a4b0284)) + +## [1.2.6](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.5...v1.2.6) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([126032f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/126032f97173535c8473c341940e8dfe1ac058fe)) +* **contributor:** contrib-readme-action has updated readme ([899076f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/899076f28fe1fd5d3f4b6b6c3f82851eb04227a2)) +* **contributor:** contrib-readme-action has updated readme ([f8aaab3](https://github.com/School-of-Website-Engineering/TinyWaste/commit/f8aaab3e809481244f4310386936fbdc272e8346)) + +## [1.2.6](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.5...v1.2.6) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([899076f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/899076f28fe1fd5d3f4b6b6c3f82851eb04227a2)) +* **contributor:** contrib-readme-action has updated readme ([f8aaab3](https://github.com/School-of-Website-Engineering/TinyWaste/commit/f8aaab3e809481244f4310386936fbdc272e8346)) + +## [1.2.5](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.4...v1.2.5) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([5bc5576](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5bc557646900e184cb86ccc0a0ef034e910a7e3c)) +* **contributor:** contrib-readme-action has updated readme ([5ee728a](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5ee728a9ee1bae2c079ed36735ec14bce6af3880)) +* **contributor:** contrib-readme-action has updated readme ([628fa6f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/628fa6f8092102a8cd64fc0f9f461638a9a250df)) + +## [1.2.5](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.4...v1.2.5) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([5ee728a](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5ee728a9ee1bae2c079ed36735ec14bce6af3880)) +* **contributor:** contrib-readme-action has updated readme ([628fa6f](https://github.com/School-of-Website-Engineering/TinyWaste/commit/628fa6f8092102a8cd64fc0f9f461638a9a250df)) + +## [1.2.4](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.3...v1.2.4) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([9fe1841](https://github.com/School-of-Website-Engineering/TinyWaste/commit/9fe184135902afc99bcfc53e9617fc491eff9b48)) +* **contributor:** contrib-readme-action has updated readme ([16bd632](https://github.com/School-of-Website-Engineering/TinyWaste/commit/16bd6329c48812f71db524a03018d0fc7e5def99)) + +## [1.2.3](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.2...v1.2.3) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([fc89a09](https://github.com/School-of-Website-Engineering/TinyWaste/commit/fc89a0903592dcbfc5fa467c34f76a090f029ec8)) +* **contributor:** contrib-readme-action has updated readme ([462f8bc](https://github.com/School-of-Website-Engineering/TinyWaste/commit/462f8bc266ba9ce625c7f4eacc02611bd1249083)) +* **contributor:** contrib-readme-action has updated readme ([5bd65c0](https://github.com/School-of-Website-Engineering/TinyWaste/commit/5bd65c01b33a71ac2f8b02b2ded63a0831687d84)) + +## [1.2.2](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.1...v1.2.2) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([57d1515](https://github.com/School-of-Website-Engineering/TinyWaste/commit/57d1515cc74c3c7ace7733519d3d80ab425eca77)) + +## [1.2.2](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.1...v1.2.2) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([57d1515](https://github.com/School-of-Website-Engineering/TinyWaste/commit/57d1515cc74c3c7ace7733519d3d80ab425eca77)) + +## [1.2.1](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.2.0...v1.2.1) (2023-02-03) + + +### Docs + +* **contributor:** contrib-readme-action has updated readme ([b7a3572](https://github.com/School-of-Website-Engineering/TinyWaste/commit/b7a357243b2b39511316fa86c1ec3a4b3e3729c5)) + ## [1.2.0](https://github.com/School-of-Website-Engineering/TinyWaste/compare/v1.1.2...v1.2.0) (2023-02-02) diff --git a/README.md b/README.md index ac3446a..2c44206 100644 --- a/README.md +++ b/README.md @@ -107,6 +107,13 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v Mason + + + liusxs +
+ Liuliu66 +
+ LingASDJ @@ -120,13 +127,6 @@ Progressive-Tune 遵循 [Contributor Covenant](http://contributor-covenant.org/v
Imgbot
- - - - liusxs -
- Liuliu66 -
diff --git a/package-lock.json b/package-lock.json index 23f268d..88c8540 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tinywaste", - "version": "1.2.0", + "version": "1.2.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "tinywaste", - "version": "1.2.0", + "version": "1.2.8", "dependencies": { "amfe-flexible": "^2.2.1", "axios": "^1.2.6", diff --git a/package.json b/package.json index 1ffb4d7..122f4aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tinywaste", - "version": "1.2.0", + "version": "1.2.8", "private": true, "scripts": { "serve": "vue-cli-service serve --mode dev", diff --git a/src/assets/scss/_media.scss b/src/assets/scss/_media.scss index f55fb27..7d16585 100644 --- a/src/assets/scss/_media.scss +++ b/src/assets/scss/_media.scss @@ -1,8 +1,14 @@ -$bottomMenu-height: 30vh; -$event-height: 34vh; -$globalStatusBar-height: 12vh; -$shortcutBar-height: 12vh; -$textOutput-height: 12vh; +$bottomMenu-height: 26vh; +$Menu-height: 22vh; +$eventMenu-height: 32vh; +$event-height: 28vh; +$globalStatusBar-height: 4vh; +$shortcutBar-height: 8vh; +$textOutput-height: 8vh; + +$body-width: 90%; +$border-radius: 5px; +$border: .5px; @media screen and (min-width: 480px) { // 移动设备 } diff --git a/src/views/index/bottomMenu/index.vue b/src/views/index/bottomMenu/index.vue index fa82b11..52ba1bf 100644 --- a/src/views/index/bottomMenu/index.vue +++ b/src/views/index/bottomMenu/index.vue @@ -1,9 +1,21 @@ @@ -14,20 +26,78 @@ export default {name: "bottomMenu"} diff --git a/src/views/index/event/index.vue b/src/views/index/event/index.vue index 16a76b2..8ee6a97 100644 --- a/src/views/index/event/index.vue +++ b/src/views/index/event/index.vue @@ -1,26 +1,109 @@ + diff --git a/src/views/index/globalStatusBar/index.vue b/src/views/index/globalStatusBar/index.vue index ba70dde..215cd87 100644 --- a/src/views/index/globalStatusBar/index.vue +++ b/src/views/index/globalStatusBar/index.vue @@ -1,7 +1,13 @@ @@ -12,9 +18,25 @@ export default {name: "globalStatusBar"} diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 3ae42e4..49fd766 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -33,5 +33,8 @@ export default { diff --git a/src/views/index/shortcutBar/index.vue b/src/views/index/shortcutBar/index.vue index 63f5a1e..57c2434 100644 --- a/src/views/index/shortcutBar/index.vue +++ b/src/views/index/shortcutBar/index.vue @@ -1,7 +1,11 @@ @@ -12,9 +16,23 @@ export default {name: "shortcutBar"} diff --git a/src/views/index/textOutput/index.vue b/src/views/index/textOutput/index.vue index 0aaff52..b9835dd 100644 --- a/src/views/index/textOutput/index.vue +++ b/src/views/index/textOutput/index.vue @@ -1,7 +1,11 @@ @@ -12,9 +16,24 @@ export default {name: "textOutput"}