0906 #20 加上一些選單的改良

pulipulichen · Sep 6, 2019 · 7a9214c · 7a9214c
1 parent da8076d
commit 7a9214c
Show file tree

Hide file tree

Showing 8 changed files with 408 additions and 399 deletions.
diff --git a/app/webpack/dist/bundle.js b/app/webpack/dist/bundle.js
diff --git a/app/webpack/dist/bundle.js.map b/app/webpack/dist/bundle.js.map
diff --git a/app/webpack/dist/vendors.js b/app/webpack/dist/vendors.js
@@ -1,9 +1,9 @@
 (window["webpackJsonp"] = window["webpackJsonp"] || []).push([["vendors"],{
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\css-loader\\dist\\runtime\\api.js":
-/*!****************************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/css-loader/dist/runtime/api.js ***!
-  \****************************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\css-loader\\dist\\runtime\\api.js":
+/*!*************************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/css-loader/dist/runtime/api.js ***!
+  \*************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -101,10 +101,10 @@ function toComment(sourceMap) {
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\css-loader\\dist\\runtime\\getUrl.js":
-/*!*******************************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/css-loader/dist/runtime/getUrl.js ***!
-  \*******************************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\css-loader\\dist\\runtime\\getUrl.js":
+/*!****************************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/css-loader/dist/runtime/getUrl.js ***!
+  \****************************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -136,10 +136,10 @@ module.exports = function (url, needQuotes) {
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\jquery\\dist\\jquery.js":
-/*!*******************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/jquery/dist/jquery.js ***!
-  \*******************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\jquery\\dist\\jquery.js":
+/*!****************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/jquery/dist/jquery.js ***!
+  \****************************************************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
@@ -10746,10 +10746,10 @@ return jQuery;
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\vue-fragment\\dist\\vue-fragment.esm.js":
-/*!***********************************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/vue-fragment/dist/vue-fragment.esm.js ***!
-  \***********************************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\vue-fragment\\dist\\vue-fragment.esm.js":
+/*!********************************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/vue-fragment/dist/vue-fragment.esm.js ***!
+  \********************************************************************************************/
 /*! exports provided: default, Fragment, SSR, Plugin */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -10763,10 +10763,10 @@ function _defineProperty(e,n,t){return n in e?Object.defineProperty(e,n,{value:t
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\vue-i18n\\dist\\vue-i18n.esm.js":
-/*!***************************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/vue-i18n/dist/vue-i18n.esm.js ***!
-  \***************************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\vue-i18n\\dist\\vue-i18n.esm.js":
+/*!************************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/vue-i18n/dist/vue-i18n.esm.js ***!
+  \************************************************************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -12706,10 +12706,10 @@ VueI18n.version = '8.14.0';
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\vue-loader\\lib\\runtime\\componentNormalizer.js":
-/*!*******************************************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/vue-loader/lib/runtime/componentNormalizer.js ***!
-  \*******************************************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\vue-loader\\lib\\runtime\\componentNormalizer.js":
+/*!****************************************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/vue-loader/lib/runtime/componentNormalizer.js ***!
+  \****************************************************************************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -12813,17 +12813,17 @@ function normalizeComponent (
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\vue-style-loader\\lib\\addStylesClient.js":
-/*!*************************************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/vue-style-loader/lib/addStylesClient.js ***!
-  \*************************************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\vue-style-loader\\lib\\addStylesClient.js":
+/*!**********************************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/vue-style-loader/lib/addStylesClient.js ***!
+  \**********************************************************************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "default", function() { return addStylesClient; });
-/* harmony import */ var _listToStyles__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./listToStyles */ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\vue-style-loader\\lib\\listToStyles.js");
+/* harmony import */ var _listToStyles__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./listToStyles */ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\vue-style-loader\\lib\\listToStyles.js");
 /*
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
@@ -13050,10 +13050,10 @@ function applyToTag (styleElement, obj) {
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\vue-style-loader\\lib\\listToStyles.js":
-/*!**********************************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/vue-style-loader/lib/listToStyles.js ***!
-  \**********************************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\vue-style-loader\\lib\\listToStyles.js":
+/*!*******************************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/vue-style-loader/lib/listToStyles.js ***!
+  \*******************************************************************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -13091,10 +13091,10 @@ function listToStyles (parentId, list) {
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\vue\\dist\\vue.esm.js":
-/*!*****************************************************************************!*\
-  !*** C:/Users/pudding/AppData/Roaming/npm/node_modules/vue/dist/vue.esm.js ***!
-  \*****************************************************************************/
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\vue\\dist\\vue.esm.js":
+/*!**************************************************************************!*\
+  !*** C:/Users/USER/AppData/Roaming/npm/node_modules/vue/dist/vue.esm.js ***!
+  \**************************************************************************/
 /*! exports provided: default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -25060,11 +25060,11 @@ Vue.compile = compileToFunctions;
 
 /* harmony default export */ __webpack_exports__["default"] = (Vue);
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../webpack/buildin/global.js */ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js"), __webpack_require__(/*! ./../../webpack/node_modules/timers-browserify/main.js */ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\timers-browserify\\main.js").setImmediate))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../webpack/buildin/global.js */ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js"), __webpack_require__(/*! ./../../webpack/node_modules/timers-browserify/main.js */ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\timers-browserify\\main.js").setImmediate))
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js":
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js":
 /*!***********************************!*\
   !*** (webpack)/buildin/global.js ***!
   \***********************************/
@@ -25095,7 +25095,7 @@ module.exports = g;
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\process\\browser.js":
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\process\\browser.js":
 /*!*************************************************!*\
   !*** (webpack)/node_modules/process/browser.js ***!
   \*************************************************/
@@ -25290,7 +25290,7 @@ process.umask = function() { return 0; };
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\setimmediate\\setImmediate.js":
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\setimmediate\\setImmediate.js":
 /*!***********************************************************!*\
   !*** (webpack)/node_modules/setimmediate/setImmediate.js ***!
   \***********************************************************/
@@ -25484,11 +25484,11 @@ process.umask = function() { return 0; };
     attachTo.clearImmediate = clearImmediate;
 }(typeof self === "undefined" ? typeof global === "undefined" ? this : global : self));
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../buildin/global.js */ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js"), __webpack_require__(/*! ./../process/browser.js */ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\process\\browser.js")))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../buildin/global.js */ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js"), __webpack_require__(/*! ./../process/browser.js */ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\process\\browser.js")))
 
 /***/ }),
 
-/***/ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\timers-browserify\\main.js":
+/***/ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\timers-browserify\\main.js":
 /*!********************************************************!*\
   !*** (webpack)/node_modules/timers-browserify/main.js ***!
   \********************************************************/
@@ -25548,7 +25548,7 @@ exports._unrefActive = exports.active = function(item) {
 };
 
 // setimmediate attaches itself to the global object
-__webpack_require__(/*! setimmediate */ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\setimmediate\\setImmediate.js");
+__webpack_require__(/*! setimmediate */ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\node_modules\\setimmediate\\setImmediate.js");
 // On some exotic environments, it's not clear which object `setimmediate` was
 // able to install onto.  Search each possibility in the same order as the
 // `setimmediate` library.
@@ -25559,7 +25559,7 @@ exports.clearImmediate = (typeof self !== "undefined" && self.clearImmediate) ||
                          (typeof global !== "undefined" && global.clearImmediate) ||
                          (this && this.clearImmediate);
 
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../buildin/global.js */ "C:\\Users\\pudding\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js")))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../../buildin/global.js */ "C:\\Users\\USER\\AppData\\Roaming\\npm\\node_modules\\webpack\\buildin\\global.js")))
 
 /***/ })
 

diff --git a/app/webpack/dist/vendors.js.map b/app/webpack/dist/vendors.js.map
diff --git a/app/webpack/src/components/MenuBar/MenuBar.html b/app/webpack/src/components/MenuBar/MenuBar.html
@@ -16,7 +16,7 @@
 
 
   <div class="right menu"
-       v-bind:style="{'maxHeight': 'calc(100vh - ' + config.menuBarHeight + ')'}">
+       v-bind:style="{'maxHeight': 'calc(100vh - ' + config.menuBarHeight + 'px)'}">
     <!--
     <a class="fitted item"
       v-on:click="openFolder()"

diff --git a/app/webpack/src/components/MenuBar/SubmenuTheme/SubmenuTheme.global.less b/app/webpack/src/components/MenuBar/SubmenuTheme/SubmenuTheme.global.less
@@ -7,13 +7,18 @@
     }
   }
 
-  .menu .item[data-value],
-  .menu .item.active[data-value] {
-    border-width: 0 0 0 1rem !important;
-    border-style: solid !important;
-    border-left-width: 1rem !important;
+  .menu {
+    max-height: 19rem !important;
+
+    .item[data-value],
+    .item.active[data-value] {
+      border-width: 0 0 0 1rem !important;
+      border-style: solid !important;
+      border-left-width: 1rem !important;
 
+    }
   }
+
 
   /*
   .ui.dropdown.selection > .text {

diff --git a/app/webpack/src/components/MenuBar/SubmenuTheme/SubmenuTheme.html b/app/webpack/src/components/MenuBar/SubmenuTheme/SubmenuTheme.html
@@ -1,7 +1,7 @@
 <fragment>
   <div class="item theme-select"
        ref="ThemeDropdownContainer">
-    <select class="ui dropdown" 
+    <select class="ui floating dropdown" 
             v-model="status.theme"
             ref="ThemeDropdown"
             v-bind:style="{'backgroundColor': status.theme}">

diff --git a/app/webpack/src/components/MenuBar/SubmenuTheme/SubmenuTheme.js b/app/webpack/src/components/MenuBar/SubmenuTheme/SubmenuTheme.js
@@ -15,6 +15,7 @@ module.exports = {
     },
     'status.theme': function () {
       window.$(this.$refs.ThemeDropdownContainer).find('.ui.dropdown.selection').css('background-color', this.status.theme)
+      //window.$(this.$refs.ThemeDropdownContainer).find('.ui.dropdown.selection .menu').css('max-height', `calc(100vh - ${this.config.menuBarHeight}px - 40px)`)
     }
   },  // watch: {
   //computed: {