suwako
/
kikikan
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

modified css-loader css

このコミットが含まれているのは:
dragon1211 2021-11-16 15:13:17 -08:00
親 da6e42d766
コミット 1cac82ac05
18個のファイルの変更、55行の追加、55行の削除
統計情報を表示 Patchファイルをダウンロード Diffファイルをダウンロード すべてのファイルを展開 すべてのファイルを折り畳む

13
backend/public/css/app.css vendored
ファイルの表示

@ -12303,17 +12303,26 @@ a {
}
.css-loader {
top: calc(45vh - 22px);
color: green !important;
position: fixed;
left: calc(50vw - 22px);
z-index: 10;
}
@media screen and (min-width: 1068px) {
.css-loader {
width: 40px !important;
height: 40px !important;
top: calc(45vh - 22px);
left: calc(50vw + 120px - 22px);
}
}
@media screen and (max-width: 1068px) {
.css-loader {
width: 30px !important;
height: 30px !important;
top: calc(45vh - 15px);
left: calc(50vw - 15px);
}
}
@media screen and (min-width: 1068px) {
.p-meetingAdd-btn {

45
backend/public/js/app.js vendored
ファイルの表示

@ -40618,7 +40618,6 @@ var MeetingDetail = function MeetingDetail(props) {
notice: notice
})]
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_9__.default, {
color: "secondary",
className: "css-loader"
}), loaded && (meeting ? /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
className: "l-content-wrap",
@ -40999,7 +40998,6 @@ 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",
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsxs)("div", {
className: "meeting-content",
@ -41347,7 +41345,6 @@ var ParentDetail = function ParentDetail(props) {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", {
className: "profile-wrap",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_4__.default, {
color: "secondary",
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsxs)("div", {
className: "profile-content",
@ -41522,7 +41519,6 @@ var Parent = function Parent() {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("div", {
className: "l-content-wrap",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
color: "secondary",
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("section", {
className: "search-container",
@ -41785,7 +41781,6 @@ var ProfileEdit = function ProfileEdit() {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
className: "profile-container",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_6__.default, {
color: "secondary",
className: "css-loader"
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
@ -42114,7 +42109,6 @@ var Profile = function Profile() {
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsxs)("section", {
className: "profile-container",
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_5__.default, {
color: "secondary",
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", {
className: "profile-wrap",
@ -42897,7 +42891,6 @@ var Search = function Search() {
})]
})
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, {
color: "secondary",
className: "css-loader"
}), loaded && !initPage && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxs)("div", {
className: "meeting-content",
@ -43617,12 +43610,7 @@ 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, {
style: {
color: 'green',
position: 'absolute',
top: 'calc( 30% - 22px )',
left: 'calc( 50% - 22px )'
}
className: "css-loader"
}), 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" : ""),
@ -45206,7 +45194,7 @@ var ParentLogin = function ParentLogin() {
_422errors = _useState8[0],
set422Errors = _useState8[1];
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState10 = _slicedToArray(_useState9, 2),
_400error = _useState10[0],
set400Error = _useState10[1];
@ -47195,7 +47183,6 @@ var Favorite = function Favorite(props) {
})]
})
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_10__.default, {
color: "secondary",
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
className: "meeting-content",
@ -47527,13 +47514,14 @@ var MeetingAdd = function MeetingAdd(props) {
submit = _useState24[0],
setSubmit = _useState24[1];
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(null),
var _useState25 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(''),
_useState26 = _slicedToArray(_useState25, 2),
check_radio = _useState26[0],
setCheckRadio = _useState26[1];
(0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
setLoaded(false);
setCheckRadio('false');
axios__WEBPACK_IMPORTED_MODULE_1___default().get('/api/fathers/children/listOfFather', {
params: {
father_id: father_id
@ -47781,13 +47769,7 @@ var MeetingAdd = function MeetingAdd(props) {
minHeight: '500px'
},
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, {
color: "secondary",
style: {
top: '150px',
left: 'calc(50% - 22px)',
color: 'green',
position: 'absolute'
}
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("article", {
className: "p-article__body",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
@ -48289,6 +48271,10 @@ var MeetingDetail = function MeetingDetail(props) {
});
};
var handleCopy = function handleCopy() {// const data = {
// }
};
return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
className: "l-content",
children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
@ -48304,7 +48290,6 @@ var MeetingDetail = function MeetingDetail(props) {
notice: notice
})]
}), !loaded && !meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_13__.default, {
color: "secondary",
className: "css-loader"
}), loaded && meeting && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsxs)("div", {
className: "l-content-wrap",
@ -48385,7 +48370,7 @@ var MeetingDetail = function MeetingDetail(props) {
}), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)("li", {
className: "p-article-btn__item",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_11__.jsx)(react_router_dom__WEBPACK_IMPORTED_MODULE_14__.Link, {
to: "/p-account/meeting/new",
onClick: handleCopy,
className: "btn-default btn-yellow btn-pdf btn-r8 btn-h48",
children: "\u8907\u88FD"
})
@ -48957,13 +48942,7 @@ var MeetingEdit = function MeetingEdit(props) {
minHeight: '500px'
},
children: [!loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_8__.default, {
color: "secondary",
style: {
top: '150px',
left: 'calc(50% - 22px)',
color: 'green',
position: 'absolute'
}
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("article", {
className: "p-article__body",
children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_6__.jsx)("div", {
@ -49542,7 +49521,6 @@ var Meeting = function Meeting(props) {
})]
})
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_10__.default, {
color: "secondary",
className: "css-loader"
}), loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
className: "meeting-content",
@ -51234,7 +51212,6 @@ var Search = function Search(props) {
})]
})
}), !loaded && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_material_ui_core__WEBPACK_IMPORTED_MODULE_11__.default, {
color: "secondary",
className: "css-loader"
}), loaded && !initPage && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
className: "meeting-content",

2
backend/resources/js/child/meeting/detail.jsx
ファイルの表示

@ -88,7 +88,7 @@ const MeetingDetail = (props) => {
</div>
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/child/meeting/index.jsx
ファイルの表示

@ -116,7 +116,7 @@ const Meeting = () => {
</div>
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/child/parent/detail.jsx
ファイルの表示

@ -39,7 +39,7 @@ const ParentDetail = (props) => {
<div className="profile-wrap">
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/child/parent/index.jsx
ファイルの表示

@ -60,7 +60,7 @@ const Parent = () => {
<div className="l-content-wrap">
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/child/profile/edit.jsx
ファイルの表示

@ -112,7 +112,7 @@ const ProfileEdit = () => {
<section className="profile-container">
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
<div className="profile-wrap">
<div className="profile-content">

2
backend/resources/js/child/profile/index.jsx
ファイルの表示

@ -77,7 +77,7 @@ const Profile = () => {
<section className="profile-container">
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/child/search/index.jsx
ファイルの表示

@ -126,7 +126,7 @@ const Search = () => {
</div>
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded && !initPage &&

2
backend/resources/js/component/modal_setting_notify.jsx
ファイルの表示

@ -87,7 +87,7 @@ export default function ModalSettingNotify({show, handleClose, meetingId}){
</DialogTitle>
<DialogContent className="position-relative">
{
!loaded && <CircularProgress style={{color:'green', position:'absolute', top: 'calc( 30% - 22px )', left:'calc( 50% - 22px )'}}/>
!loaded && <CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/parent/auth/login/index.jsx
ファイルの表示

@ -13,7 +13,7 @@ const ParentLogin = () => {
const [password, setPassword] = useState('');
const [_422errors, set422Errors] = useState({email: '', password: ''});
const [_400error, set400Error] = useState(null);
const [_400error, set400Error] = useState('');
const handleSubmit = (e) => {

2
backend/resources/js/parent/favorite/index.jsx
ファイルの表示

@ -181,7 +181,7 @@ const Favorite = (props) => {
</div>
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

5
backend/resources/js/parent/meeting/add.jsx
ファイルの表示

@ -33,11 +33,12 @@ const MeetingAdd = (props) => {
const [loaded, setLoaded] = useState(false);
const [submit, setSubmit] = useState(false);
const [check_radio, setCheckRadio] = useState(null);
const [check_radio, setCheckRadio] = useState('');
useEffect(()=>{
setLoaded(false);
setCheckRadio('false');
axios.get('/api/fathers/children/listOfFather', {params:{father_id: father_id}})
.then(response=>{
setLoaded(true);
@ -225,7 +226,7 @@ const MeetingAdd = (props) => {
<div className="p-article-wrap position-relative" style={{ minHeight:'500px'}}>
{
!loaded &&
<CircularProgress color="secondary" style={{top:'150px', left:'calc(50% - 22px)', color:'green', position:'absolute'}}/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

10
backend/resources/js/parent/meeting/detail.jsx
ファイルの表示

@ -118,6 +118,12 @@ const MeetingDetail = (props) => {
});
}
const handleCopy = () => {
// const data = {
// }
}
return (
<div className="l-content">
<div className="l-content-w560">
@ -129,7 +135,7 @@ const MeetingDetail = (props) => {
</div>
{
!loaded && !meeting &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded && meeting &&
@ -173,7 +179,7 @@ const MeetingDetail = (props) => {
<a onClick={()=>setShowDelete(true)} className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">削除</a>
</li>
<li className="p-article-btn__item">
<Link to='/p-account/meeting/new'
<Link onClick={handleCopy}
className="btn-default btn-yellow btn-pdf btn-r8 btn-h48">複製</Link>
</li>
<li className="p-article-btn__item">

2
backend/resources/js/parent/meeting/edit.jsx
ファイルの表示

@ -226,7 +226,7 @@ const MeetingEdit = (props) => {
<div className="p-article-wrap position-relative" style={{ minHeight:'500px'}}>
{
!loaded &&
<CircularProgress color="secondary" style={{top:'150px', left:'calc(50% - 22px)', color:'green', position:'absolute'}}/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/parent/meeting/index.jsx
ファイルの表示

@ -194,7 +194,7 @@ const Meeting = (props) => {
</div>
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded &&

2
backend/resources/js/parent/search/index.jsx
ファイルの表示

@ -195,7 +195,7 @@ const Search = (props) => {
</div>
{
!loaded &&
<CircularProgress color="secondary" className="css-loader"/>
<CircularProgress className="css-loader"/>
}
{
loaded && !initPage &&

11
backend/resources/sass/layouts/_main.scss vendored
ファイルの表示

@ -188,14 +188,21 @@ a{
}
.css-loader{
top: calc(45vh - 22px);
color: green !important;
position: fixed;
left: calc(50vw - 22px);
z-index: 10;
@media screen and (min-width:1068px){
width: 40px !important;
height: 40px !important;
top: calc(45vh - 22px);
left: calc( 50vw + 240px / 2 - 22px);
}
@media screen and (max-width:1068px){
width: 30px !important;
height: 30px !important;
top: calc(45vh - 15px);
left: calc(50vw - 15px);
}
}
/////////////////////////////////////////////////////////////////////////