Skip to content

Commit

Permalink
Merge 1f2f479 into d0a92d0
Browse files Browse the repository at this point in the history
  • Loading branch information
@berryzplus
berryzplus authored Oct 27, 2020
2 parents d0a92d0 + 1f2f479 commit a540f1d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 53 deletions.
3 changes: 0 additions & 3 deletions help/macro/source/sakura.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
{
BACKGROUND-COLOR: #fff
}
BODY
{
}

P
{
Expand Down
2 changes: 1 addition & 1 deletion help/macro/source/search.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

ul
{
margin: 0 0 0 0;
margin: 0;
padding: 0;
}

Expand Down
36 changes: 9 additions & 27 deletions help/plugin/Text/dsk_sakura.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,30 @@ HR {
border-color: #666; margin: 1em; border-style: solid; height: 2px;
}
H1 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1.5em; line-height: 1;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1.5em; line-height: 1;
border-color: #f28; background-color: #fee; color: #000;
}
H2 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1.2em; line-height: 1; margin-top: 1em;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1.2em; line-height: 1; margin-top: 1em;
border-top: 2px solid #f28; border-bottom: 2px solid #f28;
background-color: #fee; color: #000;
}
H3 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
border-bottom: 2px solid #f28;
background-color: #fee; color: #000;
}
H4 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
background-color: #fee; color: #000;
}
DL {
padding: 0; border: 1px solid #666; margin-right: 1em; margin-left: 1em;
LINE-HEIGHT: 1.4
}
DT {
PADDING: 0.1em 0.3em 0.1em 0.3em; MARGIN: 0.5em 0 0; BORDER-RIGHT: 1px; BORDER-TOP: 1px solid #666; BORDER-LEFT: 1px; BORDER-BOTTOM: 1px solid #f28; BACKGROUND-COLOR: #fee
PADDING: 0.1em 0.3em; MARGIN: 0.5em 0 0; BORDER-RIGHT: 1px; BORDER-TOP: 1px solid #666; BORDER-LEFT: 1px; BORDER-BOTTOM: 1px solid #f28; BACKGROUND-COLOR: #fee
FONT-WEIGHT: bold
}
DD {
PADDING-RIGHT: 0.1em; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.2em; MARGIN: 0; PADDING-TOP: 0.2em
Expand All @@ -63,28 +65,18 @@ TD {
P {
LINE-HEIGHT: 1.4
}
DL {
LINE-HEIGHT: 1.4
}
UL {
LINE-HEIGHT: 1.4
LIST-STYLE-TYPE: square
}
OL {
LINE-HEIGHT: 1.4
}
DT {
FONT-WEIGHT: bold
}
UL {
LIST-STYLE-TYPE: square
}
EM {
COLOR: #909; BACKGROUND-COLOR: transparent
}
STRONG {
COLOR: #909; BACKGROUND-COLOR: transparent
}
STRONG {
BORDER-RIGHT: 3px; BORDER-TOP: 3px; BORDER-LEFT: 3px; BORDER-BOTTOM: 3px double
}
.s {
Expand All @@ -97,7 +89,7 @@ STRONG {
FONT-WEIGHT: bold; TEXT-ALIGN: center
}
.example {
margin: 0; padding: 0 1em 0 1em; font-weight: bold; border-top-style: none;
margin: 0; padding: 0 1em; font-weight: bold; border-top-style: none;
; border-right-style: none; border-left-style: none; background-color: #e0fce8; text-align: left; border-bottom-style: none
}
.note {
Expand Down Expand Up @@ -176,8 +168,6 @@ td.box {
table.er {
border:0;
}
th.er {
}
td.er {
border: #666 1px solid;
padding-right: 0.5em;
Expand All @@ -186,14 +176,6 @@ td.er {
padding-bottom: 0.1em;
}

table.f {
/*border: #666 2px solid;*/
}
th.f {
}
td.f {
}

pre.code {
width:100%;
overflow:auto;
Expand Down
2 changes: 1 addition & 1 deletion help/plugin/Text/implementation01.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<style>
table.box { width: 90%; }
table.box th { text-align: left; }
table.box td { border: #666 1px solid; padding: 4px 10px 3px 10px; }
table.box td { border: #666 1px solid; padding: 4px 10px 3px; }
</style>
</HEAD>
<BODY>
Expand Down
26 changes: 9 additions & 17 deletions help/sakura/res/dsk_sakura.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,30 @@ HR {
border-color: #666; margin: 1em; border-style: solid; height: 2px;
}
H1 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1.5em; line-height: 1;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1.5em; line-height: 1;
border-color: #f28; background-color: #fee; color: #000;
}
H2 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1.2em; line-height: 1; margin-top: 1em;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1.2em; line-height: 1; margin-top: 1em;
border-top: 2px solid #f28; border-bottom: 2px solid #f28;
background-color: #fee; color: #000;
}
H3 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
border-bottom: 2px solid #f28;
background-color: #fee; color: #000;
}
H4 {
padding: 0.2em 0.5em 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
padding: 0.2em 0.5em; font-weight: bold; font-size: 1em; line-height: 1; margin-top: 1em;
background-color: #fee; color: #000;
}
DL {
padding: 0; border: 1px solid #666; margin-right: 1em; margin-left: 1em;
LINE-HEIGHT: 1.4
}
DT {
PADDING: 0.1em 0.3em 0.1em 0.3em; MARGIN: 0.5em 0 0; BORDER-RIGHT: 1px; BORDER-TOP: 1px solid #666; BORDER-LEFT: 1px; BORDER-BOTTOM: 1px solid #f28; BACKGROUND-COLOR: #fee
PADDING: 0.1em 0.3em; MARGIN: 0.5em 0 0; BORDER-RIGHT: 1px; BORDER-TOP: 1px solid #666; BORDER-LEFT: 1px; BORDER-BOTTOM: 1px solid #f28; BACKGROUND-COLOR: #fee
FONT-WEIGHT: bold
}
DD {
PADDING-RIGHT: 0.1em; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.2em; MARGIN: 0; PADDING-TOP: 0.2em
Expand All @@ -63,28 +65,18 @@ TD {
P {
LINE-HEIGHT: 1.4
}
DL {
LINE-HEIGHT: 1.4
}
UL {
LINE-HEIGHT: 1.4
LIST-STYLE-TYPE: square
}
OL {
LINE-HEIGHT: 1.4
}
DT {
FONT-WEIGHT: bold
}
UL {
LIST-STYLE-TYPE: square
}
EM {
COLOR: #909; BACKGROUND-COLOR: transparent
}
STRONG {
COLOR: #909; BACKGROUND-COLOR: transparent
}
STRONG {
BORDER-RIGHT: 3px; BORDER-TOP: 3px; BORDER-LEFT: 3px; BORDER-BOTTOM: 3px double
}
.s {
Expand All @@ -97,7 +89,7 @@ STRONG {
FONT-WEIGHT: bold; TEXT-ALIGN: center
}
.example {
margin: 0; padding: 0 1em 0 1em; font-weight: bold; border-top-style: none;
margin: 0; padding: 0 1em; font-weight: bold; border-top-style: none;
; border-right-style: none; border-left-style: none; background-color: #e0fce8; text-align: left; border-bottom-style: none
}
.note {
Expand Down
7 changes: 3 additions & 4 deletions tools/zip/listzip.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ try

$sourcezip = [System.IO.Compression.Zipfile]::OpenRead($Arg1)
foreach($file in $sourcezip.Entries){
Write-Host $file.LastWriteTime $file.Length $file.FullName
Write-Output $file.LastWriteTime $file.Length $file.FullName
}
$sourcezip.Dispose()

}
catch
finally
{
$sourcezip.Dispose()
}

0 comments on commit a540f1d

Please sign in to comment.