Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

更新 #50

Merged
merged 3 commits into from
Jan 19, 2023
Merged

更新 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c1908d
commit
User782Tec Jan 17, 2023
ca9c040
commit
User782Tec Jan 18, 2023
03dd1ca
commit
User782Tec Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 114 additions & 0 deletions apps/style/fonts.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
.select-input {
margin: 5px 10px;
display: inline-block;
height: 200px;
}

.select-input#win-notepad-font-type {
width: 200px;
}

.select-input#win-notepad-font-size {
width: 70px;
}

.select-input#win-notepad-font-style {
width: 80px;
}

#win-notepad-font-size {
vertical-align: top;
}

.select-input>input[type=text] {
outline: none;
width: 100%;
background-color: rgba(255, 255, 255, 0.3);
border-radius: 10px 10px 0px 0px;
border-color: gray;
border-style: solid;
border-bottom-width: 1px;
color: var(--text);
padding: 3px;
}

.select-input>.description {
margin-left: 3px;
}

.select-input>.value-box {
width: 100%;
height: 100%;
border-color: gray;
border-width: 2px;
border-top-width: 1px;
border-radius: 0px 0px 10px 10px;
border-style: solid;
overflow-y: auto;
overflow-x: hidden;
background-color: rgba(255, 255, 255, 0.3);
box-shadow: inset 0px 4px 2.5px var(--sd);
}

.select-input>.value-box>.option:hover {
background-color: var(--sd);
}

.select-input>.value-box>.option {
padding: 3px;
width: 100%;
}

#win-notepad-font .preview {
display: inline-block;
vertical-align: top;
width: 150px;
height: 150px;
margin: 5px 10px;
}

#win-notepad-font .preview>.preview-box {
display: flex;
width: 150px;
flex-direction: column;
justify-content: center;
align-items: center;
word-break: keep-all;
height: 100%;
text-align: center;
background-color: rgba(255, 255, 255, 0.3);
border-width: 2px;
border-color: gray;
border-style: solid;
overflow: hidden;
border-radius: 10px;
line-height: 1.25;
}

#win-notepad-font .buttons {
display: inline-block;
position: absolute;
bottom: 20px;
right: 15px;
}

#win-notepad-font .buttons>* {
display: inline-block;
padding: 5px 10px;
border-radius: 10px;
margin: 0px 5px;
transition: transform 400ms cubic-bezier(0.14, 1.02, 0.17, 0.03) !important;
box-shadow: 2px 2px 4px var(--sd);
}

#win-notepad-font .buttons>*:active {
transform: matrix(0.9, 0, 0, 0.9, 0, 0);
}

#win-notepad-font .buttons>.submit {
background-image: linear-gradient(120deg, var(--theme-1), var(--theme-2));
}

#win-notepad-font .buttons>.cancel {
background-color: rgba(255, 255, 255, 0.3);
}
4 changes: 2 additions & 2 deletions apps/style/notepad.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

#win-notepad>.text-box{
border-radius: 20px 20px 0 0;
border-radius: 5px 5px 0px 0px;
width: 100%;
border: none;
background-color: var(--card);
Expand All @@ -18,7 +18,7 @@
padding: 10px;
resize: none;
font-size: 15px;
line-height: 19px;
line-height: 1.25;
color: var(--text);
height: calc(100% - 67px);
transition: 200ms;
Expand Down
9 changes: 9 additions & 0 deletions desktop.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ body {
border: 4px solid transparent;
}

::-webkit-scrollbar-corner {
display: none;
}

.act,
list>a,
#cs>list>a,
Expand Down Expand Up @@ -1850,6 +1854,11 @@ list>.text:hover {
width: 66px;
}

.window.notepad-fonts {
height: 500px;
width: 430px;
}

.window.notrans {
transition: none !important;
}
Expand Down
94 changes: 91 additions & 3 deletions desktop.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<link rel="stylesheet" href="apps/style/about.css">
<link rel="stylesheet" href="apps/style/notepad.css">
<link rel="stylesheet" href="apps/style/terminal.css">
<link rel="stylesheet" href="apps/style/fonts.css">
<link rel="stylesheet" href="widgets.css">
<link rel="manifest" href="pwa/manifest.json">
<base target="_blank">
Expand Down Expand Up @@ -790,7 +791,7 @@ <h1 class="tit"><span></span>更新记录</h1>
<img src="icon/notepad.png" class="icon">
<p>记事本</p>
<div>
<a class="a wbtg red" onclick="hidewin('notepad')"><i class="bi bi-x-lg"></i></a>
<a class="a wbtg red" onclick="hidewin('notepad');hidewin('notepad-fonts', 'configs')"><i class="bi bi-x-lg"></i></a>
<a class="a wbtg max" onclick="maxwin('notepad')"><i class="bi bi-app"></i></a>
<a class="a wbtg" onclick="minwin('notepad')"><i class="bi bi-dash-lg"></i></a>
</div>
Expand All @@ -800,13 +801,100 @@ <h1 class="tit"><span></span>更新记录</h1>
</div>
<div class="content" id="win-notepad">
<div class="tool">
<a class="a" onmouseover="showdp(this,'notepad.file',null)" onmouseleave="hidedp(this,'notepad.file',null)">文件</a>
<a class="a" onmouseover="showdp(this,'notepad.edit',null)" onmouseleave="hidedp(this,'notepad.edit',null)">编辑</a>
<a class="a" onmouseover="showdp(this,'notepad.file',null)" onmouseleave="hidedp()">文件</a>
<a class="a" onmouseover="showdp(this,'notepad.edit',null)" onmouseleave="hidedp()">编辑</a>
<a class="a" onmouseover="showdp(this,'notepad.view',null)" onmouseleave="hidedp()">格式</a>
</div>
<textarea class="text-box"></textarea>
<a href="" download="未命名.txt" style="opacity: 0;" class="save">另存为</a>
</div>
</div>

<div class="window notepad-fonts" onmousedown="focwin('notepad-fonts')" ontouchstart="focwin('notepad-fonts')">
<div class="titbar" oncontextmenu="return showcm(event,'titbar','notepad-fonts')">
<img src="icon/notepad.png" class="icon">
<p>字体</p>
<div>
<a class="a wbtg red" onclick="hidewin('notepad-fonts', 'configs')"><i class="bi bi-x-lg"></i></a>
</div>
</div>
<div class="loadback">
<img src="icon/notepad.png" class="icon">
</div>
<div class="content" id="win-notepad-font">
<div class="select-input" id="win-notepad-font-type">
<div class="description">字体</div>
<input type="text" />
<div class="value-box">
<div class="option">Arial</div>
<div class="option">Arial Black</div>
<div class="option">"Book Antiqua"</div>
<div class="option">Charcoal</div>
<div class="option">"Comic Sans MS"</div>
<div class="option">Consolas</div>
<div class="option">Courier</div>
<div class="option">"Courier New"</div>
<div class="option">cursive</div>
<div class="option">Geneva</div>
<div class="option">Georgia</div>
<div class="option">Helvetica</div>
<div class="option">"Lucida Console"</div>
<div class="option">"Lucida Grande"</div>
<div class="option">"Lucida Sans Unicode"</div>
<div class="option">Monaco</div>
<div class="option">monospace</div>
<div class="option">Palatino</div>
<div class="option">"Palatino Linotype"</div>
<div class="option">sans-serif</div>
<div class="option">serif</div>
<div class="option">Tahoma</div>
<div class="option">"Trebuchet MS"</div>
<div class="option">Verdana</div>
</div>
</div>
<div class="select-input" id="win-notepad-font-size">
<div class="description">大小</div>
<input type="text" />
<div class="value-box">
<div class="option">初号</div>
<div class="option">小初</div>
<div class="option">一号</div>
<div class="option">小一</div>
<div class="option">二号</div>
<div class="option">小二</div>
<div class="option">三号</div>
<div class="option">小三</div>
<div class="option">四号</div>
<div class="option">小四</div>
<div class="option">五号</div>
<div class="option">小五</div>
</div>
</div>
<div class="select-input" id="win-notepad-font-style">
<div class="description">字形</div>
<input type="text" />
<div class="value-box">
<div class="option">正常</div>
<div class="option">斜体</div>
<div class="option">粗体</div>
<div class="option">粗偏斜体</div>
</div>
</div><br />
<div class="preview">
<div class="description">
预览
</div>
<div class="preview-box">
<div>Hello</div>
<div>你好</div>
<div>こんにちは</div>
</div>
</div>
<div class="buttons">
<div class="submit" onclick="commitFont();">确定</div>
<div class="cancel" onclick="hidewin('notepad-fonts', 'configs');">取消</div>
</div>
</div>

<div class="window terminal" onmousedown="focwin('terminal')" ontouchstart="focwin('terminal')">
<div class="titbar" oncontextmenu="return showcm(event,'titbar','terminal')" ondblclick="maxwin('terminal')">
Expand Down
Loading