diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e3ad39b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +web.config \ No newline at end of file diff --git a/apps/icons/explorer/disk.svg b/apps/icons/explorer/disk.svg new file mode 100644 index 0000000..278fd3d --- /dev/null +++ b/apps/icons/explorer/disk.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/icons/explorer/diskwin.svg b/apps/icons/explorer/diskwin.svg new file mode 100644 index 0000000..50d6bcc --- /dev/null +++ b/apps/icons/explorer/diskwin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/icons/explorer/folder.svg b/apps/icons/explorer/folder.svg new file mode 100644 index 0000000..f8a8f76 --- /dev/null +++ b/apps/icons/explorer/folder.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/icons/explorer/thispc.svg b/apps/icons/explorer/thispc.svg new file mode 100644 index 0000000..0a1939c --- /dev/null +++ b/apps/icons/explorer/thispc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/style/about.css b/apps/style/about.css index f2a9702..d252ef1 100644 --- a/apps/style/about.css +++ b/apps/style/about.css @@ -130,4 +130,56 @@ #contri>.button { height: max-content; margin: 10px 0 0 10px; +} + +.window.winver{ + width: 600px; + height: 550px; +} + +#win-winver>.logo{ + display: flex; + justify-content: center; +} + +#win-winver>.logo>.img{ + background: url(../../icon/logo.svg) center; + background-size: cover; + height: 80px; + width: 80px; + margin:10px; +} + +#win-winver>.logo>p{ + background-image: linear-gradient(100deg, var(--theme-1), var(--theme-2)); + -webkit-background-clip: text; + background-clip: text; + -webkit-text-fill-color: transparent; + font-size: 45px; + font-weight: 550; + font-family: 'Microsoft Yahei UI'; + margin: 15px; +} + +#win-winver>hr{ + width: calc(100% - 20px); + margin: 10px; +} + +#win-winver p{ + margin: 0 50px; +} + +#win-winver>.mesg:hover{ + text-decoration: underline!important; +} + +#win-winver>.mesg:active{ + opacity: 0.5; + transition: 30ms; +} + +#win-winver>.bottom{ + position: absolute; + bottom: 80px; } \ No newline at end of file diff --git a/apps/style/explorer.css b/apps/style/explorer.css index a291262..489b2af 100644 --- a/apps/style/explorer.css +++ b/apps/style/explorer.css @@ -206,6 +206,7 @@ border-radius: 5px; display: flex; border: 1.5px solid transparent; + transition: 40ms, transform 400ms cubic-bezier(0.14, 1.02, 0.17, 0.03); } #win-explorer>.main>.content>.view>.item:active{ @@ -219,12 +220,13 @@ } #win-explorer>.main>.content>.view>.item.file>img{ - width: 20px; - height: 20px; - margin: 3px; + width: 22px; + height: 22px; + margin: 2px; } #win-explorer>.main>.content>.view>.item:hover{ background-color: var(--hover); - border: 1.5px solid #6f6f6f30; + /* border: 1.5px solid #6f6f6f30; */ + box-shadow: 0 1px 2px var(--s3d); } \ No newline at end of file diff --git a/apps/style/python-editor.css b/apps/style/python-editor.css deleted file mode 100644 index d994d24..0000000 --- a/apps/style/python-editor.css +++ /dev/null @@ -1,53 +0,0 @@ -#win-python-editor *::-webkit-scrollbar-track { - background-color: transparent; -} - -#win-python-editor *::-webkit-scrollbar-thumb { - background-color: #FFFFFF22; - border-radius: 0; -} - -#win-python-editor *::-webkit-scrollbar-button { - display: none; - height: 0px; - width: 0px; -} - -#win-python-editor { - display: grid; - grid-template-rows: 60% 40%; - user-select: all; -} - -.window.python-editor .titbar .run { - font-size: 16px; - padding-top: 4px; -} - -#win-python-ace-editor { - font-size: 16px; - line-height: 1.25; - height: 100%; -} - -#win-python-editor .output { - background-color: #0f0f0f; - color: #f8f8f2; - border: 25px solid #1a1a1a !important; - border: none; - /* border-radius: 5px; */ - padding: 10px; - width: 100%; - height: 100%; - font: 14px / normal 'Consolas', 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'Source Code Pro', 'source-code-pro', monospace; - overflow-y: scroll; - white-space: pre-wrap; - word-wrap: break-word; - user-select: auto; -} - -#win-python-editor .output::selection { - background: #ddd; - background-clip: content-box; - color: #333; -} \ No newline at end of file diff --git a/apps/style/pythonEditor.css b/apps/style/pythonEditor.css new file mode 100644 index 0000000..e591940 --- /dev/null +++ b/apps/style/pythonEditor.css @@ -0,0 +1,83 @@ +#win-pythonEditor *::-webkit-scrollbar { + background-color: #FFFFFF10; +} + +::-webkit-scrollbar:hover { + background-color: #ffffff10; +} + +#win-pythonEditor *{ + scroll-behavior:initial !important; +} + +#win-pythonEditor { + display: grid; + grid-template-rows: 60% 40%; + min-height: 0px; + user-select: all; +} + +.window.pythonEditor .titbar .run { + font-size: 17px; + padding-top: 4px; +} + +#win-python-ace-editor { + font-size: 16px; + line-height: 1.25; + height: 100% !important; + font-weight: 200; +} + +#win-pythonEditor .output { + background-color: #0f0f0f; + color: #f8f8f2; + border: 25px solid #1a1a1a !important; + border: none; + /* border-radius: 5px; */ + padding: 10px; + width: 100%; + height: 100%; + font: 14px / normal 'Consolas', 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'Source Code Pro', 'source-code-pro', monospace; + overflow-y: scroll; + white-space: pre-wrap; + word-wrap: break-word; + user-select: auto; +} + +#win-pythonEditor .output::selection { + background: #ddd; + background-clip: content-box; + color: #333; +} +/* 编辑器 */ +.ace_editor.ace_autocomplete.ace_dark.ace-vibrant-ink{ + border-radius: 8px; + box-shadow: 1px 1px 10px #000; +} + +.ace_autocomplete .ace_layer.ace_marker-layer>.ace_active-line{ + border-radius: 5px; + background-color: #ffffff30 !important; +} +.ace_autocomplete .ace_layer.ace_marker-layer>.ace_line-hover{ + border-radius: 5px; + background: #ffffff20; + border-color: var(--href); + transition: 100ms; +} +.ace_autocomplete .ace_layer.ace_text-layer>.ace_line{ + padding: 0px 6px; +} + +.ace_autocomplete .ace_layer.ace_text-layer>.ace_line>.ace_completion-highlight{ + color: var(--theme-1); +} + +.ace_tooltip{ + border-radius: 8px; + box-shadow: 1px 1px 10px #000; + background-color: #26282c !important; + border: 1px #484747 solid; + padding: 5px 8px; +} \ No newline at end of file diff --git a/apps/style/setting.css b/apps/style/setting.css index 02cb78b..79ce9a7 100644 --- a/apps/style/setting.css +++ b/apps/style/setting.css @@ -327,4 +327,34 @@ div.app-color input[type=color] { position: relative; float: right; right: 5px; +} + +#set-theme{ + display: flex; + flex-wrap: wrap; + justify-content: left; +} + +#set-theme>.a{ + width: 100px; + height: 100px; + border-radius: 10px; +} + +#set-theme>.a{ + background-size: cover; + color: #fff; + text-shadow: 1px 1px 3px #000; + text-align: right; + padding: 3px 8px; + box-shadow: 1px 1px 5px var(--sd); + margin: 7px 7px 0 0; +} + +#set-theme>.a:hover{ + filter: brightness(1.3) saturate(1.3); +} + +#set-theme>.a:active{ + opacity: 0.75; } \ No newline at end of file diff --git a/apps/style/terminal.css b/apps/style/terminal.css index 47ee5a3..c5c9dad 100644 --- a/apps/style/terminal.css +++ b/apps/style/terminal.css @@ -1,7 +1,6 @@ .window.terminal-apps { --text: #ddd; --bg: #000000; - --bg30: #00000030; --bg50: #00000050; --bg70: #00000070; --sd: #00000070; @@ -30,7 +29,7 @@ } .window.terminal-apps>.content>pre { - color: #fff; + color: #ddd; margin: 0px 15px; font-family: "Consolas", "Monaco", "monospace", system-ui; user-select: text; @@ -52,7 +51,7 @@ border: none; outline: none; padding: 0; - color: #fff; + color: #eee; cursor: default; width: 100%; } diff --git a/desktop.css b/desktop.css index ed35673..bdbc62a 100644 --- a/desktop.css +++ b/desktop.css @@ -4,10 +4,9 @@ :root { --text: #000; --bg: #ffffff; - --bg30: #ffffff30; --bg50: #ffffff80; --bg70: #ffffff80; - --sd: #33333370; + --sd: #22222280; --card: #efefef55; --hover: #ffffff65; --hover-half: #ffffff40; @@ -24,13 +23,12 @@ --theme-2:#3b91d8; --href:#2983cc; --bd:#8f8f8f30; - /* --bd:#ffffff10; */ + --s3d:#99999940; } :root.dark { --text: #ddd; --bg: #000000; - --bg30: #00000030; --bg50: #00000060; --bg70: #00000080; --sd: #000000a0; @@ -47,6 +45,7 @@ --hr:#00000050; --unfoc:#333; --bd:#ffffff06; + --s3d:#11111160; } :root.nobr *, @@ -73,90 +72,6 @@ backdrop-filter: blur(30px); } -:root.noblur{ - --bg30:var(--bg); - --bg50:var(--bg); - --bg70:var(--bg); - --cm:var(--bggrey); -} - -/* :root.noblur .window.foc, -:root.noblur .dock, -:root.noblur .menu{ - background: var(--bg) !important; -} */ - -/* -:root { - --text: #000; - --bg: #ffffff; - --bg30: #ffffff30; - --bg50: #ffffff50; - --bg70: #ffffff70; - --sd: #53535351; - --card: #efefef60; - --hover: #ffbbbb70; - --hover-half: #ff808050; - --hover-b: #74000030; - --bggrey: #ddd; - --fill:#d3d3d370; - --bgul: url('newyear-light.png'); - --mm: #ff6464c0; - --cm: #fafafabb; - --bar: #efefef37; - --hr:#00000013; - --unfoc:#ff9797; - --theme-1:rgb(215, 51, 114); - --theme-2:rgb(167, 58, 151); - --theme-f:hue-rotate(58deg) saturate(0.8) contrast(1.5) brightness(0.9); - --href:red; -} -:root.dark { - --text: #ddd; - --bg: #000000; - --bg30: #00000030; - --bg50: #00000050; - --bg70: #00000070; - --sd: #00000070; - --card: #72727240; - --hover: #ff616140; - --hover-half: #ff616120; - --hover-b: #ff616130; - --bggrey: #444; - --fill:#54545470; - --bgul: url('newyear-dark.png'); - --mm: #ff5b5b50; - --cm: #252525bb; - --bar: #7272722a; - --hr:#00000050; - --unfoc:#3a1a1a; -} */ - -/* #start-btn>.ico{ - filter: var(--theme-f); -} - -#search-btn>.in{ - filter: var(--theme-f); -} - -img[src="icon/about.png"]{ - filter: var(--theme-f) !important; -} - -#loadbacksvg{ - filter: var(--theme-f); -} - -#s-m-user{ - filter: var(--theme-f); -} - -#win-setting>.menu>.user>svg{ - filter: var(--theme-f); -} */ - - body, p { transition: 100ms; @@ -204,8 +119,8 @@ hr { background-color: #afafaf50; } -* { - scroll-behavior: smooth; +.scsmoo { + /* scroll-behavior: smooth; */ } ::-webkit-scrollbar { @@ -268,19 +183,19 @@ list>a:active, } .dock { - border-radius: 7px; + border-radius: 8px; height: 100%; background-color: var(--bg70); - backdrop-filter: blur(20px) saturate(1.3); - -webkit-backdrop-filter: blur(20px) saturate(1.3); - box-shadow: 3px 3px 10px 1px var(--sd); + backdrop-filter: blur(20px) saturate(1.5); + -webkit-backdrop-filter: blur(20px) saturate(1.5); + box-shadow: 0 1px 2px #44444460, 0px 3px 25px 1px var(--sd); padding: 7px 6px; margin: 0 3px; display: flex; - transition: 200ms, transform 300ms cubic-bezier(0.14, 1.02, 0.17, 0.03),opacity 0ms; + transition: 200ms, transform 300ms cubic-bezier(0.14, 1.02, 0.17, 0.03),backdrop-filter,-webkit-backdrop-filter 0ms; bottom: 0; - transform: scale(1); - border: 1.5px solid #6f6f6f30; + /* transform: scale(1); */ + /* border: 1.5px solid #6f6f6f30; */ } .dock>* { @@ -289,8 +204,10 @@ list>a:active, } .dock.about:hover, -.dock.theme:hover { - filter: opacity(0.8) brightness(1.2); +.dock.theme:hover, +.dock.date:hover { + backdrop-filter: blur(20px) saturate(1.5) brightness(1.2); + -webkit-backdrop-filter: blur(20px) saturate(1.5) brightness(1.2); } .dock.about { @@ -312,10 +229,6 @@ list>a:active, transition-delay: 200ms; } -.dock.about:hover { - filter: opacity(0.8) brightness(1.2); -} - .dock.about:active>p { display: block; } @@ -339,7 +252,8 @@ list>a:active, } .dock.about.show:hover { - filter: opacity(0.9) brightness(1); + backdrop-filter: blur(20px) saturate(1.5) brightness(1.2); + -webkit-backdrop-filter: blur(20px) saturate(1.5) brightness(1.2); } @@ -351,7 +265,7 @@ list>a:active, } #taskbar>a { - border-radius: 5px; + border-radius: 10px; height: 34px; width: 38px; transition: 100ms; @@ -372,9 +286,10 @@ list>a:active, } #taskbar>a>img { - width: 24px; - height: 24px; + width: 26px; + height: 26px; transition: 100ms; + margin: -1px 0 0 -0.5px; } #taskbar>a:not(.min)>img { @@ -383,22 +298,26 @@ list>a:active, @keyframes task-show { 0% { - margin-top: 0; + margin-top: -1px; margin-bottom: 0; } 40% { - margin-top: -5px; + margin-top: -6px; margin-bottom: 5px; + transform: scaleY(1.1); + transform-origin: bottom; } 60% { - margin-top: 2px; + margin-top: 1px; margin-bottom: -2px; + transform: scaleY(0.8); + transform-origin: bottom; } 100% { - margin-top: 0; + margin-top: -1px; margin-bottom: 0; } } @@ -409,22 +328,28 @@ list>a:active, @keyframes task-hide { 0% { - margin-top: 0; + margin-top: -1px; margin-bottom: 0; } 40% { - margin-top: 4px; - margin-bottom: -4px; + /* margin-top: 3px; + margin-bottom: -4px; */ + margin-top: 0px; + margin-bottom: -1px; + transform: scaleY(0.8); + transform-origin: bottom; } 70%{ margin-top: -2px; - margin-bottom: 2px; + margin-bottom: 1px; + transform: scaleY(1.05); + transform-origin: bottom; } 100% { - margin-top: 0; + margin-top: -1px; margin-bottom: 0; } } @@ -437,7 +362,7 @@ list>a:active, height: 4px; border-radius: 2px; position: relative; - bottom: 3px; + bottom: 4px; left: 3.2px; transition: 150ms; } @@ -484,7 +409,11 @@ list>a:active, } .dock.control>icon { - font-size: 18.5px; + font-size: 17px; +} + +.dock.control>* { + margin: 0 -2px 0 -1px; } .dock.control:active { @@ -583,7 +512,7 @@ list>a:active, transition-delay: 200ms; } -#start-btn>svg.ico { +#start-btn>.ico { position: relative; top: -32px; transition: transform 200ms, top 200ms 100ms, left 200ms; @@ -591,7 +520,7 @@ list>a:active, /* transition-delay: 100ms; */ } -#start-btn.show>svg.ico { +#start-btn.show>.ico { transform: scale(0.5); top: -26px; } @@ -600,7 +529,7 @@ list>a:active, position: relative; display: block; top: -29.6px; - left: 3px; + left: 2.5px; width: 16px; height: 16px; transition: 200ms; @@ -611,8 +540,8 @@ list>a:active, } #search-btn.show>svg.in { - transform: scale(1.1); - filter: hue-rotate(380deg) brightness(1.1); + transform: scale(1.1) rotate(360deg); + filter: saturate(2) brightness(1.1); } #widgets-btn>svg { @@ -624,39 +553,39 @@ list>a:active, } #widgets-btn>.wid2 { - margin-top: -14px; - margin-left: 13.3px; - height: 12px; + margin-top: -19px; + margin-left: 10.5px; + height: 20px; transition: 150ms cubic-bezier(0.8, 0, 0.2, 1); transition-delay: 0ms; } #widgets-btn>.wid3 { margin-top: 13px; - margin-left: 2px; - height: 22px; + margin-left: -2px; + height: 31px; transition: 100ms cubic-bezier(0.8, 0, 0.2, 1); transition-delay: 100ms; } #widgets-btn>.wid4 { margin-top: 4px; - margin-left: 13.3px; - height: 8.5px; + margin-left: 11.5px; + height: 12px; transition: 200ms cubic-bezier(0.8, 0, 0.2, 1); transition-delay: 180ms; } #widgets-btn.show>.wid2 { - margin-top: -24px; + margin-top: -28px; } #widgets-btn.show>.wid3 { - margin-top: -12px; + margin-top: -20.5px; } #widgets-btn.show>.wid4 { - margin-top: -9px; + margin-top: -14px; } @@ -674,7 +603,7 @@ list>a:active, -webkit-backdrop-filter: blur(80px) saturate(1.3); opacity: 0.5; transition: 200ms; - box-shadow: 3px 3px 15px 1px var(--sd); + box-shadow: 3px 3px 25px 1px var(--sd); border: 1.5px solid #6f6f6f30; z-index: 99; } @@ -759,9 +688,9 @@ input-before { } #s-m-l>list>a>img { - height: 25px; - width: 25px; - margin-top: 3px; + height: 30px; + width: 30px; + margin-top: 1px; } #s-m-l>list>.text { @@ -774,8 +703,10 @@ input-before { #s-m-r { flex-grow: 1; margin-left: -15px; - overflow: auto; - padding-bottom: 30px; + overflow: hidden; + padding-bottom: 10px; + display: flex; + flex-direction: column; } #s-m-r>*{ @@ -889,7 +820,7 @@ input-before { } #s-m-r>.pinned { - padding: 10px 10px; + padding: 10px 5px; margin-right: 10px; margin-left: 15px; border-radius: 10px; @@ -897,12 +828,17 @@ input-before { box-shadow: 3px 3px 6px var(--sd); transition-delay: 300ms; border: 1.5px solid #6f6f6f30; + height: 220px; + display: flex; + flex-direction: column; } #s-m-r>.pinned>.apps { display: flex; flex-wrap: wrap; - padding-left: 15px; + padding-left: 10px; + overflow: auto; + flex-grow: 1; } @@ -925,12 +861,17 @@ input-before { box-shadow: 3px 3px 6px var(--sd); transition-delay: 450ms; border: 1.5px solid #6f6f6f30; + flex-grow: 1; + display: flex; + overflow: hidden; + flex-direction: column; } #s-m-r>.tuijian>.apps { display: flex; flex-wrap: wrap; padding-left: 15px; + overflow: auto; } #s-m-r>.tuijian>.apps>* { @@ -1016,9 +957,9 @@ input-before { } .sm-app>*:first-child { - height: 34px; - width: 34px; - margin-top: 12px; + height: 40px; + width: 40px; + margin-top: 8px; transition: 80ms; filter: contrast(0.3) brightness(0.7); text-shadow: 3px 3px 5px var(--sd); @@ -1035,17 +976,8 @@ input-before { background-color: unset; } -.sm-app:active { - padding-top: 3px; -} - -.sm-app:active>*:last-child { - margin-top: 0px; -} - .sm-app:active>*:first-child { - height: 28px; - width: 28px; + transform: scale(0.8); } .sm-app.enable:active>*:first-child { @@ -1190,9 +1122,9 @@ input-before { } #search-win>.ans>.list>list>a>img{ - height: 23px; - width: 23px; - margin: 1px 5px 7px 0; + height: 25px; + width: 25px; + margin: 0px 5px 7px 0; } #search-win>.ans>.view { @@ -1692,8 +1624,8 @@ input-before { } #desktop>div>img { - width: 50px; - height: 50px; + width: 65px; + height: 65px; } #desktop>div.b>img { @@ -1720,16 +1652,21 @@ input-before { } .input { - background-color: var(--bg70); - border-radius: 10px; + background-color: var(--bg50); border: none; border-bottom: 2.5px solid; border-bottom-color: #7f7f7f7f; - padding: 3px 5px 4px 8px; + border-radius: 13px; + padding: 3px 5px 3px 8px; outline: medium; width: 100%; color: var(--text); transition: 100ms,border 0s; + box-shadow: 0 1px 2px var(--s3d); +} + +.input:hover{ + background: var(--cm); } .input:focus { @@ -1738,7 +1675,7 @@ input-before { background-origin: padding-box, border-box; background-image: linear-gradient(var(--bg), var(--bg)), linear-gradient(90deg, var(--theme-1), var(--theme-2)); border-bottom-color: transparent; - box-shadow: 1px 1px 10px var(--sd); + box-shadow: 0 1px 10px var(--s3d); opacity: 1; } @@ -1961,6 +1898,7 @@ list>a:hover { color: var(--text); background-color: var(--hover-half); text-decoration: none; + box-shadow: 0 1px 2px var(--s3d); } list>hr { @@ -1968,7 +1906,7 @@ list>hr { padding: 0 !important; margin: 2px 6px; background-color: #7f7f7f7f; - border-radius: 5px; + border-radius: 5px; height: 0.75px; cursor: inherit; } @@ -2110,9 +2048,9 @@ list>span.focs.cl{ .window.foc { background-color: var(--bg70); - backdrop-filter: blur(80px) saturate(1.3); + backdrop-filter: blur(80px) saturate(1.5); filter: none; - -webkit-backdrop-filter: blur(80px) saturate(1.3); + -webkit-backdrop-filter: blur(80px) saturate(1.5); box-shadow: 3px 3px 20px 3px var(--sd); } @@ -2128,46 +2066,17 @@ list>span.focs.cl{ opacity: 1; } +.window.webapp.load, +.window.webapp.content{ + background: var(--unfoc); +} + .window.webapp.foc>.titbar{ background-color: var(--bg70); backdrop-filter: blur(80px) saturate(1.3); -webkit-backdrop-filter: blur(80px) saturate(1.3); } -.window.foc.mica{ - /* backdrop-filter: blur(100px) saturate(2); */ - backdrop-filter: none; - -webkit-backdrop-filter: none; - filter: none; - background: var(--unfoc); -} - -/* .window.mica.foc .micaalt, */ -.window.mica.foc{ - background-image: linear-gradient(var(--bg70),var(--bg70)),url(bg-dark-mica.svg); - background-size: cover,var(--mica-size); - background-position: 0 0,var(--mica-pos); - background-clip: padding-box,padding-box; - background-origin: padding-box,padding-box; - background-repeat: no-repeat; -} - -/* .window.foc.mica::before { - display: block; - content: ''; - width: 100%; - height: 150px; - position: absolute; - z-index: -1; - background-image: linear-gradient(#00000000 0,var(--bg70) 60px,var(--unfoc) 150px),url(bg-dark-mica.svg); - background-size: cover,var(--mica-size); - background-position: 0 0,var(--mica-pos); - background-clip: padding-box,padding-box; - background-origin: padding-box,padding-box; - background-repeat: no-repeat; - filter: blur(10px); -} */ - .window.min { top: calc(95%) !important; left: 15% !important; @@ -2197,10 +2106,10 @@ list>span.focs.cl{ } .window>.loadback>.icon { - height: 70px; - width: 70px; - top: calc(50% - 51px); - left: calc(50% - 35px); + height: 90px; + width: 90px; + top: calc(50% - 45px); + left: calc(50% - 45px); position: absolute; } @@ -2250,9 +2159,9 @@ list>span.focs.cl{ } .window>.titbar>.icon { - margin: 6px 5px 0 0; - height: 22px; - width: 22px; + margin: 5px 5px 0 0; + height: 24px; + width: 24px; } .window>.titbar>div { diff --git a/desktop.html b/desktop.html index 753a319..9995007 100644 --- a/desktop.html +++ b/desktop.html @@ -33,7 +33,7 @@ - + @@ -84,49 +84,7 @@ } } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -198,37 +156,37 @@

可用

-

设置

+

设置

 -

文件资源管理器

+

文件资源管理器

 -

计算器

+

计算器

运行

 -

关于Win12网页版

+

关于Win12网页版

 -

记事本

+

记事本

 -

Microsoft Edge

+

Microsoft Edge

 - -

相机

+ +

相机

 - -

Python Editor

+ +

Python Editor

Python 3.10.2

 -

终端

+

终端

Whiteboard

@@ -246,13 +204,13 @@
-

文档

+

文档

 -

图片

+

图片

 -

音乐

+

音乐
@@ -288,41 +246,41 @@
- -

计算器

+ +

计算器

 - -

相机

+ +

相机

 -

反馈中心

+

反馈中心

 - +

Windows 安全中心

 - -

关于Win12网页版

+ +

关于Win12网页版

 - -

文件资源管理器

+ +

文件资源管理器

 - -

记事本

+ +

记事本

 - -

设置

+ +

设置

- +

Microsoft Store

 - -

Microsoft Edge

+ +

Microsoft Edge

这是Office

 - -

终端

+ +

终端
@@ -362,13 +320,13 @@ setTimeout(() => { $('#search-win').removeClass('show-begin'); }, 200);"> -

设置

+

设置

-

关于Win12网页版

 +

关于Win12网页版

@@ -402,7 +360,7 @@
- + @@ -645,8 +603,8 @@ stroke-miterlimit="8" fill="none" fill-rule="evenodd" /> - - + + + - - + + - - - - + + + +
-
-
- +
+
+

文件资源管理器

@@ -945,7 +909,7 @@
- +
@@ -956,7 +920,7 @@ OneDrive - 此电脑 + 此电脑 回收站
@@ -1001,9 +965,9 @@
-
-
- +
+
+

计算器

@@ -1012,7 +976,7 @@
- +
@@ -1040,9 +1004,9 @@
-
-
- +
+
+

关于 Windows12 网页版

@@ -1051,11 +1015,11 @@
- +
- + 简介 更新记录 @@ -1097,6 +1061,19 @@

更新记录

+
v5.4.0 新版logo与图标，UI优化，自定主题与winver

+   (更新来自 @tjy-gitnub,其实我想发v6的)
+   -新Logo:新版logo
+   -新图标:重绘替换了win11的图标
+   -自定主题:支持用户更改和上传自己的主题
+   -版本信息:新增winver
+   -新UI:加入win11的悬停立体高亮
+   -启动优化:加快速度，修复本地因获取电量失败无法启动的问题
+   -UI适配:稍稍更改了不适配的UI
+   -Bug修复:右键菜单无法关闭
+   -代码优化:对某些重复代码整理归纳，引入应用的初始化load配置
+   -细节优化和修复

+
v5.3.1 问题修复

  更新来自 @User782Tec
  -修复了样式不正常的问题
@@ -1285,9 +1262,9 @@

-
-
- +
+
+

记事本

@@ -1296,7 +1273,7 @@
- +
@@ -1310,16 +1287,16 @@ 另存为
-
-
- +
+
+

字体

- +
@@ -1397,9 +1374,9 @@
-
-
- +
+
+

终端

@@ -1408,7 +1385,7 @@
- +
@@ -1420,9 +1397,9 @@ 
C:\Windows\System32>
-
-
- +
+
+

Python 3.10.2

@@ -1443,16 +1420,11 @@ 
>>>
- -
-
-

Microsoft Edge

+
+
+

Microsoft Edge

-
-

新建标签页

- -
- +
@@ -1462,7 +1434,7 @@
- +
@@ -1500,9 +1472,9 @@
-
-
- +
+
+

Visual Studio Code

@@ -1517,9 +1489,9 @@
-
-
- +
+
+

哔哩哔哩

@@ -1534,28 +1506,28 @@
-
-
- +
+
+

Python Editor

- - - - + + + +
- +
-
+
-
-
- +
+
+

相机

@@ -1564,7 +1536,7 @@
- +
@@ -1579,20 +1551,20 @@
-
-
- +
+
+

提示

- +
-
+

  欢迎使用“相机”应用！本应用由 User782Tec 开发， tjy-gitnub 维护。
@@ -1605,9 +1577,9 @@

-
-
- +
+
+

运行

@@ -1696,6 +1668,36 @@
- +
+
+

关于 Windows

+
+ +
+
+
+
+
+ +
+

Microsoft Windows

+

版本 25H2 (OS 内部版本 24612.1896)

+

© Microsoft Corporation。保留所有权利。

+

Windows12 专业版操作系统及其用户界面受美国和其他国家/地区的商标法和其他待颁布或已颁布的知识产权法保护。

+
+

根据Microsoft软件许可条款，许可如下用户使用本产品

+

Administrator

+
+

上面都是胡扯，切勿当真(双击隐藏此消息)

+
+ 确定 +
+
+
+ diff --git a/desktop.js b/desktop.js index 0644bf0..c188568 100644 --- a/desktop.js +++ b/desktop.js @@ -52,10 +52,12 @@ $('input,textarea,*[contenteditable=true]').on('contextmenu', (e) => { stop(e); return true; }); +let nomax={'calc':0,'notepad-fonts':0,'camera-notice':0,'winver':0,'run':0}; +let nomin={'notepad-fonts':0,'camera-notice':0,'run':0}; let cms = { 'titbar': [ function (arg) { - if (arg == 'calc' || arg == 'notepad-fonts' || arg == 'camera-notice' || arg == 'run') { + if (arg in nomax) { return 'null'; } if ($('.window.' + arg).hasClass("max")) { @@ -66,7 +68,7 @@ let cms = { } }, function (arg) { - if (arg == 'notepad-fonts' || arg == 'camera-notice' || arg == 'run') { + if (arg in nomin) { return 'null'; } else { @@ -74,7 +76,7 @@ let cms = { } }, function (arg) { - if (arg == 'notepad-fonts' || arg == 'camera-notice') { + if (arg in nomin) { return [' 关闭', `hidewin('${arg}', 'configs')`]; } else { @@ -123,38 +125,21 @@ let cms = { return [' 打开', `openapp('${arg[0]}');hide_startmenu();`]; }, function (arg) { - if (arg[0] != 'js') { - return [' 在桌面创建链接', "$('#desktop').append(`

" + arg[1] + "

`)"]; - } - else if (arg[0] == 'js') { - return [' 在桌面创建链接', "$('#desktop').append(`

" + arg[3] + "

`)"]; - } + return [' 在桌面创建链接', "$('#desktop').append(`

" + arg[1] + "

`)"]; + }, + function(arg) { + return [' 取消固定', `$('#s-m-r>.pinned>.apps>.sm-app.${arg[0]}').remove()`]; } ], 'smlapp': [ function (arg) { - if (arg[0] != 'js') { - return [' 打开', `openapp('${arg[0]}');hide_startmenu();`]; - } - else if (arg[0] == 'js') { - return [' 打开', `${arg[1]};hide_startmenu();`]; - } + return [' 打开', `openapp('${arg[0]}');hide_startmenu();`]; }, function (arg) { - if (arg[0] != 'js') { - return [' 在桌面创建链接', "$('#desktop').append(`

" + arg[1] + "

`)"]; - } - else if (arg[0] == 'js') { - return [' 在桌面创建链接', "$('#desktop').append(`

" + arg[3] + "

`)"]; - } + return [' 在桌面创建链接', "$('#desktop').append(`

" + arg[1] + "

`)"]; }, function (arg) { - if (arg[0] != 'js') { - return [' 固定到开始菜单', "pinapp('" + arg[0] + "', '" + arg[1] + "', 'openapp("" + arg[0] + "");hide_startmenu();')"]; - } - else if (arg[0] == 'js') { - return [' 固定到开始菜单', "pinapp('" + arg[2] + "', '" + arg[3] + "', '" + arg[1] + ";hide_startmenu()')"] - } + return [' 固定到开始菜单', "pinapp('" + arg[0] + "', '" + arg[1] + "', 'openapp("" + arg[0] + "");hide_startmenu();')"]; } ], 'dockabout': [ @@ -200,6 +185,7 @@ function showcm(e, cl, arg) { let h = ''; cms[cl].forEach(item => { if (typeof (item) == 'function') { + arg.event=e; ret = item(arg); if (ret == 'null') return true; h += `${ret[0]}\n`; @@ -211,7 +197,8 @@ function showcm(e, cl, arg) { }) $('#cm>list')[0].innerHTML = h; $('#cm').addClass('show-begin'); - // $('#cm>.foc').focus(); + $('#cm>.foc').focus(); + // 这个.foc是用来模拟焦点的，这句是将焦点放在右键菜单上，注释掉后果不堪设想 >u-)o setTimeout(() => { $('#cm').addClass('show'); }, 0); @@ -407,7 +394,59 @@ let apps = { $('#win-setting>.page>.cnt.' + name).addClass('show'); $('#win-setting>.menu>list>a.check').removeClass('check'); $('#win-setting>.menu>list>a.' + name).addClass('check'); - } + }, + theme_get: () => { + $('#set-theme').html(` + + `) + // 实时获取主题 + $.get('https://api.github.com/repos/tjy-gitnub/win12-theme/contents').then(cs => { + cs.forEach(c => { + if(c.type=='dir'){ + let ul; + $.get(c.url).then(cnt=>{ + cnt.forEach(cn=>{ + if(cn.name=='theme'){ + $.get('https://tjy-gitnub.github.io/win12-theme/'+cn.path).then(inf=>{ + infjs=eval('('+inf+')'); + cnt.forEach(fbg=>{ + console.log(fbg,infjs); + if(fbg.name==infjs.bg){ + if($('#set-theme>loading').length) + $('#set-theme').html(''); + $('#set-theme').append(`${c.name}`); + } + }) + }) + } + }) + }) + } + }); + }); + }, + theme_set: (infp)=>{ + $.get('https://api.github.com/repos/tjy-gitnub/win12-theme/contents/'+infp).then(cnt=>{ + console.log('https://api.github.com/repos/tjy-gitnub/win12-theme/contents/'+infp); + cnt.forEach(cn=>{ + if(cn.name=='theme'){ + $.get('https://tjy-gitnub.github.io/win12-theme/'+cn.path).then(inf=>{ + infjs=eval('('+inf+')'); + cnt.forEach(fbg=>{ + console.log(fbg,infjs); + if(fbg.name==infjs.bg){ + $(':root').css('--bgul',`url('https://tjy-gitnub.github.io/win12-theme/${fbg.path}')`); + $(':root').css('--theme-1',infjs.color1); + $(':root').css('--theme-2',infjs.color2); + $(':root').css('--href',infjs.href); + // $('#set-theme').append(`${c.name}`); + } + }) + }) + } + }) + }) + }, }, run: { init: () => { @@ -661,7 +700,8 @@ let apps = { $('#win-explorer>.main>.content>.view')[0].innerHTML = ` -

设备和驱动器

+

设备和驱动器

-

本地磁盘 (C:)

+

本地磁盘 (C:)

32.6 GB 可用, 共 143 GB

 -

本地磁盘 (D:)

+

本地磁盘 (D:)

185.3 GB 可用, 共 216 GB

`; $('#win-explorer>.main>.content>.tool>.tit')[0].innerHTML = '此电脑'; }, @@ -695,8 +735,8 @@ let apps = { else { let ht = ''; for (folder in tmp['folder']) { - ht += ` - ${folder}`; + ht += ` + ${folder}`; } if (tmp['file']) { tmp['file'].forEach(file => { @@ -720,14 +760,14 @@ let apps = { 'Program Files': { folder: { 'WindowsApps': null, 'Microsoft': null }, file: [ - { name: 'about.exe', ico: 'icon/about.png', command: "openapp('about')" }, - { name: 'setting.exe', ico: 'icon/setting.png', command: "openapp('setting')" }, + { name: 'about.exe', ico: 'icon/about.svg', command: "openapp('about')" }, + { name: 'setting.exe', ico: 'icon/setting.svg', command: "openapp('setting')" }, ] }, 'Windows': { folder: { 'Boot': null, 'System': null, 'System32': null }, file: [ - { name: 'notepad.exe', ico: 'icon/notepad.png', command: "openapp('notepad')" }, + { name: 'notepad.exe', ico: 'icon/notepad.svg', command: "openapp('notepad')" }, ] }, '用户': { @@ -834,6 +874,10 @@ let apps = { output.innerHTML = result; }, load: () => { + if(!apps.python.loaded){ + apps.python.loaded=true; + apps.python.load(); + } ace.require("ace/ext/language_tools"); apps.pythonEditor.editor = ace.edit("win-python-ace-editor"); apps.pythonEditor.editor.session.setMode("ace/mode/python"); @@ -958,6 +1002,15 @@ let apps = { codeCache: '', prompt: '>>> ', indent: false, + load: ()=>{ + (async function () { + apps.python.pyodide = await loadPyodide(); + apps.python.pyodide.runPython(` +import sys +import io +`); + })(); + }, init: () => { $('#win-python').html(` 
@@ -1035,6 +1088,7 @@ Microsoft Windows [版本 12.0.39035.7324]
         

         
C:\\Windows\\System32> 
`)
+            $('#win-terminal>pre>input').focus()
         },
         run: () => {
             const elt = $('#win-terminal>pre.text-cmd')[0];
@@ -1093,13 +1147,13 @@ Microsoft Windows [版本 12.0.39035.7324]
 					setTimeout(() => {
 						$('#search-win').removeClass('show-begin');
 					}, 200);">
-						
设置

+						
设置

 					
-						
关于Win12网页版
`);
+						
关于Win12网页版
`);
                 $('#search-win>.ans>.view').removeClass('show');
             }
         },
@@ -1314,6 +1368,12 @@ Microsoft Windows [版本 12.0.39035.7324]
             apps.edge.getTitle($('#win-edge>iframe.show').attr('src'), apps.edge.now);
         }
     },
+    winver:{
+        init:()=>{
+            $('#win-winver>.mesg').show();
+        },
+
+    }
 }
 
 // 小组件
@@ -1372,8 +1432,24 @@ for (let i = 1; i <= daysum; i++) {
     $('#datebox>.cont>.body')[0].innerHTML += `
${i}
`;
 }
 function pinapp(id, name, command) {
-    $('#s-m-r>.pinned>.apps').append("
" + name + "
")
+    if($('#s-m-r>.pinned>.apps>.a.sm-app.'+id).length)return;
+    $('#s-m-r>.pinned>.apps').append(`
${name}
`)
 }
+let icon={
+    bilibili:'bilibili.png',
+    vscode:'vscode.png',
+    python:'python.png',
+    winver:'about.svg',
+    pythonEditor:'pythonEditor.png',
+    run:'run.png',
+    whiteboard:'whiteboard.png'
+}
+function geticon(name) {
+    if(icon[name])return icon[name];
+    else return name+'.svg';
+}
+
+// 应用与窗口
 function openapp(name) {
     if ($('#taskbar>.' + name).length != 0) {
         if ($('.window.' + name).hasClass('min')) {
@@ -1385,7 +1461,10 @@ function openapp(name) {
     $('.window.' + name).addClass('load');
     showwin(name);
     $('#taskbar').attr('count', Number($('#taskbar').attr('count')) + 1);
-    $('#taskbar').append(``);
+    if(name in icon)
+        $('#taskbar').append(``);
+    else
+        $('#taskbar').append(``);
     if ($('#taskbar').attr('count') == '1') {
         $('#taskbar').css('display', 'flex');
     }
@@ -1396,6 +1475,13 @@ function openapp(name) {
     let tmp = name.replace(/\-(\w)/g, function (all, letter) {
         return letter.toUpperCase();
     });
+    if(apps[tmp].load && !apps[tmp].loaded){
+        apps[tmp].loaded=true;
+        apps[tmp].load();
+        apps[tmp].init();
+        $('.window.' + name).removeClass('load');
+        return;
+    }
     apps[tmp].init();
     setTimeout(() => {
         $('.window.' + name).removeClass('load');
@@ -1598,19 +1684,23 @@ function dragBrightness(e) {
 }
 
 // 控制面板 电量监测
-navigator.getBattery().then((battery) => {
-    $('.a.dock.control>svg>path')[0].outerHTML = ``;
-
-    battery.addEventListener('levelchange', () => {
+try{
+    navigator.getBattery().then((battery) => {
         $('.a.dock.control>svg>path')[0].outerHTML = ``;
+
+        battery.addEventListener('levelchange', () => {
+            $('.a.dock.control>svg>path')[0].outerHTML = ``;
+        });
     });
-});
+}catch(TypeError){
+    console.log('内部错误: 无法获取电量');
+}
 
 // 选择框
 let chstX, chstY;
@@ -1644,14 +1734,7 @@ function toggletheme() {
         setData('theme', 'light');
     }
 }
-// 云母效果
-let mica_difx = 0, mica_dify = 0;
-window.addEventListener('resize', e => {
-    let b = $('body')[0];
-    $(':root').css('--mica-size', `${Math.max(b.offsetHeight, b.offsetWidth)}px`);
-    mica_difx = (b.offsetHeight < b.offsetWidth) ? 0 : (b.offsetWidth - b.offsetHeight) / 2;
-    mica_dify = (b.offsetHeight < b.offsetWidth) ? (b.offsetHeight - b.offsetWidth) / 2 : 0;
-})
+
 
 // 拖拽窗口
 const page = document.getElementsByTagName('html')[0];
@@ -1669,7 +1752,7 @@ function win_move(e) {
     $(this).css('cssText', `left:${cx - deltaLeft}px;top:${cy - deltaTop}px;`);
     if (cy <= 0) {
         $(this).css('cssText', `left:${cx - deltaLeft}px;top:${-deltaTop}px`);
-        if (this.classList[1] != 'calc' && this.classList[1] != 'notepad-fonts' && this.classList[1] != 'camera-notice' && this.classList[1] != 'run') {
+        if (!(this.classList[1] in nomax)) {
             $('#window-fill').addClass('top');
             setTimeout(() => {
                 $('#window-fill').addClass('fill');
@@ -1677,10 +1760,11 @@ function win_move(e) {
             fil = this;
             filty = 'top';
         }
+        // console.log(this.classList[1], nomax,this.classList[1] in nomax,not this.classList[1] in nomax);
     }
     else if (cx <= 0) {
         $(this).css('cssText', `left:${-deltaLeft}px;top:${cy - deltaTop}px`);
-        if (this.classList[1] != 'calc' && this.classList[1] != 'notepad-fonts' && this.classList[1] != 'camera-notice' && this.classList[1] != 'run') {
+        if (!(this.classList[1] in nomax)) {
             $('#window-fill').addClass('left');
             setTimeout(() => {
                 $('#window-fill').addClass('fill');
@@ -1691,7 +1775,7 @@ function win_move(e) {
     }
     else if (cx >= document.body.offsetWidth - 2) {
         $(this).css('cssText', `left:calc(100% - ${deltaLeft}px);top:${cy - deltaTop}px`);
-        if (this.classList[1] != 'calc' && this.classList[1] != 'notepad-fonts' && this.classList[1] != 'camera-notice' && this.classList[1] != 'run') {
+        if (!(this.classList[1] in nomax)) {
             $('#window-fill').addClass('right');
             setTimeout(() => {
                 $('#window-fill').addClass('fill');
@@ -1719,9 +1803,6 @@ function win_move(e) {
 
         $(this).addClass('notrans');
     }
-    if ($(this).hasClass('mica')) {
-        $(this).css('--mica-pos', `${mica_difx - cx + deltaLeft}px ${mica_dify - cy + deltaTop}px`);
-    }
 }
 for (let i = 0; i < wins.length; i++) {
     const win = wins[i];
@@ -1804,8 +1885,8 @@ page.addEventListener('touchend', () => {
 // 启动
 let updated = false;
 document.getElementsByTagName('body')[0].onload = function nupd() {
-    $('#loginback').css('opacity', '1');
-    $('#loginback').css('display', 'flex');
+    // $('#loginback').css('opacity', '1');
+    // $('#loginback').css('display', 'flex');
     setTimeout(() => {
         $('#loadback').addClass('hide');
     }, 500);
@@ -1818,16 +1899,39 @@ document.getElementsByTagName('body')[0].onload = function nupd() {
         }, 1000);
     }
     apps.webapps.init();
-    (async function () {
-        apps.python.pyodide = await loadPyodide();
-        apps.python.pyodide.runPython(`
-import sys
-import io
-`);
-    })();
-    apps.pythonEditor.load();
-    apps.notepadFonts.load();
-    apps.whiteboard.load();
+    //getdata
+    if (localStorage.getItem('theme') == 'dark') $(':root').addClass('dark');
+    if(localStorage.getItem('color1')){
+        $(':root').css('--theme-1', localStorage.getItem('color1'));
+        $(':root').css('--theme-2', localStorage.getItem('color2'));
+    }
+    // 所以这个东西为啥要在开机的时候加载？
+    // 不应该在python.init里面吗？
+//     (async function () {
+//         apps.python.pyodide = await loadPyodide();
+//         apps.python.pyodide.runPython(`
+// import sys
+// import io
+// `);
+//     })();
+    // apps.pythonEditor.load();
+    // apps.notepadFonts.load();
+    // apps.whiteboard.load();
+    document.querySelectorAll('.window').forEach(w=>{
+        let qw=$(w),wc=w.classList[1];
+        // window: onmousedown="focwin('explorer')" ontouchstart="focwin('explorer')"
+        qw.attr('onmousedown',`focwin('${wc}')`);
+        qw.attr('ontouchstart',`focwin('${wc}')`);
+        // titbar: oncontextmenu="return showcm(event,'titbar','edge')" ondblclick="maxwin('edge')"
+        qw=$(`.window.${wc}>.titbar`);
+        qw.attr('oncontextmenu',`return showcm(event,'titbar','${wc}')`);
+        if(!(wc in nomax))qw.attr('ondblclick',`maxwin('${wc}')`);
+        // icon: onclick="return showcm(event,'titbar','explorer')"
+        qw=$(`.window.${wc}>.titbar>.icon`);
+        qw.attr('onclick',`let os=$(this).offset();stop(event);return showcm({clientX:os.left-5,clientY:os.top+this.offsetHeight+3},'titbar','${wc}')`);
+        qw.mousedown(stop);
+        $(`.window.${wc}>.titbar>div>.wbtg`).mousedown(stop);
+    });
 };
 
 // PWA 应用
diff --git a/icon/about.png b/icon/about.png
deleted file mode 100644
index 45cc120..0000000
Binary files a/icon/about.png and /dev/null differ
diff --git a/icon/about.svg b/icon/about.svg
new file mode 100644
index 0000000..6b09ad8
--- /dev/null
+++ b/icon/about.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/calc.png b/icon/calc.png
deleted file mode 100644
index 81c78b2..0000000
Binary files a/icon/calc.png and /dev/null differ
diff --git a/icon/calc.svg b/icon/calc.svg
new file mode 100644
index 0000000..ddb2aff
--- /dev/null
+++ b/icon/calc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/camera.png b/icon/camera.png
deleted file mode 100644
index 197073f..0000000
Binary files a/icon/camera.png and /dev/null differ
diff --git a/icon/camera.svg b/icon/camera.svg
new file mode 100644
index 0000000..5aed3c6
--- /dev/null
+++ b/icon/camera.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/defender.png b/icon/defender.png
deleted file mode 100644
index a1373b7..0000000
Binary files a/icon/defender.png and /dev/null differ
diff --git a/icon/defender.svg b/icon/defender.svg
new file mode 100644
index 0000000..01b3710
--- /dev/null
+++ b/icon/defender.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/edge.png b/icon/edge.png
deleted file mode 100644
index f5f81e3..0000000
Binary files a/icon/edge.png and /dev/null differ
diff --git a/icon/edge.svg b/icon/edge.svg
new file mode 100644
index 0000000..5397a08
--- /dev/null
+++ b/icon/edge.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/explorer.png b/icon/explorer.png
deleted file mode 100644
index fc48a14..0000000
Binary files a/icon/explorer.png and /dev/null differ
diff --git a/icon/explorer.svg b/icon/explorer.svg
new file mode 100644
index 0000000..b8ce4f4
--- /dev/null
+++ b/icon/explorer.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/feedback.png b/icon/feedback.png
deleted file mode 100644
index bf69375..0000000
Binary files a/icon/feedback.png and /dev/null differ
diff --git a/icon/feedback.svg b/icon/feedback.svg
new file mode 100644
index 0000000..22abd29
--- /dev/null
+++ b/icon/feedback.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/folder/docs.png b/icon/folder/docs.png
deleted file mode 100644
index 4994401..0000000
Binary files a/icon/folder/docs.png and /dev/null differ
diff --git a/icon/folder/docs.svg b/icon/folder/docs.svg
new file mode 100644
index 0000000..91004cd
--- /dev/null
+++ b/icon/folder/docs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/folder/music.png b/icon/folder/music.png
deleted file mode 100644
index cce9e16..0000000
Binary files a/icon/folder/music.png and /dev/null differ
diff --git a/icon/folder/music.svg b/icon/folder/music.svg
new file mode 100644
index 0000000..529c940
--- /dev/null
+++ b/icon/folder/music.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/folder/pics.png b/icon/folder/pics.png
deleted file mode 100644
index c37c87a..0000000
Binary files a/icon/folder/pics.png and /dev/null differ
diff --git a/icon/folder/pics.svg b/icon/folder/pics.svg
new file mode 100644
index 0000000..2b313f0
--- /dev/null
+++ b/icon/folder/pics.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/logo.svg b/icon/logo.svg
new file mode 100644
index 0000000..aa5d9ed
--- /dev/null
+++ b/icon/logo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/notepad.png b/icon/notepad.png
deleted file mode 100644
index 684d145..0000000
Binary files a/icon/notepad.png and /dev/null differ
diff --git a/icon/notepad.svg b/icon/notepad.svg
new file mode 100644
index 0000000..e8d932f
--- /dev/null
+++ b/icon/notepad.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/python-editor.png b/icon/pythonEditor.png
similarity index 100%
rename from icon/python-editor.png
rename to icon/pythonEditor.png
diff --git a/icon/setting.png b/icon/setting.png
deleted file mode 100644
index c581ae3..0000000
Binary files a/icon/setting.png and /dev/null differ
diff --git a/icon/setting.svg b/icon/setting.svg
new file mode 100644
index 0000000..db0fccb
--- /dev/null
+++ b/icon/setting.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/store.png b/icon/store.png
deleted file mode 100644
index 836ca12..0000000
Binary files a/icon/store.png and /dev/null differ
diff --git a/icon/store.svg b/icon/store.svg
new file mode 100644
index 0000000..5ad9a74
--- /dev/null
+++ b/icon/store.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/icon/teams.png b/icon/teams.png
deleted file mode 100644
index 422bc75..0000000
Binary files a/icon/teams.png and /dev/null differ
diff --git a/icon/terminal.png b/icon/terminal.png
deleted file mode 100644
index cc91293..0000000
Binary files a/icon/terminal.png and /dev/null differ
diff --git a/icon/terminal.svg b/icon/terminal.svg
new file mode 100644
index 0000000..3953ed6
--- /dev/null
+++ b/icon/terminal.svg
@@ -0,0 +1 @@
+
\ No newline at end of file