diff --git a/apps/icons/about/info.svg b/apps/icons/about/info.svg new file mode 100644 index 0000000..ed253c1 --- /dev/null +++ b/apps/icons/about/info.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/icons/about/update.svg b/apps/icons/about/update.svg new file mode 100644 index 0000000..25c01f4 --- /dev/null +++ b/apps/icons/about/update.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/explorer/icons/disk.png b/apps/icons/explorer/disk.png similarity index 100% rename from apps/explorer/icons/disk.png rename to apps/icons/explorer/disk.png diff --git a/apps/explorer/icons/diskwin.png b/apps/icons/explorer/diskwin.png similarity index 100% rename from apps/explorer/icons/diskwin.png rename to apps/icons/explorer/diskwin.png diff --git a/apps/explorer/icons/od.png b/apps/icons/explorer/od.png similarity index 100% rename from apps/explorer/icons/od.png rename to apps/icons/explorer/od.png diff --git a/apps/explorer/icons/qa.png b/apps/icons/explorer/qa.png similarity index 100% rename from apps/explorer/icons/qa.png rename to apps/icons/explorer/qa.png diff --git a/apps/explorer/icons/rb.png b/apps/icons/explorer/rb.png similarity index 100% rename from apps/explorer/icons/rb.png rename to apps/icons/explorer/rb.png diff --git a/apps/explorer/icons/thispc.png b/apps/icons/explorer/thispc.png similarity index 100% rename from apps/explorer/icons/thispc.png rename to apps/icons/explorer/thispc.png diff --git a/apps/explorer/icons/tool-copy.png b/apps/icons/explorer/tool-copy.png similarity index 100% rename from apps/explorer/icons/tool-copy.png rename to apps/icons/explorer/tool-copy.png diff --git a/apps/explorer/icons/tool-cut.png b/apps/icons/explorer/tool-cut.png similarity index 100% rename from apps/explorer/icons/tool-cut.png rename to apps/icons/explorer/tool-cut.png diff --git a/apps/explorer/icons/tool-new.png b/apps/icons/explorer/tool-new.png similarity index 100% rename from apps/explorer/icons/tool-new.png rename to apps/icons/explorer/tool-new.png diff --git a/apps/explorer/icons/tool-paste.png b/apps/icons/explorer/tool-paste.png similarity index 100% rename from apps/explorer/icons/tool-paste.png rename to apps/icons/explorer/tool-paste.png diff --git a/apps/explorer/icons/tool-rename.png b/apps/icons/explorer/tool-rename.png similarity index 100% rename from apps/explorer/icons/tool-rename.png rename to apps/icons/explorer/tool-rename.png diff --git a/apps/explorer/icons/tool-sort.png b/apps/icons/explorer/tool-sort.png similarity index 100% rename from apps/explorer/icons/tool-sort.png rename to apps/icons/explorer/tool-sort.png diff --git a/apps/explorer/icons/tool-view.png b/apps/icons/explorer/tool-view.png similarity index 100% rename from apps/explorer/icons/tool-view.png rename to apps/icons/explorer/tool-view.png diff --git a/apps/setting/icons/apps.png b/apps/icons/setting/apps.png similarity index 100% rename from apps/setting/icons/apps.png rename to apps/icons/setting/apps.png diff --git a/apps/setting/icons/blueteeth.png b/apps/icons/setting/blueteeth.png similarity index 100% rename from apps/setting/icons/blueteeth.png rename to apps/icons/setting/blueteeth.png diff --git a/apps/setting/icons/game.png b/apps/icons/setting/game.png similarity index 100% rename from apps/setting/icons/game.png rename to apps/icons/setting/game.png diff --git a/apps/setting/icons/help.png b/apps/icons/setting/help.png similarity index 100% rename from apps/setting/icons/help.png rename to apps/icons/setting/help.png diff --git a/apps/setting/icons.woff2 b/apps/icons/setting/icons.woff2 similarity index 100% rename from apps/setting/icons.woff2 rename to apps/icons/setting/icons.woff2 diff --git a/apps/setting/icons/network.png b/apps/icons/setting/network.png similarity index 100% rename from apps/setting/icons/network.png rename to apps/icons/setting/network.png diff --git a/apps/setting/icons/personal.png b/apps/icons/setting/personal.png similarity index 100% rename from apps/setting/icons/personal.png rename to apps/icons/setting/personal.png diff --git a/apps/setting/icons/safe.png b/apps/icons/setting/safe.png similarity index 100% rename from apps/setting/icons/safe.png rename to apps/icons/setting/safe.png diff --git a/apps/setting/icons/system.png b/apps/icons/setting/system.png similarity index 100% rename from apps/setting/icons/system.png rename to apps/icons/setting/system.png diff --git a/apps/setting/icons/time.png b/apps/icons/setting/time.png similarity index 100% rename from apps/setting/icons/time.png rename to apps/icons/setting/time.png diff --git a/apps/setting/icons/update.png b/apps/icons/setting/update.png similarity index 100% rename from apps/setting/icons/update.png rename to apps/icons/setting/update.png diff --git a/apps/setting/icons/user.png b/apps/icons/setting/user.png similarity index 100% rename from apps/setting/icons/user.png rename to apps/icons/setting/user.png diff --git a/apps/about/main.css b/apps/style/about.css similarity index 92% rename from apps/about/main.css rename to apps/style/about.css index 69bf07e..4c1ff92 100644 --- a/apps/about/main.css +++ b/apps/style/about.css @@ -11,6 +11,11 @@ #win-about>.menu>list>*{ padding: 5px 10px; + display: flex; +} + +#win-about>.menu>list>*>img{ + margin: 2px 5px 0 0; } #win-about>.cnt{ diff --git a/apps/calc/main.css b/apps/style/calc.css similarity index 100% rename from apps/calc/main.css rename to apps/style/calc.css diff --git a/apps/explorer/main.css b/apps/style/explorer.css similarity index 100% rename from apps/explorer/main.css rename to apps/style/explorer.css diff --git a/apps/setting/main.css b/apps/style/setting.css similarity index 97% rename from apps/setting/main.css rename to apps/style/setting.css index 39319eb..58c7184 100644 --- a/apps/setting/main.css +++ b/apps/style/setting.css @@ -1,6 +1,6 @@ @font-face { font-family: SettingsIcons; - src: url(icons.woff2) format("woff2") + src: url(../icons/setting/icons.woff2) format("woff2") } #win-setting>.page>.title { diff --git a/desktop.css b/desktop.css index 4cb8625..8c031e9 100644 --- a/desktop.css +++ b/desktop.css @@ -184,45 +184,31 @@ body { left: 1px; } -#start-btn { +.dock-btn { transition: 200ms; width: 32px; height: 26px; } -#start-btn>svg { +.dock-btn>svg { transition: 200ms; } -#start-btn:hover { +.dock-btn:hover { opacity: 0.6; } -#start-btn:active { +.dock-btn:active { padding: 2.5px 5.5px; } -#start-btn:active>svg { +.dock-btn:active>svg { width: 21px; height: 21px; } -#search-btn{ - font-size: 24px; - height: 35px; - width: 35px; - margin-top: -6px; - margin-left: 3px; - color: #333; - transition: 200ms; -} - -#search-btn:hover{ - opacity: 0.6; -} -#search-btn:active{ - font-size: 20px; - padding: 3px 0 0 4px; +.dock-btn.show{ + filter: hue-rotate(380deg) brightness(1.1); } #start-menu { @@ -834,7 +820,7 @@ list>.text:hover { background-color: #ffffff50; backdrop-filter: blur(50px); border-radius: 10px; - border: 3px solid #7f7f7f20; + border: 2px solid #7f7f7f20; display: none; opacity: 0; transition: 200ms; @@ -842,6 +828,10 @@ list>.text:hover { box-shadow: 0 0 15px #7f7f7f7f; } +.window.min{ + margin-top: 17%; +} + .window.show-begin { display: block; } diff --git a/desktop.html b/desktop.html index 8b29f84..9dddba7 100644 --- a/desktop.html +++ b/desktop.html @@ -17,10 +17,10 @@ 本项目中微软、Windows和其他示范产品是微软公司的商标 --> - - - - + + + + @@ -52,10 +52,7 @@

Administartor

-

可用

- +

设置

- +

文件资源管理器

- +

计算器

其它

相机

@@ -116,21 +110,17 @@
- +

计算器

相机

反馈中心

Windows 安全中心

-

关于Win12网页版

- +

关于Win12网页版

+

文件资源管理器

记事本

- +

设置

Microsoft Store

任务管理器

@@ -187,15 +177,14 @@
- -

设置

+

设置

- - - - - + + +
@@ -336,15 +321,9 @@

文件资源管理器

- - - - - - - - - + + +
@@ -352,20 +331,12 @@
@@ -383,30 +354,30 @@
- 新建
- - - -
- 排序方式 - 布局 + 新建
+ + + +
+ 排序方式 + 布局
-

此电脑

+

此电脑

此电脑

-

设备和驱动器

+

设备和驱动器

- +

本地磁盘 (C:)

@@ -416,7 +387,7 @@
- +

本地磁盘 (D:)

- 𝑥² + 𝑥² √𝑥 C + @@ -477,22 +442,16 @@

关于 Windows12 网页版

- - - - - - - - - + + +
@@ -516,6 +475,15 @@