Skip to content

Commit

Permalink
Merge pull request #508 from entrylabs/lang/ws-viet
Browse files Browse the repository at this point in the history 
Lang/ws viet
  • Loading branch information
@chanlee
chanlee authored Nov 8, 2016
2 parents c1d101b + 883fd81 commit e35536a
Show file tree
Hide file tree
Showing 8 changed files with 99 additions and 93 deletions.
91 changes: 46 additions & 45 deletions dist/entry.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ svg .svgBlockGroup text {
bottom: 0px;
}
.entryCategoryListWorkspace {
width: 64px;
min-width: 64px;
height: 100%;
display: inline-block;
background-color: #f5f5f5;
Expand All @@ -817,7 +817,7 @@ svg .svgBlockGroup text {
.entryCategoryElementWorkspace {
clear: both;
padding-top: 38px;
width: 64px;
min-width: 64px;
text-align: center;
background-color: #edf5f7;
font-size: 13px;
Expand Down Expand Up @@ -1531,7 +1531,7 @@ svg .svgBlockGroup text {
color: #000000;
top: 12px;
left: 28px;
width: 150px;
width: auto;
}
.selectedObject > .entryObjectWrapperWorkspace > .entryObjectCoordinateWorkspace {
color: black;
Expand Down Expand Up @@ -1623,7 +1623,6 @@ svg .svgBlockGroup text {
}
.collapsed .rotationMethodWrapper {
float: left;
top: 39px;
}
.entryObjectRotateMethodLabelWorkspace {
display: inline-block;
Expand Down Expand Up @@ -2326,7 +2325,8 @@ svg .svgBlockGroup text {
background: url("../images/pause_btn.png");
background-repeat: no-repeat;
color: transparent;
width: 90px;
width: auto;
padding-left: 20px;
left: 103px;
color: #4b37a0;
background-position: center left;
Expand Down Expand Up @@ -2986,9 +2986,9 @@ input.entryObjectNameWorkspace:-moz-read-only {
position: relative;
font-size: 9pt;
color: #000000;
top: 12px;
top: 8px;
left: 28px;
width: 150px;
width: auto;
}
.selectedObject > .entryObjectWrapperWorkspace > .entryObjectCoordinateWorkspace {
color: black;
Expand Down Expand Up @@ -3080,16 +3080,18 @@ input.entryObjectNameWorkspace:-moz-read-only {
}
.collapsed .rotationMethodWrapper {
float: left;
top: 39px;
position: absolute;
bottom: 9px;
}
.entryObjectRotateMethodLabelWorkspace {
display: inline-block;
line-height: 20px;
font-size: 9pt;
color: #000000;
position: absolute;
padding-left: 20px;
padding-top: 20px;
position: relative;
float: left;
}
/*.entryObjectRotateLabelWorkspace {
display: block;
Expand Down Expand Up @@ -3128,7 +3130,7 @@ input.entryObjectNameWorkspace:-moz-read-only {
height: 22px;
}
.entryObjectRotateModeAWorkspace {
margin-left: 80px;
margin-left: 6px;
background-image: url("../images/layers_icon_rotate01_nor.png");
}
.entryObjectRotateModeAWorkspace.selected {
Expand All @@ -3146,36 +3148,27 @@ input.entryObjectNameWorkspace:-moz-read-only {
.entryObjectRotateModeCWorkspace.selected {
background-image: url("../images/layers_icon_rotate03_sel.png");
}
.entryObjectCoordinateSpanWorkspace {
float: left;
position: absolute;
}
.entryObjectCoordinateSpanWorkspace:nth-child(3) {
float: left;
margin-left: 57px;
margin-left: 5px;
position: relative;
}
.entryObjectCoordinateSizeWorkspace {
float: left;
margin-left: 113px;
position: absolute;
margin: 0;
position: relative;
float: none;
}
.entryObjectCoordinateInputWorkspace {
width: 40px;
height: 20px;
position: absolute;
float: left;
margin: -2px 5px 0px 15px;
background-color: #e5e5e5;
border: none;
border: 1px solid transparent;
}
.entryObjectCoordinateInputWorkspace_right {
margin-left: 70px;
margin-left: 4px;
}
.entryObjectCoordinateInputWorkspace_size {
float: left;
position: absolute;
margin-left: 145px;
margin: 0;
float: none;
position: relative;
}
.entryObjectCoordinateInputWorkspace:disabled,
.entryObjectRotateInputWorkspace:disabled,
Expand Down Expand Up @@ -3291,30 +3284,23 @@ input.entryObjectNameWorkspace:-moz-read-only {
}
.tablet .entryObjectCoordinateInputWorkspace_size {
width: 48px;
margin-left: 170px;
}
.tablet .entryObjectCoordinateInputWorkspace_right {
margin-left: 84px;
}
.tablet .entryObjectRotateInputWorkspace {
width: 50px;
}
.tablet .entryObjectDirectionInputWorkspace {
width: 38px;
}
.tablet .entryObjectCoordinateSpanWorkspace:nth-child(3) {
margin-left: 70px;
}
.tablet .entryObjectCoordinateSizeWorkspace {
margin-left: 139px;
width: 30px;
}
.tablet .collapsed .entryObjectRotationWrapperWorkspace {
height: 90px;
}
.tablet .collapsed .rotationMethodWrapper {
float: left;
top: 39px;
position: absolute;
bottom: 9px;
}
/* tablet end */
/* Painter css start */
Expand Down Expand Up @@ -3436,6 +3422,11 @@ input.entryObjectNameWorkspace:-moz-read-only {
}
#entryPainterTopMenuEdit {
color: white;
width: auto;
position: relative;
vertical-align: top;
margin-top: -28px;
margin-left: 16px;
}
#entryPainterTopMenuFile > ul > li {
border-bottom: solid 1px #643cd9;
Expand All @@ -3454,13 +3445,17 @@ input.entryObjectNameWorkspace:-moz-read-only {
}
#entryPainterTopMenuFile {
color: white;
position: relative;
width: auto;
vertical-align: top;
margin-left: 5px;
}
.entryPlaygroundPainterTopStageXY {
position: absolute;
width: 150px;
height: 30px;
top: 5px;
left: 280px;
left: 300px;
font-size: 10pt;
color: white;
}
Expand Down Expand Up @@ -3568,7 +3563,7 @@ input.entryObjectNameWorkspace:-moz-read-only {
.entryPlaygroundPainterAttrResize > legend {
background-color: transparent;
padding: 2px;
width: 30px;
width: auto !important;
margin-bottom: 0;
border-bottom: 0;
font-size: 9pt;
Expand Down Expand Up @@ -3710,7 +3705,9 @@ input.entryObjectNameWorkspace:-moz-read-only {
.entryPlaygroundPainterAttrTop {
position: absolute;
top: 20px;
width: 93px;
width: auto !important;
min-width: 93px;
max-width: 120px;
height: 40px;
border-radius: 3px;
color: white;
Expand Down Expand Up @@ -3748,9 +3745,11 @@ input.entryObjectNameWorkspace:-moz-read-only {
}
.entryPlaygroundPainterAttrFontStyleArea {
position: absolute;
background-color: #643cd9 ;
background-color: #643cd9;
top: 120px;
width: 67px;
width: auto !important;
min-width: 67px;
max-width: 80px;
height: 40px;
border-radius: 3px;
color: white;
Expand All @@ -3777,6 +3776,7 @@ input.entryObjectNameWorkspace:-moz-read-only {
height: 28px;
cursor: pointer;
list-style: none;
z-index: 101;
font-family: nanumBarunBold !important;
}
.entryPlaygroundPainterTopMenuFileSave {
Expand Down Expand Up @@ -4110,7 +4110,7 @@ input.entryObjectNameWorkspace:-moz-read-only {
.painterAttrRotateName {
top: 60px;
left: 9px;
width: 30px;
width: auto !important;
}
.painterAttrOpacityName {
top: 60px;
Expand Down Expand Up @@ -4466,8 +4466,9 @@ input.entryObjectNameWorkspace:-moz-read-only {
width: 120px;
}
.entryPlaygroundPainterTopMenu > ul {
position: absolute;
top: 5px;
position: relative;
vertical-align: top;
}
.entryPainterTopMenuEditImport {
height: 40px;
Expand Down Expand Up @@ -4536,7 +4537,7 @@ input.entryObjectNameWorkspace:-moz-read-only {
}
.entryTabListItemWorkspace {
float: left;
width: 59px;
min-width: 59px;
height: 42px;
margin: 0 1px 0 1px;
cursor: pointer;
Expand Down
12 changes: 6 additions & 6 deletions extern/util/static.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2564,32 +2564,32 @@ EntryStatic.objectSubCategories = {

EntryStatic.fonts = [
{
name: '바탕체',
name: Lang.Fonts.batang,
family: 'KoPub Batang',
url: '/css/kopubbatang.css'
},
{
name: '명조체',
name: Lang.Fonts.myeongjo,
family: 'Nanum Myeongjo',
url: '/css/nanummyeongjo.css'
},
{
name: '고딕체',
name: Lang.Fonts.gothic,
family: 'Nanum Gothic',
url: '/css/nanumgothic.css'
},
{
name: '필기체',
name: Lang.Fonts.pen_script,
family: 'Nanum Pen Script',
url: '/css/nanumpenscript.css'
},
{
name: '한라산체',
name: Lang.Fonts.jeju_hallasan,
family: 'Jeju Hallasan',
url: '/css/jejuhallasan.css'
},
{
name: '코딩고딕체',
name: Lang.Fonts.gothic_coding,
family: 'Nanum Gothic Coding',
url: '/css/nanumgothiccoding.css'
}
Expand Down
4 changes: 2 additions & 2 deletions src/css/components/block_menu.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
}

.entryCategoryListWorkspace {
width: 64px;
min-width: 64px;
height: 100%;
display: inline-block;
background-color: #f5f5f5;
Expand Down Expand Up @@ -36,7 +36,7 @@
.entryCategoryElementWorkspace {
clear: both;
padding-top: 38px;
width: 64px;
min-width: 64px;
text-align: center;
background-color: #edf5f7;
font-size: 13px;
Expand Down
3 changes: 1 addition & 2 deletions src/css/components/container.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
color: #000000;
top: 12px;
left: 28px;
width: 150px;
width: auto;
}

.selectedObject>.entryObjectWrapperWorkspace>.entryObjectCoordinateWorkspace{
Expand Down Expand Up @@ -397,7 +397,6 @@

.collapsed .rotationMethodWrapper {
float: left;
top: 39px;
}

.entryObjectRotateMethodLabelWorkspace {
Expand Down
3 changes: 2 additions & 1 deletion src/css/components/engine.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,8 @@
background: url("@{image_url}pause_btn.png");
background-repeat: no-repeat;
color: transparent;
width: 90px;
width: auto;
padding-left: 20px;
left: 103px;
color: @bora;
background-position: center left;
Expand Down
Loading

0 comments on commit e35536a

Please sign in to comment.