Merge branch 'master' into MultipleOperandsExpressions

Conflicts:
	src/js/app/bitwise/expression.js
	src/js/app/modelViews.js
	tests/e2e/spec.js
	tests/unit/domain/expressionSpec.js
This commit is contained in:
BorysLevytskyi
2015-12-04 22:14:19 +02:00
2 changed files with 2 additions and 1 deletions

View File

@@ -20,6 +20,8 @@ code { font-size: 1.2em; font-weight: bold; }
.expression .label { font-weight: bold; padding-right: 5px; text-align: right; }
.expression .bin { letter-spacing: 3px; }
.expression .flipable { cursor: pointer; opacity: 1 }
.expression .flipable:hover { opacity: 0.8 }
.expression .byte { margin: 0 3px; }
.expression .flipable { cursor: pointer; opacity: 1 }
.expression .flipable:hover { opacity: 0.8 }

View File

@@ -18,7 +18,6 @@
this.initialize();
};
window.app = app;
})(window.core);