From e4497c65b8392dcbffd25fbadd05fc0d487b74da Mon Sep 17 00:00:00 2001 From: dragon1211 Date: Sun, 7 Nov 2021 17:01:36 +0900 Subject: [PATCH] modified css-loader --- backend/public/css/app.css | 14 ++++++++- backend/public/js/app.js | 31 +++++-------------- backend/resources/js/child/meeting/detail.jsx | 2 +- backend/resources/js/child/meeting/index.jsx | 4 +-- backend/resources/js/child/search/index.jsx | 4 +-- backend/resources/sass/layouts/_main.scss | 12 ++++++- 6 files changed, 37 insertions(+), 30 deletions(-) diff --git a/backend/public/css/app.css b/backend/public/css/app.css index d2de9db1..b2b16f65 100644 --- a/backend/public/css/app.css +++ b/backend/public/css/app.css @@ -12304,9 +12304,21 @@ a { .mypage-nav-list__item.nav-active .prof-wrap { border: 1px solid #F0DE00 !important; } -@media screen and (min-width: 1024px) { +@media screen and (min-width: 1068px) { .mypage-nav-list__item .prof-wrap { width: 24px !important; height: 24px !important; } } + +.css-loader { + top: calc(45vh - 22px); + color: green !important; + position: fixed; + left: calc(50vw - 22px); +} +@media screen and (min-width: 1068px) { + .css-loader { + left: calc(50vw + 120px - 22px); + } +} diff --git a/backend/public/js/app.js b/backend/public/js/app.js index 9cd62012..4d5d2953 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -42029,12 +42029,7 @@ var MeetingDetail = function MeetingDetail(props) { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_component_notification__WEBPACK_IMPORTED_MODULE_2__.default, {})] }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_10__.default, { color: "secondary", - style: { - top: 'calc(40vh - 22px)', - left: 'calc(50% - 22px)', - color: 'green', - position: 'absolute' - } + className: "css-loader" }), loaded && (meeting ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", { className: "l-content-wrap", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("div", { @@ -42406,10 +42401,7 @@ var Meeting = function Meeting() { }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", { className: "l-content-wrap", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("section", { - className: "meeting-tab-container position-relative", - style: { - minHeight: '250px' - }, + className: "meeting-tab-container", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", { className: "meeting-tab-wrap", children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", { @@ -42448,12 +42440,7 @@ var Meeting = function Meeting() { })] }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_7__.default, { color: "secondary", - style: { - top: 'calc(50% - 22px)', - left: 'calc(50% - 22px)', - color: 'green', - position: 'absolute' - } + className: "css-loader" }), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", { className: "meeting-content", children: [!tab_status && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", { @@ -44318,14 +44305,12 @@ var Search = function Search() { })] })] }) - }), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, { + }), + /*#__PURE__*/ + // !loaded && + (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, { color: "secondary", - style: { - top: 'calc(50% - 22px)', - left: 'calc(50% - 22px)', - color: 'green', - position: 'absolute' - } + className: "css-loader" }), loaded && !initPage && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", { className: "meeting-content", children: [!tab_status && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)("div", { diff --git a/backend/resources/js/child/meeting/detail.jsx b/backend/resources/js/child/meeting/detail.jsx index 9e8605af..610d3def 100644 --- a/backend/resources/js/child/meeting/detail.jsx +++ b/backend/resources/js/child/meeting/detail.jsx @@ -103,7 +103,7 @@ const MeetingDetail = (props) => { { !loaded && - + } { loaded && diff --git a/backend/resources/js/child/meeting/index.jsx b/backend/resources/js/child/meeting/index.jsx index 5e98ae32..1e3cb94d 100644 --- a/backend/resources/js/child/meeting/index.jsx +++ b/backend/resources/js/child/meeting/index.jsx @@ -102,7 +102,7 @@ const Meeting = () => {
-
+
@@ -115,7 +115,7 @@ const Meeting = () => {
{ !loaded && - + } { loaded && diff --git a/backend/resources/js/child/search/index.jsx b/backend/resources/js/child/search/index.jsx index 9304d276..e1240739 100644 --- a/backend/resources/js/child/search/index.jsx +++ b/backend/resources/js/child/search/index.jsx @@ -123,8 +123,8 @@ const Search = () => {
{ - !loaded && - + // !loaded && + } { loaded && !initPage && diff --git a/backend/resources/sass/layouts/_main.scss b/backend/resources/sass/layouts/_main.scss index 31bfb362..a2ca511a 100644 --- a/backend/resources/sass/layouts/_main.scss +++ b/backend/resources/sass/layouts/_main.scss @@ -192,9 +192,19 @@ a{ } } .prof-wrap{ - @media screen and (min-width:1024px){ + @media screen and (min-width:1068px){ width: 24px !important; height: 24px !important; } } +} + +.css-loader{ + top: calc(45vh - 22px); + color: green !important; + position: fixed; + left: calc(50vw - 22px); + @media screen and (min-width:1068px){ + left: calc( 50vw + 240px / 2 - 22px); + } } \ No newline at end of file