diff --git a/static/css/fonts/icomoon.eot b/static/css/fonts/icomoon.eot index 1a3ccea..ea91e38 100644 Binary files a/static/css/fonts/icomoon.eot and b/static/css/fonts/icomoon.eot differ diff --git a/static/css/fonts/icomoon.svg b/static/css/fonts/icomoon.svg index 5f45e48..f18bbd3 100644 --- a/static/css/fonts/icomoon.svg +++ b/static/css/fonts/icomoon.svg @@ -3,27 +3,50 @@ Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/static/css/fonts/icomoon.ttf b/static/css/fonts/icomoon.ttf index 512376e..d04686d 100644 Binary files a/static/css/fonts/icomoon.ttf and b/static/css/fonts/icomoon.ttf differ diff --git a/static/css/fonts/icomoon.woff b/static/css/fonts/icomoon.woff index 4d690a7..43f093b 100644 Binary files a/static/css/fonts/icomoon.woff and b/static/css/fonts/icomoon.woff differ diff --git a/static/css/themes/black.css b/static/css/themes/black.css index ca0c2e0..cf0c49e 100644 --- a/static/css/themes/black.css +++ b/static/css/themes/black.css @@ -32,10 +32,10 @@ .font-ico { color: rgba(255, 255, 255, 0.5); - text-shadow: 0px 1px 0px rgba(0, 0, 0, 0.57); } -.font-ico:hover { +.font-ico:hover, +.frame li:hover .font-ico { color: #e1e1e1; } @@ -50,18 +50,21 @@ text-shadow: #292a2b 0px 1px 0px; } -.menu > ul > li > span:hover { - background-color: #333333; - box-shadow: 1px -1px 0 0 #000000, -1px 0 0 0 #000000, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset; - color: #d4d4d4; -} - +.menu > ul > li > span:hover, .menu > ul > li > span.selected { background-color: #494949; color: #d4d4d4; box-shadow: 1px 0 0 0 #000000 inset, 1px 0 0 0 #000000, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset; } +#buildRun { + background-color: #494949; + box-shadow: 1px 0 0 0 #000000 inset, 1px 0 0 0 #000000, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset; + color: #6DB14C; + padding: 1px 5px; + border-radius: 3px; +} + .frame { color: #f1f1f1; border: 1px solid #00040a; diff --git a/static/css/themes/default.css b/static/css/themes/default.css index 2cda064..54b3291 100644 --- a/static/css/themes/default.css +++ b/static/css/themes/default.css @@ -32,7 +32,8 @@ color: #666; } -.font-ico:hover { +.font-ico:hover, +.frame li:hover .font-ico { color: #333; } @@ -47,17 +48,19 @@ text-shadow: 0px 1px 0px #efefef; } -.menu > ul > li > span:hover { +.menu > ul > li > span:hover, +.menu > ul > li > span.selected { background-color: #cfcfcf; - box-shadow: 1px -1px 0 0 #b6b6b6, -1px 0 0 0 #b6b6b6, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset; + box-shadow: 1px 0 0 0 #b6b6b6 inset, 1px 0 0 0 #b6b6b6, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset; color: #393939; } -.menu > ul > li > span.selected { - background-color: #3875D7; - color: #FFF; +#buildRun { + background-color: #cfcfcf; box-shadow: 1px 0 0 0 #b6b6b6 inset, 1px 0 0 0 #b6b6b6, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3); + color: #6DB14C; + padding: 1px 5px; + border-radius: 3px; } .frame { @@ -70,7 +73,6 @@ .zeroclipboard-is-hover { background-color: #3875D7; color: #FFF; - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.3); } .frame li.disabled:hover { diff --git a/static/css/wide.css b/static/css/wide.css index df2d63a..1adf224 100644 --- a/static/css/wide.css +++ b/static/css/wide.css @@ -36,42 +36,130 @@ line-height: 20px; } -.ico-play:before { +.ico-moveup:before { + content: "\f148"; +} + +.ico-movedown:before { + content: "\f149"; +} + +.ico-keyboard:before { + content: "\f11c"; +} + +.ico-findfiles:before { + content: "\e603"; +} + +.ico-find:before { + content: "\e602"; +} + +.ico-editor:before { + content: "\e604"; +} + +.ico-tree:before { + content: "\e600"; +} + +.ico-build:before { + content: "\e601"; +} + +.ico-notification:before { + content: "\e607"; +} + +.ico-report:before { content: "\e605"; } +.ico-comment:before { + content: "\e620"; +} + +.ico-goline:before { + content: "\e61e"; +} + +.ico-info:before { + content: "\e61d"; +} + +.ico-signup:before { + content: "\e606"; +} + +.ico-signout:before { + content: "\e618"; +} + +.ico-redo:before { + content: "\e615"; +} + +.ico-undo:before { + content: "\e60e"; +} + +.ico-about:before { + content: "\e60d"; +} + +.ico-import:before { + content: "\f0ee"; +} + +.ico-export:before { + content: "\f0ed"; +} + +.ico-refresh:before { + content: "\f021"; +} + +.ico-remove:before { + content: "\e60b"; +} + .ico-save:before { content: "\f0c7"; } .ico-max:before { - content: "\f096"; + content: "\e609"; } .ico-format:before { - content: "\e60b"; + content: "\e612"; } .ico-buildrun:before { - content: "\e607"; -} - -.ico-stop:before { - content: "\e608"; -} - -.ico-restore:before { content: "\e60c"; } +.ico-stop:before { + content: "\e60f"; +} + +.ico-restore:before { + content: "\e613"; +} + +.toolbars .ico-restore:before { + content: "\e60a"; +} + .ico-min:before { - content: "\e60d"; + content: "\e614"; position: absolute; right: 5px; } .ico-close:before { - content: "\e60a"; + content: "\e611"; } /* end ico */ @@ -89,9 +177,10 @@ cursor: pointer; } -.frame li.disabled { +.frame li.disabled, +.frame li.disabled .font-ico, +.frame li.disabled:hover .font-ico { color: #999; - text-shadow: 0 0 0 !important; } .frame a { @@ -103,6 +192,19 @@ .frame a:hover { color: #FFF; } + +.frame .space { + display: inline-block; + width: 20px; + height: 15px; +} + +.frame .font-ico { + margin-right: 5px; + width: 15px; + display: inline-block; + text-align: center; +} /* end frame */ /* start tabs */ diff --git a/static/js/editors.js b/static/js/editors.js index 40a8b61..2f199a7 100644 --- a/static/js/editors.js +++ b/static/js/editors.js @@ -193,7 +193,6 @@ var editors = { 'find', 'find-next', 'find-previous', 'replace', 'replace-all', 'format', 'autocomplete', 'jump-to-decl', 'expr-info', 'find-usages', 'toggle-comment', 'edit']); - $(".toolbars").hide(); } if (!nextId) { @@ -697,7 +696,6 @@ var editors = { }, // 新建一个编辑器 Tab，如果已经存在 Tab 则切换到该 Tab. newEditor: function (data, cursor) { - $(".toolbars").show(); var id = wide.curNode.tId; editors.tabs.add({ diff --git a/static/js/tabs.js b/static/js/tabs.js index f5ff09c..36c31ec 100644 --- a/static/js/tabs.js +++ b/static/js/tabs.js @@ -74,7 +74,7 @@ $.extend(Tabs.prototype, { $tabs = this.obj._$tabs; $tabs.append('
' - + data.title + '
'); + + data.title + ' '); $tabsPanel.append('
' + data.content + '
'); diff --git a/static/js/tree.js b/static/js/tree.js index f9328fc..7efe271 100644 --- a/static/js/tree.js +++ b/static/js/tree.js @@ -252,9 +252,9 @@ var tree = { }).show(); } else { // 右击了目录 if (wide.curNode.removable) { - $dirRMenu.find(".remove, .rename").removeClass("disabled"); + $dirRMenu.find(".remove").removeClass("disabled"); } else { - $dirRMenu.find(".remove, .rename").addClass("disabled"); + $dirRMenu.find(".remove").addClass("disabled"); } if (wide.curNode.creatable) { diff --git a/views/index.html b/views/index.html index 533aa2b..b2533f1 100644 --- a/views/index.html +++ b/views/index.html @@ -42,14 +42,17 @@
@@ -61,54 +64,64 @@