diff --git a/backend/public/js/app.js b/backend/public/js/app.js index f5e540a2..a7155bc9 100644 --- a/backend/public/js/app.js +++ b/backend/public/js/app.js @@ -28343,19 +28343,19 @@ var ChildDetail = function ChildDetail(props) { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_Button__WEBPACK_IMPORTED_MODULE_15__.default, { onClick: closeModal, size: "large", - style: { - fontSize: '20px' - }, - children: "\u3044\u3044\u3048" + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { + className: "ft-20 text-black", + children: "\u3044\u3044\u3048" + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_16__.default, { variant: "text", onClick: handleAccept, loading: submit, size: "large", - style: { - fontSize: '20px' - }, - children: "\u306F\u3044" + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { + className: "ft-20 ".concat(!submit && 'text-black'), + children: "\u306F\u3044" + }) })] })] }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, { @@ -28704,9 +28704,9 @@ var ChildEdit = function ChildEdit(props) { type: "submit", fullWidth: true, loading: submit, - className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60", + className: "btn-edit btn-default btn-h60 bg-yellow rounded-15", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { - className: "ft-16", + className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'), children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u66F4\u65B0" }) }) @@ -29136,9 +29136,9 @@ var ChildPasswordEdit = function ChildPasswordEdit(props) { type: "submit", fullWidth: true, loading: submit, - className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60", + className: "btn-edit btn-default btn-h60 bg-yellow rounded-15", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { - className: "ft-16", + className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'), children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u66F4\u65B0" }) }) @@ -29351,17 +29351,17 @@ var AdminLogin = function AdminLogin() { className: "l-alert__text--error ft-16 ft-md-14", children: _422errors.password })] - }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__.default, { - type: "submit", - loading: submit, - fullWidth: true, - className: "rounded-15 p-4 mt-5 input-h60 bg-yellow", - children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("h4", { - className: "mb-0 font-weight-bold", - style: { - fontSize: '18px' - }, - children: "\u30ED\u30B0\u30A4\u30F3" + }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("div", { + className: "mt-5", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__.default, { + type: "submit", + loading: submit, + fullWidth: true, + className: "btn-edit btn-default btn-h60 bg-yellow rounded-15", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { + className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'), + children: "\u30ED\u30B0\u30A4\u30F3" + }) }) })] }) @@ -29844,19 +29844,19 @@ var MeetingDetail = function MeetingDetail(props) { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_mui_material_Button__WEBPACK_IMPORTED_MODULE_15__.default, { onClick: closeModal, size: "large", - style: { - fontSize: '20px' - }, - children: "\u3044\u3044\u3048" + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("span", { + className: "ft-20 text-black", + children: "\u3044\u3044\u3048" + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_16__.default, { variant: "text", onClick: handleAccept, loading: submit, size: "large", - style: { - fontSize: '20px' - }, - children: "\u306F\u3044" + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)("span", { + className: "ft-20 ".concat(!submit && 'text-black'), + children: "\u306F\u3044" + }) })] })] }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_7__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_4__.default, { @@ -30331,14 +30331,13 @@ var MeetingEdit = function MeetingEdit(props) { })] }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_7__.default, { type: "submit", + fullWidth: true, loading: submit, - className: "btn-edit btn-default btn-h70 btn-r14 btn-yellow rounded-20", - style: { - fontSize: '18px', - fontWeight: 'bold', - backgroundColor: '#ffed4a' - }, - children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u3092\u66F4\u65B0" + className: "btn-edit btn-default btn-h60 bg-yellow rounded-15", + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { + className: "ft-20 font-weight-bold ".concat(!submit && 'text-black'), + children: "\u30DF\u30FC\u30C6\u30A3\u30F3\u30B0\u3092\u66F4\u65B0" + }) }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_2__.default, { type: "fail", hide: function hide() { @@ -31108,19 +31107,19 @@ var ParentDetail = function ParentDetail(props) { children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_mui_material_Button__WEBPACK_IMPORTED_MODULE_15__.default, { onClick: closeModal, size: "large", - style: { - fontSize: '20px' - }, - children: "\u3044\u3044\u3048" + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { + className: "ft-20 text-black", + children: "\u3044\u3044\u3048" + }) }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_16__.default, { variant: "text", onClick: handleAccept, loading: submit, size: "large", - style: { - fontSize: '20px' - }, - children: "\u306F\u3044" + children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)("span", { + className: "ft-20 ".concat(!submit && 'text-black'), + children: "\u306F\u3044" + }) })] })] }), _400error && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_4__.jsx)(_component_alert__WEBPACK_IMPORTED_MODULE_3__.default, { @@ -31413,10 +31412,10 @@ var ParentEdit = function ParentEdit(props) { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_6__.default, { type: "submit", fullWidth: true, - className: "p-3 rounded-15 ft-15 font-weight-bold bg-yellow input-h60", + className: "btn-edit btn-default btn-h60 bg-yellow rounded-15", loading: submit, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { - className: "ft-16", + className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'), children: "\u30D7\u30ED\u30D5\u30A3\u30FC\u30EB\u3092\u66F4\u65B0" }) }) @@ -31846,9 +31845,9 @@ var ParentPasswordEdit = function ParentPasswordEdit(props) { type: "submit", fullWidth: true, loading: submit, - className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60", + className: "btn-edit btn-default btn-h60 bg-yellow rounded-15", children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { - className: "ft-16", + className: "ft-18 font-weight-bold ".concat(!submit && 'text-black'), children: "\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u66F4\u65B0" }) }) @@ -32024,10 +32023,10 @@ var ParentRegister = function ParentRegister() { children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)(_material_ui_lab__WEBPACK_IMPORTED_MODULE_5__.default, { type: "submit", fullWidth: true, - className: "p-3 rounded-15 font-weight-bold bg-yellow input-h60", + className: "btn-edit btn-default btn-h60 bg-yellow rounded-15", loading: submit, children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_3__.jsx)("span", { - className: "ft-20", + className: "ft-20 font-weight-bold ".concat(!submit && 'text-black'), children: "\u89AA\u8FFD\u52A0" }) }) diff --git a/backend/resources/js/admin/child/detail.jsx b/backend/resources/js/admin/child/detail.jsx index b90662ab..059e4552 100644 --- a/backend/resources/js/admin/child/detail.jsx +++ b/backend/resources/js/admin/child/detail.jsx @@ -229,15 +229,17 @@ const ChildDetail = (props) => { + size="large"> + いいえ + はい + size="large"> + はい + { diff --git a/backend/resources/js/admin/child/edit.jsx b/backend/resources/js/admin/child/edit.jsx index 90e9eb01..e3b17cce 100644 --- a/backend/resources/js/admin/child/edit.jsx +++ b/backend/resources/js/admin/child/edit.jsx @@ -183,8 +183,8 @@ const ChildEdit = (props) => {
- プロフィールを更新 + className="btn-edit btn-default btn-h60 bg-yellow rounded-15"> + プロフィールを更新
{ diff --git a/backend/resources/js/admin/child/password_edit.jsx b/backend/resources/js/admin/child/password_edit.jsx index 98312224..98acbac8 100644 --- a/backend/resources/js/admin/child/password_edit.jsx +++ b/backend/resources/js/admin/child/password_edit.jsx @@ -99,8 +99,8 @@ const ChildPasswordEdit = (props) => {
- パスワードを更新 + className="btn-edit btn-default btn-h60 bg-yellow rounded-15"> + パスワードを更新
{ diff --git a/backend/resources/js/admin/login/index.jsx b/backend/resources/js/admin/login/index.jsx index 2b410884..b7e42559 100644 --- a/backend/resources/js/admin/login/index.jsx +++ b/backend/resources/js/admin/login/index.jsx @@ -78,16 +78,18 @@ const AdminLogin = () => { } + +
+ + + ログイン + + +
- -

- ログイン -

-
diff --git a/backend/resources/js/admin/meeting/detail.jsx b/backend/resources/js/admin/meeting/detail.jsx index f5c8b66c..6c72cd64 100644 --- a/backend/resources/js/admin/meeting/detail.jsx +++ b/backend/resources/js/admin/meeting/detail.jsx @@ -228,17 +228,19 @@ const MeetingDetail = (props) => { - - - はい + + + + はい + { diff --git a/backend/resources/js/admin/meeting/edit.jsx b/backend/resources/js/admin/meeting/edit.jsx index ac66ea64..1401a83b 100644 --- a/backend/resources/js/admin/meeting/edit.jsx +++ b/backend/resources/js/admin/meeting/edit.jsx @@ -233,10 +233,11 @@ const MeetingEdit = (props) => { ミーティングを更新 + className="btn-edit btn-default btn-h60 bg-yellow rounded-15"> + ミーティングを更新 + { _400error && set400Error('')}>{_400error} } diff --git a/backend/resources/js/admin/parent/detail.jsx b/backend/resources/js/admin/parent/detail.jsx index 749b4b6b..095724f8 100644 --- a/backend/resources/js/admin/parent/detail.jsx +++ b/backend/resources/js/admin/parent/detail.jsx @@ -217,15 +217,17 @@ const ParentDetail = (props) => { + size="large"> + いいえ + はい + size="large"> + はい + { diff --git a/backend/resources/js/admin/parent/edit.jsx b/backend/resources/js/admin/parent/edit.jsx index d6a44f12..e8d6757a 100644 --- a/backend/resources/js/admin/parent/edit.jsx +++ b/backend/resources/js/admin/parent/edit.jsx @@ -152,9 +152,9 @@ const ParentEdit = (props) => {
- プロフィールを更新 + プロフィールを更新
{ diff --git a/backend/resources/js/admin/parent/password_edit.jsx b/backend/resources/js/admin/parent/password_edit.jsx index b117a617..c864be74 100644 --- a/backend/resources/js/admin/parent/password_edit.jsx +++ b/backend/resources/js/admin/parent/password_edit.jsx @@ -99,8 +99,8 @@ const ParentPasswordEdit = (props) => {
- パスワードを更新 + className="btn-edit btn-default btn-h60 bg-yellow rounded-15"> + パスワードを更新
{ diff --git a/backend/resources/js/admin/parent/register.jsx b/backend/resources/js/admin/parent/register.jsx index 05ea4685..c4666398 100644 --- a/backend/resources/js/admin/parent/register.jsx +++ b/backend/resources/js/admin/parent/register.jsx @@ -68,9 +68,9 @@ const ParentRegister = () => {
- 親追加 + 親追加
{