diff --git a/doc/참고자료/테이블목록비교(장애인_전기차_밤샘).xlsx b/doc/참고자료/테이블목록비교(장애인_전기차_밤샘).xlsx
new file mode 100644
index 00000000..2fb7d857
Binary files /dev/null and b/doc/참고자료/테이블목록비교(장애인_전기차_밤샘).xlsx differ
diff --git a/doc/통합플랫폼_업무흐름도_V0.2.pptx b/doc/통합플랫폼_업무흐름도_V0.2.pptx
index f09b49ad..59a8fe49 100644
Binary files a/doc/통합플랫폼_업무흐름도_V0.2.pptx and b/doc/통합플랫폼_업무흐름도_V0.2.pptx differ
diff --git a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
index dea77739..97f5dcbc 100644
--- a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
+++ b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
@@ -35,7 +35,7 @@
Cut selection
Copy selection
Clipboard paste
- Insert image
+
Rotate image
@@ -44,7 +44,7 @@
.paintweb_tool_toolID and a generic class name .paintweb_tool. In this
case the class names will be .paintweb_tool_insertimg and
.paintweb_tool. -->
- Text
+
Rectangle
@@ -63,81 +63,87 @@
Clear image
Save image
+
+
+ Fill
+
+
+ Stroke
+
+
+
+
+
-
+
-
+
+ .paintweb_cfg_line_lineWidth. –>
Line width
-
+ <!– .paintweb_cfg_line_miterLimit (dot becomes underscore) –>
Miter limit
-
+ <!– .paintweb_cfg_line_lineCap –>
Line cap
-
+ will be .paintweb_lineCap_butt –>
Butt
-
+ <!– .paintweb_lineCap_square –>
Square
-
+ <!– .paintweb_lineCap_round –>
Round
-
+ <!– .paintweb_cfg_line_lineJoin –>
Line join
-
+ <!– .paintweb_lineJoin_miter –>
Miter
-
+ <!– .paintweb_lineJoin_round –>
Round
-
+ <!– .paintweb_lineJoin_bevel –>
Bevel
-
+ <!– .paintweb_cfg_shapeType –>
Shape type
-
+ <!– .paintweb_shapeType_both –>
Both
-
+ <!– .paintweb_shapeType_fill –>
Fill
-
+ <!– .paintweb_shapeType_stroke –>
Stroke
-
+ element appended. –>
+-->
@@ -160,6 +166,7 @@
+
+
diff --git a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css
index 366080a4..f9667eb9 100644
--- a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css
+++ b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/style.css
@@ -144,6 +144,9 @@
background: #fff;
color: #000
}
+.paintweb_main_main{
+ display: flex;
+}
.paintweb_tools {
border-left: 1px solid #d6d6d6;
@@ -151,8 +154,6 @@
list-style: none;
margin: 0;
padding: 0;
- /*width: 416px;*/
- width:100%;
display: flex;
border:0px solid blue;
}
@@ -195,6 +196,7 @@
white-space: nowrap
}
+.paintweb_strokeFillStyles:hover, .paintweb_strokeFillStyles:focus,
.paintweb_tool:hover, .paintweb_tool:focus,
.paintweb_command:hover, .paintweb_command:focus,
.paintweb_icon:hover, .paintweb_icon:focus { background: #fff }
@@ -735,40 +737,34 @@
.paintweb_strokeFillStyles {
/*background: url("images/toolbar-colors.png") no-repeat;*/
/*font-size: 0.9em;*/
- height: 67px;
+
/*left: 297px;*/
- right: 337px;
- position: absolute;
- top: -8px;
- width: 69px
+ /*right: 337px;
+ height: 67px;
+ position: absolute;*/
+
+ width: 40px
}
.paintweb_opt_fillStyle {
- height: 51px;
- margin: 2px 0 0 13px;
+ margin: 0 0 0 4px;
padding: 0
}
.paintweb_opt_strokeStyle {
- margin: 0;
- padding: 0 11px 0 0;
+ margin: -10px 0 0 14px;
+ padding: 0 0 0 0;
text-align: right
}
.paintweb_fillStyle {
height: 18px;
- left: 23px;
- position: absolute;
- top: 20px;
width: 18px;
}
.paintweb_strokeStyle {
- bottom: 18px;
height: 18px;
- position: absolute;
- right: 15px;
- width: 18px
+ width: 18px;
}
.paintweb_floatingPanel_colormixer .paintweb_tabsList {
diff --git a/src/main/webapp/resources/3rd-party/paintweb/paintweb-config.json b/src/main/webapp/resources/3rd-party/paintweb/paintweb-config.json
index a1ee3ae2..789a30b7 100644
--- a/src/main/webapp/resources/3rd-party/paintweb/paintweb-config.json
+++ b/src/main/webapp/resources/3rd-party/paintweb/paintweb-config.json
@@ -214,7 +214,7 @@
*/
/*FIXME: 항목수정*/
/*"tools": ["bcurve", "cbucket", "cpicker", "ellipse", "eraser", "hand", "insertimg", "line", "pencil", "polygon", "rectangle", "selection", "text"],*/
- "tools": ["hand", "insertimg", "rectangle", "selection", "text"],
+ "tools": ["hand", "rectangle", "selection"],
/**