From aca4acbc8e687cadfb3896658b59b35543e95d98 Mon Sep 17 00:00:00 2001 From: Wisp X Date: Wed, 22 Dec 2021 12:33:23 +0800 Subject: [PATCH] =?UTF-8?q?:lipstick:=20=E6=94=B9=E8=BF=9B=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/css/app.css | 50 ++++ public/css/common.css | 12 + resources/css/common.less | 25 +- .../views/components/container.blade.php | 2 +- resources/views/dashboard.blade.php | 224 +++++++++--------- resources/views/images.blade.php | 74 +++--- resources/views/layouts/app.blade.php | 84 +++---- resources/views/upload.blade.php | 4 +- 8 files changed, 287 insertions(+), 188 deletions(-) diff --git a/public/css/app.css b/public/css/app.css index 2c3b8cf0..10ef84ed 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -702,6 +702,9 @@ select { .left-\[50\%\] { left: 50%; } +.top-12 { + top: 3rem; +} .z-0 { z-index: 0; } @@ -743,6 +746,10 @@ select { margin-left: 0.5rem; margin-right: 0.5rem; } +.my-6 { + margin-top: 1.5rem; + margin-bottom: 1.5rem; +} .ml-3 { margin-left: 0.75rem; } @@ -920,6 +927,9 @@ select { .flex-1 { flex: 1 1 0%; } +.flex-auto { + flex: 1 1 auto; +} .basis-1\/3 { flex-basis: 33.333333%; } @@ -1077,6 +1087,12 @@ select { .overflow-scroll { overflow: scroll; } +.overflow-y-auto { + overflow-y: auto; +} +.overflow-y-scroll { + overflow-y: scroll; +} .overscroll-contain { -ms-scroll-chaining: none; overscroll-behavior: contain; @@ -1318,6 +1334,9 @@ select { .pt-8 { padding-top: 2rem; } +.pb-14 { + padding-bottom: 3.5rem; +} .text-center { text-align: center; } @@ -1577,6 +1596,9 @@ select { .ease-in { transition-timing-function: cubic-bezier(0.4, 0, 1, 1); } +.hover\:w-32:hover { + width: 8rem; +} .hover\:bg-gray-100:hover { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); @@ -1619,6 +1641,9 @@ select { .focus\:z-10:focus { z-index: 10; } +.focus\:w-32:focus { + width: 8rem; +} .focus\:border-blue-300:focus { --tw-border-opacity: 1; border-color: rgb(147 197 253 / var(--tw-border-opacity)); @@ -1771,6 +1796,11 @@ select { } @media (min-width: 768px) { + .md\:my-10 { + margin-top: 2.5rem; + margin-bottom: 2.5rem; + } + .md\:mt-8 { margin-top: 2rem; } @@ -1787,6 +1817,10 @@ select { margin-top: 1.5rem; } + .md\:mt-10 { + margin-top: 2.5rem; + } + .md\:block { display: block; } @@ -1803,6 +1837,10 @@ select { width: 70%; } + .md\:w-36 { + width: 9rem; + } + .md\:grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); } @@ -1850,6 +1888,18 @@ select { padding-top: 6rem; } + .md\:pt-6 { + padding-top: 1.5rem; + } + + .md\:pt-8 { + padding-top: 2rem; + } + + .md\:pt-10 { + padding-top: 2.5rem; + } + .md\:hover\:w-52:hover { width: 13rem; } diff --git a/public/css/common.css b/public/css/common.css index 860bd28b..3d8a5729 100644 --- a/public/css/common.css +++ b/public/css/common.css @@ -222,6 +222,18 @@ button.toast-close-button { scrollbar-width: none; /* Firefox */ } +::-webkit-scrollbar { + width: 6px; + height: 100%; +} +::-webkit-scrollbar-thumb { + border-radius: 6px; + background: #cad3e2; +} +::-webkit-scrollbar-track { + border-radius: 6px; + background: #ffffff; +} progress::-webkit-progress-bar { background-color: #d7d7d7; } diff --git a/resources/css/common.less b/resources/css/common.less index c6b3a6b2..5604f3a0 100644 --- a/resources/css/common.less +++ b/resources/css/common.less @@ -9,6 +9,22 @@ scrollbar-width: none; /* Firefox */ } +// 滚动条样式 +::-webkit-scrollbar { + width: 6px; + height: 100%; +} + +::-webkit-scrollbar-thumb { + border-radius: 6px; + background: #cad3e2; +} + +::-webkit-scrollbar-track { + border-radius: 6px; + background: rgb(255, 255, 255); +} + progress::-webkit-progress-bar { background-color: #d7d7d7; } @@ -18,15 +34,17 @@ progress::-webkit-progress-value { } #toast-container { - &>div { + & > div { font-size: 13px; padding: 10px 10px 10px 50px; box-shadow: 0 0 12px rgba(183, 183, 183, 0.47); + &:hover { box-shadow: 0 0 12px rgba(161, 161, 161, 0.47); } } } + .toast-close-button { right: -0.15em; } @@ -39,13 +57,16 @@ progress::-webkit-progress-value { #photos-grid { a:hover, a.selected { outline-color: #3b82f6; + .photo-select { display: block; } + &.selected { .photo-select { border-color: white; - &>i { + + & > i { color: #0061ff; } } diff --git a/resources/views/components/container.blade.php b/resources/views/components/container.blade.php index 09d73bb4..df14b870 100644 --- a/resources/views/components/container.blade.php +++ b/resources/views/components/container.blade.php @@ -1,5 +1,5 @@ @props(['full' => request()->routeIs('images')]) -
merge(['class' => $full ? 'mx-auto sm:ml-64' : 'mx-auto sm:ml-64 px-6 md:px-10 lg:px-10 xl:px-10 2xl:px-60']) }}> +
merge(['class' => $full ? 'h-full mx-auto sm:ml-64' : 'h-full mx-auto sm:ml-64 px-6 md:px-10 lg:px-10 xl:px-10 2xl:px-60']) }}> {{ $slot }}
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index be7ded0e..a5a23cd8 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -1,123 +1,125 @@ @section('title', '仪表盘') -
-
- -
-

图片数量

-

{{ $user->image_num }}

+
+
+
+ +
+

图片数量

+

{{ $user->image_num }}

+
+
+
+ +
+

可用储存

+

{{ \App\Utils::formatSize(($user->capacity - $user->images->sum('size')) * 1024) }}

+
+
+
+ +
+

使用储存

+

{{ \App\Utils::formatSize($user->images->sum('size') * 1024) }}

+
+
+
+ +
+

总储存

+

{{ \App\Utils::formatSize($user->capacity * 1024) }}

+
-
- -
-

可用储存

-

{{ \App\Utils::formatSize(($user->capacity - $user->images->sum('size')) * 1024) }}

-
-
-
- -
-

使用储存

-

{{ \App\Utils::formatSize($user->images->sum('size') * 1024) }}

-
-
-
- -
-

总储存

-

{{ \App\Utils::formatSize($user->capacity * 1024) }}

-
-
-
-
-
- - 可使用的策略 - - @if(! $strategies) - - @else -
- @foreach ($strategies as $strategy) -
-

{{ $strategy->name }}

- {{ $strategy->intro }} -
- @endforeach -
- @endif - - -
-
- - 我的信息 - -
-
-

姓名

-

{{ $user->name }}

-
-
-

邮箱

-

{{ $user->email }}

-
-
-

注册时间

-

{{ $user->created_at }}

-
-
-

注册 IP

-

{{ $user->registered_ip }}

-
- @if(! $user->email_verified_at) -

你的账号尚未激活，功能受限，请根据激活邮件指引激活账号，如果你没有收到邮件，请点击 这里 重新发送。

+
+
+ + 可使用的策略 + + @if(! $strategies) + + @else +
+ @foreach ($strategies as $strategy) +
+

{{ $strategy->name }}

+ {{ $strategy->intro }} +
+ @endforeach +
@endif -
- - - - 角色组信息 - -
-
-

组名

-

{{ $user->group ? $user->group->name : '系统默认组' }}

+ + +
+
+ + 我的信息 + +
+
+

姓名

+

{{ $user->name }}

+
+
+

邮箱

+

{{ $user->email }}

+
+
+

注册时间

+

{{ $user->created_at }}

+
+
+

注册 IP

+

{{ $user->registered_ip }}

+
+ @if(! $user->email_verified_at) +

你的账号尚未激活，功能受限，请根据激活邮件指引激活账号，如果你没有收到邮件，请点击 这里 重新发送。

+ @endif
-
-

最大文件大小

-

{{ \App\Utils::formatSize($configs->get(\App\Enums\GroupConfigKey::MaximumFileSize) * 1024) }}

+ + + + 角色组信息 + +
+
+

组名

+

{{ $user->group ? $user->group->name : '系统默认组' }}

+
+
+

最大文件大小

+

{{ \App\Utils::formatSize($configs->get(\App\Enums\GroupConfigKey::MaximumFileSize) * 1024) }}

+
+
+

并发上传数量

+

{{ $configs->get(\App\Enums\GroupConfigKey::ConcurrentUploadNum) }} 张

+
+
+

每分钟上传限制

+

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerMinute) }} 张

+
+
+

每小时上传限制

+

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerHour) }} 张

+
+
+

每天上传限制

+

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerDay) }} 张

+
+
+

每周上传限制

+

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerWeek) }} 张

+
+
+

每月上传限制

+

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerMonth) }} 张

+
-
-

并发上传数量

-

{{ $configs->get(\App\Enums\GroupConfigKey::ConcurrentUploadNum) }} 张

-
-
-

每分钟上传限制

-

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerMinute) }} 张

-
-
-

每小时上传限制

-

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerHour) }} 张

-
-
-

每天上传限制

-

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerDay) }} 张

-
-
-

每周上传限制

-

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerWeek) }} 张

-
-
-

每月上传限制

-

{{ $configs->get(\App\Enums\GroupConfigKey::LimitPerMonth) }} 张

-
-
- - + + +
diff --git a/resources/views/images.blade.php b/resources/views/images.blade.php index 1b544d6e..c7e4b735 100644 --- a/resources/views/images.blade.php +++ b/resources/views/images.blade.php @@ -6,15 +6,14 @@ @endpush -
- - +
+
+ 相册
- 选中项 + @@ -25,26 +24,37 @@
-
- - - - 排序 - +
+
+ + + + 排序 + - - 最新 - 最早 - 最大 - 最小 - - -
- + + 最新 + + 最早 + + 最大 + + 最小 + + + +
-
-
- 加载中... +
+
+
+ +
@endpush diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6f0ca3c1..d836e2db 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -1,50 +1,50 @@ - - - - - - + + + + + + - {{ config('app.name', 'Laravel') }} + {{ config('app.name', 'Laravel') }} - - - - @stack('styles') + + + + @stack('styles') - - - + + + - - - - -
- @include('layouts.sidebar') - @include('layouts.header') - + + {{ $slot }} + +
+ +@stack('scripts') diff --git a/resources/views/upload.blade.php b/resources/views/upload.blade.php index 9a590875..924a350f 100644 --- a/resources/views/upload.blade.php +++ b/resources/views/upload.blade.php @@ -1,5 +1,7 @@ @section('title', '上传图片') - +
+ +