You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/18 11:37:15 UTC
[23/27] brooklyn-ui git commit: make span12 (composer) line up with
other pages
make span12 (composer) line up with other pages
and remove debug js logging just introduced
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/2414c144
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/2414c144
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/2414c144
Branch: refs/heads/master
Commit: 2414c1443bd5433e0ff5598ba79604f82cd43f7e
Parents: 500b5fa
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Feb 16 20:51:38 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Feb 16 20:51:38 2016 +0000
----------------------------------------------------------------------
src/main/webapp/assets/css/brooklyn.css | 10 +++++++++-
.../code-complete/brooklyn-yaml-completion-proposals.js | 4 +---
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/2414c144/src/main/webapp/assets/css/brooklyn.css
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/css/brooklyn.css b/src/main/webapp/assets/css/brooklyn.css
index c2ad673..ec4aa90 100644
--- a/src/main/webapp/assets/css/brooklyn.css
+++ b/src/main/webapp/assets/css/brooklyn.css
@@ -136,6 +136,13 @@ textarea {
margin-top: 10px !important
}
+.row-fluid .span12 {
+ margin-left: 34px !important;
+ margin-right: -26px !important;
+ margin-top: 10px !important;
+ width: 927px !important;
+}
+
.navbar_top {
background-color: #f0f0f0 !important;
-webkit-border-radius: 13px 13px 0 0 !important;
@@ -145,8 +152,9 @@ textarea {
border-bottom: none;
}
-.navbar_top h3 {
+.navbar_top h3 {
line-height: 24px !important;
+ margin-top: 6px;
}
.navbar_main_wrapper {
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/2414c144/src/main/webapp/assets/js/util/code-complete/brooklyn-yaml-completion-proposals.js
----------------------------------------------------------------------
diff --git a/src/main/webapp/assets/js/util/code-complete/brooklyn-yaml-completion-proposals.js b/src/main/webapp/assets/js/util/code-complete/brooklyn-yaml-completion-proposals.js
index 032f0d6..3dfecd7 100644
--- a/src/main/webapp/assets/js/util/code-complete/brooklyn-yaml-completion-proposals.js
+++ b/src/main/webapp/assets/js/util/code-complete/brooklyn-yaml-completion-proposals.js
@@ -27,6 +27,7 @@ define([
var catalogE = new Catalog(undefined, { name: "catalog/entities" });
var catalogA = new Catalog(undefined, { name: "catalog/applications" });
var catalogL = new Catalog(undefined, { name: "locations" });
+ // if browser opened while server is starting this will fail on first completion
catalogA.fetch();
catalogE.fetch();
catalogL.fetch();
@@ -178,7 +179,6 @@ define([
getServiceTypes: function(n) {
var result = [];
- console.log(catalogE);
catalogE.fetch();
catalogA.fetch();
result = result.concat(_.map(catalogE.models, function(m) { return m.get('symbolicName'); }));
@@ -284,7 +284,6 @@ define([
try {
parse = JsYamlParser.parse(text);
if (typeof parse.result == 'string') {
- console.log("prim");
throw "primitive not supported, parse as empty and let completion apply";
}
} catch (e) {
@@ -332,7 +331,6 @@ define([
}
result = _.compact(_.map(result, function(proposal) {
var proposalObj;
- console.log("considering",proposal,"wrt",wordSoFar,"/",lineSoFar);
if (typeof proposal === 'object') {
proposalObj = proposal;
proposal = proposalObj.text;