diff --git a/css/main.less b/css/main.less index 90fe836..d6bdcc7 100644 --- a/css/main.less +++ b/css/main.less @@ -1,9 +1,125 @@ - - -@import './ttf.less'; - +@import './common/common.less'; +@import './common/util.less'; +@import './common/ico.less'; @import './common/editor.less'; +.project { + .project-title { + font-weight: bold; + } + .project-list { + line-height: 24px; + + div { + padding: 0 10px; + } + + div:hover { + background: #EFEFEF; + + .i-del { + display: block; + } + } + + .i-del { + float: right; + display: none; + } + } +} + + + + +.glyf-list { + height: 100%; + overflow: auto; + + >.glyf-item { + + float: left; + position: relative; + margin: 10px; + width: 86px; + border: 1px solid #CCC; + box-shadow: 1px 1px 1px #EEE; + border-radius: 6px; + cursor: pointer; + + .unicode, + .name { + font-size: 12px; + line-height: 20px; + height: 20px; + padding-left: 4px; + .ellipsis(); + } + + .unicode { + color: green; + border-top: 1px solid #CCC; + } + + .glyf { + width: 60px; + height: 60px; + margin: 10px; + .path { + fill: green; + } + } + + .i-del, + .i-edit { + position: absolute; + right: 2px; + display: none; + } + + .i-edit { + right: 20px; + } + } + + >.glyf-item:hover { + background: #EFEFEF; + .path { + fill: darkgreen; + } + + .i-del { + display: block; + } + } + + >.compound { + .path { + fill: lightgreen!important; + } + } + + >.new, + >.edit { + .path { + fill: blue!important; + } + } + + >.selected { + background: #EBFFC2!important; + } +} + + +.glyf-list.no-hover { + .glyf-item { + pointer-events: none; + } +} + + + .glyf-list { >.glyf-item:hover { diff --git a/css/ttf.less b/css/ttf.less deleted file mode 100644 index 96607f0..0000000 --- a/css/ttf.less +++ /dev/null @@ -1,121 +0,0 @@ - - -@import './common/common.less'; -@import './common/util.less'; -@import './common/ico.less'; - - -.project { - .project-title { - font-weight: bold; - } - .project-list { - line-height: 24px; - - div { - padding: 0 10px; - } - - div:hover { - background: #EFEFEF; - - .i-del { - display: block; - } - } - - .i-del { - float: right; - display: none; - } - } -} - - - - -.glyf-list { - height: 100%; - overflow: auto; - - >.glyf-item { - - float: left; - position: relative; - margin: 10px; - width: 86px; - border: 1px solid #CCC; - box-shadow: 1px 1px 1px #EEE; - border-radius: 6px; - cursor: pointer; - - .unicode, - .name { - font-size: 12px; - line-height: 20px; - height: 20px; - padding-left: 4px; - .ellipsis(); - } - - .unicode { - color: green; - border-top: 1px solid #CCC; - } - - .glyf { - width: 60px; - height: 60px; - margin: 10px; - .path { - fill: green; - } - } - - .i-del, - .i-edit { - position: absolute; - right: 2px; - display: none; - } - - .i-edit { - right: 20px; - } - } - - >.glyf-item:hover { - background: #EFEFEF; - .path { - fill: darkgreen; - } - - .i-del { - display: block; - } - } - - >.compound { - .path { - fill: lightgreen!important; - } - } - - >.new, - >.edit { - .path { - fill: blue!important; - } - } - - >.selected { - background: #EBFFC2!important; - } -} - - -.glyf-list.no-hover { - .glyf-item { - pointer-events: none; - } -} \ No newline at end of file diff --git a/edp-build-config.js b/edp-build-config.js index 3b8a305..7459666 100644 --- a/edp-build-config.js +++ b/edp-build-config.js @@ -11,7 +11,6 @@ exports.getProcessors = function () { new LessCompiler( { files: [ 'css/main.less', - 'css/ttf.less', 'css/preview.less' ], compileOptions: { @@ -24,8 +23,7 @@ exports.getProcessors = function () { new JsCompressor({ files: [ - 'src/fonteditor/main.js', - 'src/fonteditor/ttf.js' + 'src/fonteditor/main.js' ] }), diff --git a/index.html b/index.html index d909919..c855d93 100644 --- a/index.html +++ b/index.html @@ -118,6 +118,6 @@ define('jquery', $); require(['fonteditor/main']) -
+