mbk-lab
/
wide
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/b3log/wide

This commit is contained in:
Liang Ding 2014-12-13 23:58:00 +08:00
parent 6fb252187e 85a78cee9e
commit 391b41eb4a
5 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/css/themes/black.css
View File

@ -57,12 +57,12 @@
box-shadow: 1px 0 0 0 #000000 inset, 1px 0 0 0 #000000, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset; box-shadow: 1px 0 0 0 #000000 inset, 1px 0 0 0 #000000, 0 1px 0 0 rgba(255, 255, 255, 0.15) inset;
} }
.menu .split {
border-color: #000000;
}
#buildRun { #buildRun {
background-color: #494949; 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 { .frame {

8
static/css/themes/default.css
View File

@ -55,12 +55,12 @@
color: #393939; color: #393939;
} }
.menu .split {
border-color: #b6b6b6;
}
#buildRun { #buildRun {
background-color: #cfcfcf; 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;
color: #6DB14C;
padding: 1px 5px;
border-radius: 3px;
} }
.frame { .frame {

19
static/css/wide.css
View File

@ -239,6 +239,25 @@
cursor: pointer; cursor: pointer;
padding: 4px 7px; padding: 4px 7px;
} }
.menu .split {
float: left;
border-left: 1px solid #919191;
height: 21px;
margin: 0 5px 0 0px
}
#buildRun {
color: #6DB14C;
padding: 0px 3px 0 5px;
border-radius: 10px;
display: inline-block;
}
#buildRun.ico-stop {
color: #9d0000;
padding: 0 4px 0 4px;
}
/* end menu */ /* end menu */
/* start editor */ /* start editor */

4
static/js/menu.js
View File

@ -229,7 +229,7 @@ var menu = {
return false; return false;
} }
if ($(".toolbars .ico-stop").length === 1) { if ($("#buildRun").hasClass("ico-stop")) {
wide.stop(); wide.stop();
return false; return false;
} }
@ -248,7 +248,7 @@ var menu = {
bottomGroup.resetOutput(); bottomGroup.resetOutput();
}, },
success: function (data) { success: function (data) {
$(".toolbars .ico-buildrun").addClass("ico-stop") $("#buildRun").addClass("ico-stop")
.removeClass("ico-buildrun").attr("title", config.label.stop); .removeClass("ico-buildrun").attr("title", config.label.stop);
} }
}); });

8
static/js/wide.js
View File

@ -358,7 +358,7 @@ var wide = {
break; break;
case 'run-done': case 'run-done':
wide.curProcessId = undefined; wide.curProcessId = undefined;
$(".toolbars .ico-stop").removeClass("ico-stop") $("#buildRun").removeClass("ico-stop")
.addClass("ico-buildrun").attr("title", config.label.build_n_run); .addClass("ico-buildrun").attr("title", config.label.build_n_run);
break; break;
@ -391,7 +391,7 @@ var wide = {
files[lint.file] = lint.file; files[lint.file] = lint.file;
} }
$(".toolbars .ico-stop").removeClass("ico-stop") $("#buildRun").removeClass("ico-stop")
.addClass("ico-buildrun").attr("title", config.label.build_n_run); .addClass("ico-buildrun").attr("title", config.label.build_n_run);
// trigger gutter lint // trigger gutter lint
@ -511,7 +511,7 @@ var wide = {
wide._save(path, wide.curEditor); wide._save(path, wide.curEditor);
}, },
stop: function () { stop: function () {
if ($(".toolbars .ico-buildrun").length === 1) { if ($("#buildRun").hasClass("ico-buildrun")) {
menu.run(); menu.run();
return false; return false;
} }
@ -529,7 +529,7 @@ var wide = {
data: JSON.stringify(request), data: JSON.stringify(request),
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
$(".toolbars .ico-stop").removeClass("ico-stop") $("#buildRun").removeClass("ico-stop")
.addClass("ico-buildrun").attr("title", config.label.build_n_run); .addClass("ico-buildrun").attr("title", config.label.build_n_run);
} }
}); });