github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
jfh
2020-11-12 23:43:11 +01:00
parent d74a86875a b0886c7b82
commit b2a075f799
20 changed files with 67 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/editor/extensions/ext-server_opensave/ext-server_opensave.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/editor/images/bold.svg vendored Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit-->
<g class="layer">
<title>Layer 1</title>
<text fill="#000000" font-family="serif" font-size="18" font-style="normal" font-weight="bold" id="svg_1" stroke="#000000" stroke-width="0" text-anchor="middle" x="11.511492" xml:space="preserve" y="18.011461">B</text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 471 B

8
dist/editor/images/italic.svg vendored Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit-->
<g class="layer">
<title>Layer 1</title>
<text fill="#000000" font-family="Times" font-size="18" font-style="italic" font-weight="bold" id="svg_1" stroke="#000000" stroke-width="0" style="cursor: move;" text-anchor="middle" x="11.511492" xml:space="preserve" y="18.011461">i</text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 493 B

4
dist/editor/index.html vendored
View File

@@ -309,8 +309,8 @@
</div>
<div id="text_panel">
<div class="toolset">
<div class="tool_button" id="tool_bold" title="Bold Text [B]"><span></span>B</div>
<div class="tool_button" id="tool_italic" title="Italic Text [I]"><span></span>i</div>
<se-button id="tool_bold" title="Bold Text [B]" src="./images/bold.svg" shortcut="B"></se-button>
<se-button id="tool_italic" title="Italic Text [I]" src="./images/italic.svg" shortcut="I"></se-button>
</div>
<div class="toolset" id="tool_font_family">
<label>

2
dist/editor/index.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/editor/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

21
dist/editor/svgedit.css vendored
View File

@@ -720,32 +720,11 @@ span.zoom_tool {
padding-right: 5px;
}
#tool_bold, #tool_italic {
font: bold 2.1em/1.1em serif;
text-align: center;
padding-left: 2px;
position: relative;
}
#text {
position: absolute;
left: -9999px;
}
#tool_bold span, #tool_italic span {
position: absolute;
width: 100%;
height: 100%;
top: 0; left: 0;
background: #000;
opacity: 0;
}
#tool_italic {
font-weight: normal;
font-style: italic;
}
#url_notice {
padding-top: 4px;
display: none;

8
dist/editor/system/images/bold.svg vendored Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit-->
<g class="layer">
<title>Layer 1</title>
<text fill="#000000" font-family="serif" font-size="18" font-style="normal" font-weight="bold" id="svg_1" stroke="#000000" stroke-width="0" text-anchor="middle" x="11.511492" xml:space="preserve" y="18.011461">B</text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 471 B

8
dist/editor/system/images/italic.svg vendored Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
<!-- Created with SVG-edit - https://github.com/SVG-Edit/svgedit-->
<g class="layer">
<title>Layer 1</title>
<text fill="#000000" font-family="Times" font-size="18" font-style="italic" font-weight="bold" id="svg_1" stroke="#000000" stroke-width="0" style="cursor: move;" text-anchor="middle" x="11.511492" xml:space="preserve" y="18.011461">i</text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 493 B

4
dist/editor/system/index.html vendored
View File

@@ -316,8 +316,8 @@
</div>
<div id="text_panel">
<div class="toolset">
<div class="tool_button" id="tool_bold" title="Bold Text [B]"><span></span>B</div>
<div class="tool_button" id="tool_italic" title="Italic Text [I]"><span></span>i</div>
<se-button id="tool_bold" title="Bold Text [B]" src="./images/bold.svg" shortcut="B"></se-button>
<se-button id="tool_italic" title="Italic Text [I]" src="./images/italic.svg" shortcut="I"></se-button>
</div>
<div class="toolset" id="tool_font_family">
<label>

2
dist/editor/system/index.js vendored
View File

File diff suppressed because one or more lines are too long

21
dist/editor/system/svgedit.css vendored
View File

@@ -720,32 +720,11 @@ span.zoom_tool {
padding-right: 5px;
}
#tool_bold, #tool_italic {
font: bold 2.1em/1.1em serif;
text-align: center;
padding-left: 2px;
position: relative;
}
#text {
position: absolute;
left: -9999px;
}
#tool_bold span, #tool_italic span {
position: absolute;
width: 100%;
height: 100%;
top: 0; left: 0;
background: #000;
opacity: 0;
}
#tool_italic {
font-weight: normal;
font-style: italic;
}
#url_notice {
padding-top: 4px;
display: none;

4
dist/editor/xdomain-index.html vendored
View File

@@ -309,8 +309,8 @@
</div>
<div id="text_panel">
<div class="toolset">
<div class="tool_button" id="tool_bold" title="Bold Text [B]"><span></span>B</div>
<div class="tool_button" id="tool_italic" title="Italic Text [I]"><span></span>i</div>
<se-button id="tool_bold" title="Bold Text [B]" src="./images/bold.svg" shortcut="B"></se-button>
<se-button id="tool_italic" title="Italic Text [I]" src="./images/italic.svg" shortcut="I"></se-button>
</div>
<div class="toolset" id="tool_font_family">
<label>

2
dist/editor/xdomain-index.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/editor/xdomain-index.js.map vendored
View File

File diff suppressed because one or more lines are too long