diff --git a/CHANGELOG.md b/CHANGELOG.md index ab08cec..b85a90d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ - | 解决warning | [dcb0079](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/dcb0079) - | 删除多余的引入 | [050b12a](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/050b12a) - | 时间轴任务 | [98abdf6](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/98abdf6) + - | 项目列表排序 | [ad0ce75](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/ad0ce75) - | 修复一些内容 | [3cdb1ce](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/3cdb1ce) app.vue | 修复获取token报错的问题 | [9120d54](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/9120d54) createTask | 修复createTask v-model的问题 | [b20d3f0](https://101.201.226.163:50022/TALL/TALL-MUI-4/commits/b20d3f0) diff --git a/common/styles/tailwind.scss b/common/styles/tailwind.scss index aff246f..e31149b 100644 --- a/common/styles/tailwind.scss +++ b/common/styles/tailwind.scss @@ -2198,7 +2198,10 @@ .-ml-px { margin-left: -1px; } - + +.border-none{ + border-style: none; +} .box-border { box-sizing: border-box; } @@ -2215,7 +2218,12 @@ --tw-border-opacity: 1; border-color: rgba(209, 213, 219, var(--tw-border-opacity)); } - +.border{ + border-width: 1px; +} +.border-solid{ + border-style: solid; +} .block { display: block; } @@ -2696,7 +2704,12 @@ .overflow-hidden { overflow: hidden; } - +.visible{ + visibility: visible; +} +.invisible{ + visibility: hidden; +} .overflow-visible { overflow: visible; } @@ -4335,10 +4348,22 @@ .h-3 { height: 0.75rem; } + +.h5{ + height: 1.25rem; +} + +.h-10{ + height: 2.5rem; +} + .h-full { height: 100%; } +.leading-10{ + line-height: 2.5rem; +} .bg-gray-50 { --tw-bg-opacity: 1; background-color: rgba(249, 250, 251, var(--tw-bg-opacity)); @@ -4367,7 +4392,10 @@ } .h-12 { - height: 3rem; + height: 3.15rem; +} +.h-8{ + height: 2.2rem; } .bg-white { --tw-bg-opacity: 1; @@ -4465,6 +4493,10 @@ box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } +.rounded-md{ +border-radius: 0.375rem; +} + .shadow-md { --tw-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); @@ -4494,3 +4526,35 @@ --tw-shadow: 0 0 #0000; box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow); } + +.bg-red-500{ + --tw-bg-opacity: 1; + background-color: rgba(239, 68, 68, var(--tw-bg-opacity)); +} +.bg-yellow-500{ + --tw-bg-opacity: 1; + background-color: rgba(245, 158, 11, var(--tw-bg-opacity)); +} +.leading-12{ + line-height: 3.15rem; +} +.rounded-w-12{ + border-radius: 1.5rem; +} +.bg-opacity-100{ + --tw-bg-opacity: 1; +} +.bg-grey{ + background-color: rgba(0,0,0,0.5); +} +.rounded-md{ + border-radius: 0.375rem; +} +.border-t{ + border-top-width: 1px; +} +.border-gray-200{ + --tw-border-opacity: 1; + border-color: rgba(229, 231, 235, var(--tw-border-opacity)); +} + diff --git a/common/styles/theme/default.scss b/common/styles/theme/default.scss index 038cb4a..824afc1 100644 --- a/common/styles/theme/default.scss +++ b/common/styles/theme/default.scss @@ -1,10 +1,29 @@ // 默认主题文件 .theme-default { + background-color: #F3F3F3; background-color: #007aff; // color: #fff; .u-card { - font-size: 24px !important; - color: #0f0; + font-size: 16px !important; + background-color: #F3F3F3 !important; + .deliverHead{ + align-items: center; + } + .btns u-button{ + margin: 0 !important; + } + .active{ + background-color: #2979FF; + color: #FFFFFF; + } + .mask{ + position:absolute; + top: 0; + left:0; + width: 100%; + height: 100%; + z-index: 100; + } } .u-navbar { background-color: #007aff !important; diff --git a/components/Globals/Globals.vue b/components/Globals/Globals.vue index 07c37c9..c33b355 100644 --- a/components/Globals/Globals.vue +++ b/components/Globals/Globals.vue @@ -11,10 +11,11 @@ >