From 4be9a2e2df389ceb32760a668310ec0482ed5313 Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Tue, 21 Dec 2021 13:50:39 -0800 Subject: [PATCH] modified css-loader color --- backend/public/css/app.css | 20 +++++++++---------- backend/public/js/app.js | 13 ++++++++++-- .../js/component/modal_setting_notify.jsx | 9 ++++++++- .../resources/js/component/page_loader.jsx | 9 ++++++++- backend/resources/sass/layouts/_main.scss | 20 +++++++++---------- 5 files changed, 47 insertions(+), 24 deletions(-) diff --git a/backend/public/css/app.css b/backend/public/css/app.css index 2aebde9a..d3c3075f 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -17399,29 +17399,29 @@ a { } .css-loader { - color: green !important; + color: #b2b4b2 !important; position: fixed; z-index: 10; } @media screen and (min-width: 1068px) { .css-loader { - width: 40px !important; - height: 40px !important; - top: calc(45vh - 20px); - left: calc(50vw + 120px - 20px); + width: 80px !important; + height: 80px !important; + top: calc(45vh - 40px); + left: calc(50vw + 120px - 40px); } } @media screen and (max-width: 1068px) { .css-loader { - width: 30px !important; - height: 30px !important; - top: calc(45vh - 15px); - left: calc(50vw - 15px); + width: 50px !important; + height: 50px !important; + top: calc(45vh - 25px); + left: calc(50vw - 25px); } } .modal-css-loader { - color: green !important; + color: #b2b4b2 !important; position: fixed; z-index: 10; width: 30px !important; diff --git a/backend/public/js/app.js b/backend/public/js/app.js index f92c0ce0..04d84532 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -44243,7 +44243,11 @@ function ModalSettingNotify(_ref) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(_mui_material_DialogContent__WEBPACK_IMPORTED_MODULE_7__.default, { className: "position-relative", children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, { - className: "modal-css-loader" + className: "modal-css-loader", + sx: { + animationDuration: '800ms' + }, + thickness: 2 }), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.Fragment, { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("div", { className: "modal-content border-0 ".concat(!isApproval ? "is-active" : ""), @@ -44352,7 +44356,12 @@ __webpack_require__.r(__webpack_exports__); var PageLoader = function PageLoader() { return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_1__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_2__.default, { - className: "css-loader" + className: "css-loader", + sx: { + animationDuration: '500ms' + }, + thickness: 1, + value: 50 }); }; diff --git a/backend/resources/js/component/modal_setting_notify.jsx b/backend/resources/js/component/modal_setting_notify.jsx index 77ffaa2b..720a1c1e 100644 --- a/backend/resources/js/component/modal_setting_notify.jsx +++ b/backend/resources/js/component/modal_setting_notify.jsx @@ -87,7 +87,14 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){ { - !loaded && + !loaded && + } { loaded && diff --git a/backend/resources/js/component/page_loader.jsx b/backend/resources/js/component/page_loader.jsx index 02e21302..e01a8f1a 100644 --- a/backend/resources/js/component/page_loader.jsx +++ b/backend/resources/js/component/page_loader.jsx @@ -5,7 +5,14 @@ import { CircularProgress } from '@material-ui/core'; const PageLoader = () => { return ( - + ) } diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index f58ad77a..37315fd1 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -104,25 +104,25 @@ a{ } .css-loader{ - color: green !important; + color: rgb(178, 180, 178) !important; position: fixed; z-index: 10; @media screen and (min-width:1068px){ - width: 40px !important; - height: 40px !important; - top: calc(45vh - 20px); - left: calc( 50vw + 240px / 2 - 20px); + width: 80px !important; + height: 80px !important; + top: calc(45vh - 40px); + left: calc( 50vw + 240px / 2 - 40px); } @media screen and (max-width:1068px){ - width: 30px !important; - height: 30px !important; - top: calc(45vh - 15px); - left: calc(50vw - 15px); + width: 50px !important; + height: 50px !important; + top: calc(45vh - 25px); + left: calc(50vw - 25px); } } .modal-css-loader{ - color: green !important; + color: rgb(178, 180, 178) !important; position: fixed; z-index: 10; width: 30px !important;