").appendTo(content);
@@ -44,8 +44,8 @@ RED.sidebar.config = (function() {
function getOrCreateCategory(name,parent,label) {
name = name.replace(/\./i,"-");
if (!categories[name]) {
- var container = $('
').appendTo(parent);
- var header = $('').appendTo(container);
+ var container = $('').appendTo(parent);
+ var header = $('').appendTo(container);
if (label) {
$('
').text(label).appendTo(header);
} else {
@@ -208,8 +208,8 @@ RED.sidebar.config = (function() {
validList[sf.id.replace(/\./g,"-")] = true;
getOrCreateCategory(sf.id,subflowCategories,sf.name);
})
- $(".workspace-config-node-category").each(function() {
- var id = $(this).attr('id').substring("workspace-config-node-category-".length);
+ $(".red-ui-sidebar-config-category").each(function() {
+ var id = $(this).attr('id').substring("red-ui-sidebar-config-category-".length);
if (!validList[id]) {
$(this).remove();
delete categories[id];
@@ -299,7 +299,7 @@ RED.sidebar.config = (function() {
$(content).find(".red-ui-palette-node").removeClass("selected");
});
- $("#workspace-config-node-collapse-all").on("click", function(e) {
+ $("#red-ui-sidebar-config-collapse-all").on("click", function(e) {
e.preventDefault();
for (var cat in categories) {
if (categories.hasOwnProperty(cat)) {
@@ -307,7 +307,7 @@ RED.sidebar.config = (function() {
}
}
});
- $("#workspace-config-node-expand-all").on("click", function(e) {
+ $("#red-ui-sidebar-config-expand-all").on("click", function(e) {
e.preventDefault();
for (var cat in categories) {
if (categories.hasOwnProperty(cat)) {
@@ -317,39 +317,39 @@ RED.sidebar.config = (function() {
}
}
});
- $('#workspace-config-node-filter-all').on("click",function(e) {
+ $('#red-ui-sidebar-config-filter-all').on("click",function(e) {
e.preventDefault();
if (showUnusedOnly) {
$(this).addClass('selected');
- $('#workspace-config-node-filter-unused').removeClass('selected');
+ $('#red-ui-sidebar-config-filter-unused').removeClass('selected');
showUnusedOnly = !showUnusedOnly;
refreshConfigNodeList();
}
});
- $('#workspace-config-node-filter-unused').on("click",function(e) {
+ $('#red-ui-sidebar-config-filter-unused').on("click",function(e) {
e.preventDefault();
if (!showUnusedOnly) {
$(this).addClass('selected');
- $('#workspace-config-node-filter-all').removeClass('selected');
+ $('#red-ui-sidebar-config-filter-all').removeClass('selected');
showUnusedOnly = !showUnusedOnly;
refreshConfigNodeList();
}
});
- RED.popover.tooltip($('#workspace-config-node-filter-all'),"Show all config nodes");
- RED.popover.tooltip($('#workspace-config-node-filter-unused'),"Show all unused config nodes");
+ RED.popover.tooltip($('#red-ui-sidebar-config-filter-all'),"Show all config nodes");
+ RED.popover.tooltip($('#red-ui-sidebar-config-filter-unused'),"Show all unused config nodes");
}
function show(id) {
if (typeof id === 'boolean') {
if (id) {
- $('#workspace-config-node-filter-unused').trigger("click");
+ $('#red-ui-sidebar-config-filter-unused').trigger("click");
} else {
- $('#workspace-config-node-filter-all').trigger("click");
+ $('#red-ui-sidebar-config-filter-all').trigger("click");
}
}
refreshConfigNodeList();
if (typeof id === "string") {
- $('#workspace-config-node-filter-all').trigger("click");
+ $('#red-ui-sidebar-config-filter-all').trigger("click");
id = id.replace(/\./g,"-");
setTimeout(function() {
var node = $(".red-ui-palette-node_id_"+id);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
index 461cb6801..7c07f5a18 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
@@ -45,7 +45,6 @@ RED.typeSearch = (function() {
}
function createDialog() {
- //shade = $('
',{class:"red-ui-type-search-shade"}).appendTo("#red-ui-main-container");
dialog = $("
",{id:"red-ui-type-search",class:"red-ui-search red-ui-type-search"}).appendTo("#red-ui-main-container");
var searchDiv = $("
",{class:"red-ui-search-container"}).appendTo(dialog);
searchInput = $('
').attr("placeholder",RED._("search.addNode")).appendTo(searchDiv).searchBox({
@@ -104,7 +103,7 @@ RED.typeSearch = (function() {
});
searchResultsDiv = $("
",{class:"red-ui-search-results-container"}).appendTo(dialog);
- searchResults = $('
',{id:"search-result-list", style:"position: absolute;top: 0;bottom: 0;left: 0;right: 0;"}).appendTo(searchResultsDiv).editableList({
+ searchResults = $('',{style:"position: absolute;top: 0;bottom: 0;left: 0;right: 0;"}).appendTo(searchResultsDiv).editableList({
addButton: false,
filter: function(data) {
if (activeFilter === "" ) {
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js
index d47c60a43..a3001e474 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view-navigator.js
@@ -36,10 +36,10 @@
if (!isShowing) {
return;
}
- var navNode = navVis.selectAll(".navnode").data(RED.view.getActiveNodes(),function(d){return d.id});
+ var navNode = navVis.selectAll(".red-ui-navigator-node").data(RED.view.getActiveNodes(),function(d){return d.id});
navNode.exit().remove();
navNode.enter().insert("rect")
- .attr('class','navnode')
+ .attr('class','red-ui-navigator-node')
.attr("pointer-events", "none");
navNode.each(function(d) {
d3.select(this).attr("x",function(d) { return (d.x-d.w/2)/nav_scale })
@@ -68,7 +68,7 @@
function toggle() {
if (!isShowing) {
isShowing = true;
- $("#btn-navigate").addClass("selected");
+ $("#red-ui-view-navigate").addClass("selected");
resizeNavBorder();
refreshNodes();
$("#red-ui-workspace-chart").on("scroll",onScroll);
@@ -77,7 +77,7 @@
isShowing = false;
navContainer.fadeOut(100);
$("#red-ui-workspace-chart").off("scroll",onScroll);
- $("#btn-navigate").removeClass("selected");
+ $("#red-ui-view-navigate").removeClass("selected");
}
}
@@ -101,16 +101,7 @@
.attr("width", nav_width)
.attr("height", nav_height)
.attr("pointer-events", "all")
- .style({
- position: "absolute",
- bottom: 0,
- right:0,
- zIndex: 101,
- "border-left": "1px solid #ccc",
- "border-top": "1px solid #ccc",
- background: "rgba(245,245,245,0.8)",
- "box-shadow": "-1px 0 3px rgba(0,0,0,0.1)"
- });
+ .attr("id","red-ui-navigator-canvas")
navBox.append("rect").attr("x",0).attr("y",0).attr("width",nav_width).attr("height",nav_height).style({
fill:"none",
@@ -142,28 +133,21 @@
isDragging = false;
})
- navBorder = navBox.append("rect")
- .attr("stroke-dasharray","5,5")
- .attr("pointer-events", "none")
- .style({
- stroke: "#999",
- strokeWidth: 1,
- fill: "white",
- });
+ navBorder = navBox.append("rect").attr("class","red-ui-navigator-border")
navVis = navBox.append("svg:g")
RED.statusBar.add({
id: "view-navigator",
align: "right",
- element: $('')
+ element: $('')
})
- $("#btn-navigate").on("click", function(evt) {
+ $("#red-ui-view-navigate").on("click", function(evt) {
evt.preventDefault();
toggle();
})
- RED.popover.tooltip($("#btn-navigate"),RED._('actions.toggle-navigator'),'core:toggle-navigator');
+ RED.popover.tooltip($("#red-ui-view-navigate"),RED._('actions.toggle-navigator'),'core:toggle-navigator');
},
refresh: refreshNodes,
resize: resizeNavBorder,
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
index 9ecd33d90..eed142d64 100755
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -184,7 +184,7 @@ RED.view = (function() {
// .attr("y",point[1])
// .attr("width",0)
// .attr("height",0)
- // .attr("class","lasso");
+ // .attr("class","nr-ui-view-lasso");
},touchLongPressTimeout);
}
})
@@ -962,7 +962,7 @@ RED.view = (function() {
.attr("y",point[1])
.attr("width",0)
.attr("height",0)
- .attr("class","lasso");
+ .attr("class","nr-ui-view-lasso");
d3.event.preventDefault();
}
}
@@ -2766,7 +2766,7 @@ RED.view = (function() {
.attr("x", 38)
.attr("dy", ".35em")
.attr("text-anchor","start")
- .classed("hidden",hideLabel);
+ .classed("hide",hideLabel);
if (d._def.align) {
text.attr("class","node_label node_label_"+d._def.align);
@@ -2788,8 +2788,8 @@ RED.view = (function() {
//node.append("path").attr("class","node_error").attr("d","M 3,-3 l 10,0 l -5,-8 z");
//TODO: these ought to be SVG
- node.append("image").attr("class","node_error hidden").attr("xlink:href","red/images/icons/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9);
- node.append("image").attr("class","node_changed hidden").attr("xlink:href","red/images/icons/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10);
+ node.append("image").attr("class","node_error hide").attr("xlink:href","red/images/icons/node-error.png").attr("x",0).attr("y",-6).attr("width",10).attr("height",9);
+ node.append("image").attr("class","node_changed hide").attr("xlink:href","red/images/icons/node-changed.png").attr("x",12).attr("y",-6).attr("width",10).attr("height",10);
});
node.each(function(d,i) {
@@ -2944,9 +2944,8 @@ RED.view = (function() {
}
s = " "+s;
}
- return "node_label"+
- (d._def.align?" node_label_"+d._def.align:"")+s;
- }).classed("hidden",hideLabel);
+ return "node_label"+(d._def.align?" node_label_"+d._def.align:"")+s;
+ }).classed("hide",hideLabel);
if (d._def.icon) {
var icon = thisNode.select(".node_icon");
var faIcon = thisNode.select(".fa-lg");
@@ -2968,15 +2967,13 @@ RED.view = (function() {
}
}
- thisNode.selectAll(".node_tools").attr("x",function(d){return d.w-35;}).attr("y",function(d){return d.h-20;});
-
thisNode.selectAll(".node_changed")
.attr("x",function(d){return d.w-10})
- .classed("hidden",function(d) { return !(d.changed||d.moved); });
+ .classed("hide",function(d) { return !(d.changed||d.moved); });
thisNode.selectAll(".node_error")
.attr("x",function(d){return d.w-10-((d.changed||d.moved)?13:0)})
- .classed("hidden",function(d) { return d.valid; });
+ .classed("hide",function(d) { return d.valid; });
thisNode.selectAll(".port_input").each(function(d,i) {
var port = d3.select(this);
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
index b29b3ce2e..0ae11e466 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/ace.scss
@@ -7,7 +7,7 @@
border-bottom-right-radius: 4px;
}
-#event-log-editor {
+#red-ui-event-log-editor {
.ace_scroller {
background: #444;
color: #dd9;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/base.scss b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
index 4d5a67f4d..c5da76b1c 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/base.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/base.scss
@@ -221,20 +221,6 @@ table {
border-spacing: 0;
}
-.pull-right {
- float: right;
-}
-
-.pull-left {
- float: left;
-}
-.hide {
- display: none;
-}
-.show {
- display: block;
-}
-
.red-ui-component-spinner {
position: absolute;
top: 1px;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/colors.scss b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
index 0e727c5b8..ad9b438f7 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/colors.scss
@@ -17,23 +17,19 @@
$background-color: #f3f3f3;
$form-placeholder-color: #bbbbbb;
-$form-text-color: #444;
+$form-text-color: #555;
$form-input-focus-color: rgba(85,150,230,0.8);
$form-input-border-color: #ccc;
$form-input-border-selected-color: #aaa;
+$form-input-background: #fff;
+$form-input-background-disabled: #eee;
$list-item-color: #666;
+$list-item-background: #fff;
$list-item-background-hover: #f3f3f3;
$list-item-background-active: #efefef;
$list-item-background-selected: #eee;
-
-$node-selected-color: #ff7f0e;
-$port-selected-color: #ff7f0e;
-$link-color: #888;
-$link-link-color: #ccc;
-$link-link-active-color: #ff7f0e;
-$link-subflow-color: #bbb;
-$link-unknown-color: #f00;
+$list-item-border-selected: #999;
$primary-border-color: #bbbbbb;
$secondary-border-color: #dddddd;
@@ -43,7 +39,7 @@ $tab-background-selected: #f9f9f9;
$tab-background-inactive: #f0f0f0;
$tab-background-hover: #ddd;
-$palette-header-background: #f3f3f3;
+$palette-header-background: $background-color;
$workspace-button-background: #fff;
$workspace-button-background-hover: #ddd;
@@ -93,3 +89,17 @@ $menuDisabledColor: #999;
$menuHoverColor: #ffffff;
$menuHoverBackground: #999;
$menuCaret: #e0e0e0;
+
+$view-navigator-background: rgba(245,245,245,0.8);
+
+
+$view-lasso-stroke: #ff7f0e;
+$view-lasso-fill: rgba(20,125,255,0.1);
+
+$node-selected-color: #ff7f0e;
+$port-selected-color: #ff7f0e;
+$link-color: #888;
+$link-link-color: #ccc;
+$link-link-active-color: #ff7f0e;
+$link-subflow-color: #bbb;
+$link-unknown-color: #f00;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
index 26e7443df..5cb8efa00 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/flow.scss
@@ -14,41 +14,13 @@
* limitations under the License.
**/
-.hidden {
- display: none;
-}
-
-.lasso {
+.nr-ui-view-lasso {
stroke-width: 1px;
- stroke: #ff7f0e;
- fill: rgba(20,125,255,0.1);
+ stroke: $view-lasso-stroke;
+ fill: $view-lasso-fill;
stroke-dasharray: 10 5;
}
-.group-box {
- stroke-width: 1px;
- stroke: #aaaaaa;
- fill: rgba(208, 211, 238, 0.1);
- stroke-dasharray: 3 3;
-}
-.group-box-active {
- fill: #fff;
- stroke: #ff7f0e;
-}
-
-.group_label {
- stroke-width: 0;
- fill: #999;
- font-size: 11px;
- pointer-events: none;
- -webkit-touch-callout: none;
- @include disable-selection;
-}
-
-.pull-right {
- margin-left: 20px;
-}
-
.node_label_italic {
font-style: italic;
}
@@ -100,28 +72,10 @@
stroke-width: 2;
}
-.tool_arrow {
- stroke-width: 1;
- stroke: #999;
- fill: #999;
- cursor: pointer;
-}
-.node_tools {
- fill: #ddd;
- stroke: #999;
- cursor: move;
- stroke-width: 1;
- cursor: pointer;
-}
-.node_tools_hovered {
- stroke: #ff7f0e;
- fill: #eee;
-}
-
.node_button {
fill: inherit;
-
}
+
.port {
stroke: #999;
stroke-width: 1;
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
index e25fb7164..c340908a2 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/forms.scss
@@ -1,58 +1,58 @@
/**
- * Copyright JS Foundation and other contributors, http://js.foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- **/
+* Copyright JS Foundation and other contributors, http://js.foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+**/
/*!
- * Extracted from Bootstrap v2.3.2
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
+* Extracted from Bootstrap v2.3.2
+*
+* Copyright 2013 Twitter, Inc
+* Licensed under the Apache License v2.0
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Designed and built with all the love in the world by @mdo and @fat.
+*/
button,
input,
select,
div[contenteditable="true"],
textarea {
- margin: 0;
- font-size: 100%;
- vertical-align: middle;
+ margin: 0;
+ font-size: 100%;
+ vertical-align: middle;
}
button,
div[contenteditable="true"],
input {
- *overflow: visible;
- line-height: normal;
+ *overflow: visible;
+ line-height: normal;
}
button::-moz-focus-inner,
div[contenteditable="true"]::-moz-focus-inner,
input::-moz-focus-inner {
- padding: 0;
- border: 0;
+ padding: 0;
+ border: 0;
}
button,
html input[type="button"],
input[type="reset"],
input[type="submit"] {
- cursor: pointer;
- -webkit-appearance: button;
+ cursor: pointer;
+ -webkit-appearance: button;
}
label,
@@ -63,51 +63,48 @@ input[type="reset"],
input[type="submit"],
input[type="radio"],
input[type="checkbox"] {
- cursor: pointer;
+ cursor: pointer;
}
input[type="search"] {
- -webkit-box-sizing: content-box;
- -moz-box-sizing: content-box;
- box-sizing: content-box;
- -webkit-appearance: textfield;
+ box-sizing: content-box;
}
input[type="search"]::-webkit-search-decoration,
input[type="search"]::-webkit-search-cancel-button {
- -webkit-appearance: none;
+ -webkit-appearance: none;
}
textarea {
- overflow: auto;
- vertical-align: top;
+ overflow: auto;
+ vertical-align: top;
}
form {
- margin: 0 0 20px;
+ margin: 0 0 20px;
}
fieldset {
- padding: 0;
- margin: 0;
- border: 0;
+ padding: 0;
+ margin: 0;
+ border: 0;
}
legend {
- display: block;
- width: 100%;
- padding: 0;
- margin-bottom: 20px;
- font-size: 21px;
- line-height: 40px;
- color: #333333;
- border: 0;
- border-bottom: 1px solid #e5e5e5;
+ display: block;
+ width: 100%;
+ padding: 0;
+ margin-bottom: 20px;
+ font-size: 21px;
+ line-height: 40px;
+ color: #333333;
+ border: 0;
+ border-bottom: 1px solid #e5e5e5;
}
legend small {
- font-size: 15px;
- color: #999999;
+ font-size: 15px;
+ color: #999999;
}
@@ -117,9 +114,9 @@ div[contenteditable="true"],
button,
select,
textarea {
- font-size: 14px;
- font-weight: normal;
- line-height: 20px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 20px;
}
input,
@@ -127,12 +124,12 @@ div[contenteditable="true"],
button,
select,
textarea {
- font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
label {
- display: block;
- margin-bottom: 5px;
+ display: block;
+ margin-bottom: 5px;
}
select,
@@ -153,27 +150,27 @@ input[type="tel"],
input[type="color"],
div[contenteditable="true"],
.uneditable-input {
- box-sizing: border-box;
- display: inline-block;
- height: 34px;
- padding: 6px 6px;
- margin-bottom: 10px;
- font-size: 14px;
- line-height: 20px;
- color: #555555;
- vertical-align: middle;
- border-radius: 4px;
+ box-sizing: border-box;
+ display: inline-block;
+ height: 34px;
+ padding: 6px 6px;
+ margin-bottom: 10px;
+ font-size: 14px;
+ line-height: 20px;
+ color: $form-text-color;
+ vertical-align: middle;
+ border-radius: 4px;
}
input,
textarea,
div[contenteditable="true"],
.uneditable-input {
- width: 206px;
+ width: 206px;
}
textarea {
- height: auto;
+ height: auto;
}
textarea,
@@ -193,11 +190,9 @@ input[type="tel"],
input[type="color"],
div[contenteditable="true"],
.uneditable-input {
- background-color: #ffffff;
- border: 1px solid $form-input-border-color;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ background-color: $form-input-background;
+ border: 1px solid $form-input-border-color;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
textarea:focus,
@@ -217,22 +212,17 @@ input[type="tel"]:focus,
input[type="color"]:focus,
div[contenteditable="true"]:focus,
.uneditable-input:focus {
- border-color: $form-input-focus-color;
- outline: 0;
- outline: thin dotted \9;
- /* IE6-9 */
-
- // -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- // -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
- // box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+ border-color: $form-input-focus-color;
+ outline: 0;
+ outline: thin dotted \9;
}
input[type="radio"],
input[type="checkbox"] {
- margin: 4px 0 0;
- margin-top: 1px \9;
- *margin-top: 0;
- line-height: normal;
+ margin: 4px 0 0;
+ margin-top: 1px \9;
+ *margin-top: 0;
+ line-height: normal;
}
input[type="file"],
@@ -242,130 +232,123 @@ input[type="reset"],
input[type="button"],
input[type="radio"],
input[type="checkbox"] {
- width: auto;
+ width: auto;
}
select,
input[type="file"] {
- height: 34px;
- /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
- *margin-top: 4px;
- /* For IE7, add top margin to align select with labels */
-
- line-height: 34px;
+ height: 34px;
+ line-height: 34px;
}
select {
- width: 220px;
- background-color: #ffffff;
- border: 1px solid $form-input-border-color;
+ width: 220px;
+ background-color: $form-input-background;
+ border: 1px solid $form-input-border-color;
}
select[multiple],
select[size] {
- height: auto;
+ height: auto;
}
select:focus,
input[type="file"]:focus,
input[type="radio"]:focus,
input[type="checkbox"]:focus {
- outline: thin dotted #333;
- outline: 2px auto $form-input-focus-color;
- outline-offset: -3px;
+ outline: thin dotted #333;
+ outline: 2px auto $form-input-focus-color;
+ outline-offset: -3px;
}
.uneditable-input,
.uneditable-textarea {
- color: #999999;
- cursor: not-allowed;
- background-color: #fcfcfc;
- border-color: #cccccc;
- -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
- -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
- box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+ color: #999999;
+ cursor: not-allowed;
+ background-color: #fcfcfc;
+ border-color: #cccccc;
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
}
.uneditable-input {
- overflow: hidden;
- white-space: nowrap;
+ overflow: hidden;
+ white-space: nowrap;
}
.uneditable-textarea {
- width: auto;
- height: auto;
+ width: auto;
+ height: auto;
}
input:-moz-placeholder,
textarea:-moz-placeholder {
- color: $form-placeholder-color;
+ color: $form-placeholder-color;
}
input:-ms-input-placeholder,
div[contenteditable="true"]:-ms-input-placeholder,
textarea:-ms-input-placeholder {
- color: $form-placeholder-color;
+ color: $form-placeholder-color;
}
input::-webkit-input-placeholder,
div[contenteditable="true"]::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
- color: $form-placeholder-color;
+ color: $form-placeholder-color;
}
.radio,
.checkbox {
- min-height: 20px;
- padding-left: 20px;
+ min-height: 20px;
+ padding-left: 20px;
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
- float: left;
- margin-left: -20px;
+ float: left;
+ margin-left: -20px;
}
.controls > .radio:first-child,
.controls > .checkbox:first-child {
- padding-top: 5px;
+ padding-top: 5px;
}
.radio.inline,
.checkbox.inline {
- display: inline-block;
- padding-top: 5px;
- margin-bottom: 0;
- vertical-align: middle;
+ display: inline-block;
+ padding-top: 5px;
+ margin-bottom: 0;
+ vertical-align: middle;
}
.radio.inline + .radio.inline,
.checkbox.inline + .checkbox.inline {
- margin-left: 10px;
+ margin-left: 10px;
}
.input-mini {
- width: 60px;
+ width: 60px;
}
.input-small {
- width: 90px;
+ width: 90px;
}
.input-medium {
- width: 150px;
+ width: 150px;
}
.input-large {
- width: 210px;
+ width: 210px;
}
.input-xlarge {
- width: 270px;
+ width: 270px;
}
.input-xxlarge {
- width: 530px;
+ width: 530px;
}
input[class*="span"],
@@ -376,8 +359,8 @@ textarea[class*="span"],
.row-fluid select[class*="span"],
.row-fluid textarea[class*="span"],
.row-fluid .uneditable-input[class*="span"] {
- float: none;
- margin-left: 0;
+ float: none;
+ margin-left: 0;
}
.input-append input[class*="span"],
@@ -390,115 +373,14 @@ textarea[class*="span"],
.row-fluid .uneditable-input[class*="span"],
.row-fluid .input-prepend [class*="span"],
.row-fluid .input-append [class*="span"] {
- display: inline-block;
+ display: inline-block;
}
input,
textarea,
div[contenteditable="true"],
.uneditable-input {
- margin-left: 0;
-}
-
-.controls-row [class*="span"] + [class*="span"] {
- margin-left: 20px;
-}
-
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
- width: 926px;
-}
-
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
- width: 846px;
-}
-
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
- width: 766px;
-}
-
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
- width: 686px;
-}
-
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
- width: 606px;
-}
-
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
- width: 526px;
-}
-
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
- width: 446px;
-}
-
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
- width: 366px;
-}
-
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
- width: 286px;
-}
-
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
- width: 206px;
-}
-
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
- width: 126px;
-}
-
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
- width: 46px;
-}
-
-.controls-row {
- *zoom: 1;
-}
-
-.controls-row:before,
-.controls-row:after {
- display: table;
- line-height: 0;
- content: "";
-}
-
-.controls-row:after {
- clear: both;
-}
-
-.controls-row [class*="span"],
-.row-fluid .controls-row [class*="span"] {
- float: left;
-}
-
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
- padding-top: 5px;
+ margin-left: 0;
}
label.disabled {
@@ -512,248 +394,40 @@ textarea[disabled],
input[readonly],
select[readonly],
textarea[readonly] {
- cursor: not-allowed;
- background-color: #eeeeee;
+ cursor: not-allowed;
+ background-color: $form-input-background-disabled;
}
input[type="radio"][disabled],
input[type="checkbox"][disabled],
input[type="radio"][readonly],
input[type="checkbox"][readonly] {
- background-color: transparent;
-}
-
-.control-group.warning .control-label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
- color: #c09853;
-}
-
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning div[contenteditable="true"],
-.control-group.warning select,
-.control-group.warning textarea {
- color: #c09853;
-}
-
-.control-group.warning input,
-.control-group.warning div[contenteditable="true"],
-.control-group.warning select,
-.control-group.warning textarea {
- border-color: #c09853;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.warning input:focus,
-.control-group.warning div[contenteditable="true"]:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
- border-color: #a47e3c;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
- color: #c09853;
- background-color: #fcf8e3;
- border-color: #c09853;
-}
-
-.control-group.error .control-label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
- color: #b94a48;
-}
-
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error div[contenteditable="true"],
-.control-group.error select,
-.control-group.error textarea {
- color: #b94a48;
-}
-
-.control-group.error input,
-.control-group.error div[contenteditable="true"],
-.control-group.error select,
-.control-group.error textarea {
- border-color: #b94a48;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.error input:focus,
-.control-group.error div[contenteditable="true"]:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
- border-color: #953b39;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
- color: #b94a48;
- background-color: #f2dede;
- border-color: #b94a48;
-}
-
-.control-group.success .control-label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
- color: #468847;
-}
-
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success div[contenteditable="true"],
-.control-group.success select,
-.control-group.success textarea {
- color: #468847;
-}
-
-.control-group.success input,
-.control-group.success div[contenteditable="true"],
-.control-group.success select,
-.control-group.success textarea {
- border-color: #468847;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.success input:focus,
-.control-group.success div[contenteditable="true"]:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
- border-color: #356635;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
- color: #468847;
- background-color: #dff0d8;
- border-color: #468847;
-}
-
-.control-group.info .control-label,
-.control-group.info .help-block,
-.control-group.info .help-inline {
- color: #3a87ad;
-}
-
-.control-group.info .checkbox,
-.control-group.info .radio,
-.control-group.info input,
-.control-group.info div[contenteditable="true"],
-.control-group.info select,
-.control-group.info textarea {
- color: #3a87ad;
-}
-
-.control-group.info input,
-.control-group.info div[contenteditable="true"],
-.control-group.info select,
-.control-group.info textarea {
- border-color: #3a87ad;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.info input:focus,
-.control-group.info div[contenteditable="true"]:focus,
-.control-group.info select:focus,
-.control-group.info textarea:focus {
- border-color: #2d6987;
- -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
- -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-}
-
-.control-group.info .input-prepend .add-on,
-.control-group.info .input-append .add-on {
- color: #3a87ad;
- background-color: #d9edf7;
- border-color: #3a87ad;
+ background-color: transparent;
}
input:focus:invalid,
div[contenteditable="true"]:focus:invalid,
textarea:focus:invalid,
select:focus:invalid {
- color: #b94a48;
- border-color: #ee5f5b;
+ color: #b94a48;
+ border-color: #ee5f5b;
}
input:focus:invalid:focus,
div[contenteditable="true"]:focus:invalid:focus,
textarea:focus:invalid:focus,
select:focus:invalid:focus {
- border-color: #e9322d;
- -webkit-box-shadow: 0 0 6px #f8b9b7;
- -moz-box-shadow: 0 0 6px #f8b9b7;
- box-shadow: 0 0 6px #f8b9b7;
-}
-
-.form-actions {
- padding: 19px 20px 20px;
- margin-top: 20px;
- margin-bottom: 20px;
- background-color: #f5f5f5;
- border-top: 1px solid #e5e5e5;
- *zoom: 1;
-}
-
-.form-actions:before,
-.form-actions:after {
- display: table;
- line-height: 0;
- content: "";
-}
-
-.form-actions:after {
- clear: both;
-}
-
-.help-block,
-.help-inline {
- color: #595959;
-}
-
-.help-block {
- display: block;
- margin-bottom: 10px;
-}
-
-.help-inline {
- display: inline-block;
- *display: inline;
- padding-left: 5px;
- vertical-align: middle;
- *zoom: 1;
+ border-color: #e9322d;
+ box-shadow: 0 0 6px #f8b9b7;
}
.input-append,
.input-prepend {
- display: inline-block;
- margin-bottom: 10px;
- font-size: 0;
- white-space: nowrap;
- vertical-align: middle;
+ display: inline-block;
+ margin-bottom: 10px;
+ font-size: 0;
+ white-space: nowrap;
+ vertical-align: middle;
}
.input-append input,
@@ -768,7 +442,7 @@ select:focus:invalid:focus {
.input-prepend .red-ui-menu-dropdown,
.input-append .popover,
.input-prepend .popover {
- font-size: 14px;
+ font-size: 14px;
}
.input-append input,
@@ -779,13 +453,11 @@ select:focus:invalid:focus {
.input-prepend select,
.input-append .uneditable-input,
.input-prepend .uneditable-input {
- position: relative;
- margin-bottom: 0;
- *margin-left: 0;
- vertical-align: top;
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
+ position: relative;
+ margin-bottom: 0;
+ *margin-left: 0;
+ vertical-align: top;
+ border-radius: 0 4px 4px 0;
}
.input-append input:focus,
@@ -796,23 +468,23 @@ select:focus:invalid:focus {
.input-prepend select:focus,
.input-append .uneditable-input:focus,
.input-prepend .uneditable-input:focus {
- z-index: 2;
+ z-index: 2;
}
.input-append .add-on,
.input-prepend .add-on {
- display: inline-block;
- width: auto;
- height: 20px;
- min-width: 16px;
- padding: 4px 5px;
- font-size: 14px;
- font-weight: normal;
- line-height: 20px;
- text-align: center;
- text-shadow: 0 1px 0 #ffffff;
- background-color: #eeeeee;
- border: 1px solid #ccc;
+ display: inline-block;
+ width: auto;
+ height: 20px;
+ min-width: 16px;
+ padding: 4px 5px;
+ font-size: 14px;
+ font-weight: normal;
+ line-height: 20px;
+ text-align: center;
+ text-shadow: 0 1px 0 #ffffff;
+ background-color: #eeeeee;
+ border: 1px solid #ccc;
}
.input-append .add-on,
@@ -821,142 +493,112 @@ select:focus:invalid:focus {
.input-prepend .btn,
.input-append .btn-group > .dropdown-toggle,
.input-prepend .btn-group > .dropdown-toggle {
- vertical-align: top;
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
+ vertical-align: top;
+ border-radius: 0;
}
.input-append .active,
.input-prepend .active {
- background-color: #a9dba9;
- border-color: #46a546;
+ background-color: #a9dba9;
+ border-color: #46a546;
}
.input-prepend .add-on,
.input-prepend .btn {
- margin-right: -1px;
+ margin-right: -1px;
}
.input-prepend .add-on:first-child,
.input-prepend .btn:first-child {
- -webkit-border-radius: 4px 0 0 4px;
- -moz-border-radius: 4px 0 0 4px;
- border-radius: 4px 0 0 4px;
+ border-radius: 4px 0 0 4px;
}
.input-append input,
.input-append div[contenteditable="true"],
.input-append select,
.input-append .uneditable-input {
- -webkit-border-radius: 4px 0 0 4px;
- -moz-border-radius: 4px 0 0 4px;
- border-radius: 4px 0 0 4px;
+ border-radius: 4px 0 0 4px;
}
.input-append input + .btn-group .btn:last-child,
.input-append select + .btn-group .btn:last-child,
.input-append .uneditable-input + .btn-group .btn:last-child {
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
}
.input-append .add-on,
.input-append .btn,
.input-append .btn-group {
- margin-left: -1px;
+ margin-left: -1px;
}
.input-append .add-on:last-child,
.input-append .btn:last-child,
.input-append .btn-group:last-child > .dropdown-toggle {
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
}
.input-prepend.input-append input,
.input-prepend.input-append div[contenteditable="true"],
.input-prepend.input-append select,
.input-prepend.input-append .uneditable-input {
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
+ border-radius: 0;
}
.input-prepend.input-append input + .btn-group .btn,
.input-prepend.input-append select + .btn-group .btn,
.input-prepend.input-append .uneditable-input + .btn-group .btn {
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
}
.input-prepend.input-append .add-on:first-child,
.input-prepend.input-append .btn:first-child {
- margin-right: -1px;
- -webkit-border-radius: 4px 0 0 4px;
- -moz-border-radius: 4px 0 0 4px;
- border-radius: 4px 0 0 4px;
+ margin-right: -1px;
+ border-radius: 4px 0 0 4px;
}
.input-prepend.input-append .add-on:last-child,
.input-prepend.input-append .btn:last-child {
- margin-left: -1px;
- -webkit-border-radius: 0 4px 4px 0;
- -moz-border-radius: 0 4px 4px 0;
- border-radius: 0 4px 4px 0;
+ margin-left: -1px;
+ border-radius: 0 4px 4px 0;
}
.input-prepend.input-append .btn-group:first-child {
- margin-left: 0;
+ margin-left: 0;
}
input.search-query {
- padding-right: 14px;
- padding-right: 4px \9;
- padding-left: 14px;
- padding-left: 4px \9;
- /* IE7-8 doesn't have border-radius, so don't indent the padding */
+ padding-right: 14px;
+ padding-right: 4px \9;
+ padding-left: 14px;
+ padding-left: 4px \9;
+ /* IE7-8 doesn't have border-radius, so don't indent the padding */
- margin-bottom: 0;
- -webkit-border-radius: 15px;
- -moz-border-radius: 15px;
- border-radius: 15px;
+ margin-bottom: 0;
+ border-radius: 15px;
}
/* Allow for input prepend/append in search forms */
.form-search .input-append .search-query,
.form-search .input-prepend .search-query {
- -webkit-border-radius: 0;
- -moz-border-radius: 0;
- border-radius: 0;
+ border-radius: 0;
}
.form-search .input-append .search-query {
- -webkit-border-radius: 14px 0 0 14px;
- -moz-border-radius: 14px 0 0 14px;
- border-radius: 14px 0 0 14px;
+ border-radius: 14px 0 0 14px;
}
.form-search .input-append .btn {
- -webkit-border-radius: 0 14px 14px 0;
- -moz-border-radius: 0 14px 14px 0;
- border-radius: 0 14px 14px 0;
+ border-radius: 0 14px 14px 0;
}
.form-search .input-prepend .search-query {
- -webkit-border-radius: 0 14px 14px 0;
- -moz-border-radius: 0 14px 14px 0;
- border-radius: 0 14px 14px 0;
+ border-radius: 0 14px 14px 0;
}
.form-search .input-prepend .btn {
- -webkit-border-radius: 14px 0 0 14px;
- -moz-border-radius: 14px 0 0 14px;
- border-radius: 14px 0 0 14px;
+ border-radius: 14px 0 0 14px;
}
.form-search input,
@@ -983,96 +625,96 @@ input.search-query {
.form-search .input-append,
.form-inline .input-append,
.form-horizontal .input-append {
- display: inline-block;
- *display: inline;
- margin-bottom: 0;
- vertical-align: middle;
- *zoom: 1;
+ display: inline-block;
+ *display: inline;
+ margin-bottom: 0;
+ vertical-align: middle;
+ *zoom: 1;
}
.form-search .hide,
.form-inline .hide,
.form-horizontal .hide {
- display: none;
+ display: none;
}
.form-search label,
.form-inline label,
.form-search .btn-group,
.form-inline .btn-group {
- display: inline-block;
+ display: inline-block;
}
.form-search .input-append,
.form-inline .input-append,
.form-search .input-prepend,
.form-inline .input-prepend {
- margin-bottom: 0;
+ margin-bottom: 0;
}
.form-search .radio,
.form-search .checkbox,
.form-inline .radio,
.form-inline .checkbox {
- padding-left: 0;
- margin-bottom: 0;
- vertical-align: middle;
+ padding-left: 0;
+ margin-bottom: 0;
+ vertical-align: middle;
}
.form-search .radio input[type="radio"],
.form-search .checkbox input[type="checkbox"],
.form-inline .radio input[type="radio"],
.form-inline .checkbox input[type="checkbox"] {
- float: left;
- margin-right: 3px;
- margin-left: 0;
+ float: left;
+ margin-right: 3px;
+ margin-left: 0;
}
.control-group {
- margin-bottom: 10px;
+ margin-bottom: 10px;
}
legend + .control-group {
- margin-top: 20px;
- -webkit-margin-top-collapse: separate;
+ margin-top: 20px;
+ -webkit-margin-top-collapse: separate;
}
.form-horizontal .control-group {
- margin-bottom: 20px;
- *zoom: 1;
+ margin-bottom: 20px;
+ *zoom: 1;
}
.form-horizontal .control-group:before,
.form-horizontal .control-group:after {
- display: table;
- line-height: 0;
- content: "";
+ display: table;
+ line-height: 0;
+ content: "";
}
.form-horizontal .control-group:after {
- clear: both;
+ clear: both;
}
.form-horizontal .control-label {
- float: left;
- width: 160px;
- padding-top: 5px;
- text-align: right;
+ float: left;
+ width: 160px;
+ padding-top: 5px;
+ text-align: right;
}
.form-horizontal .controls {
- *display: inline-block;
- *padding-left: 20px;
- margin-left: 180px;
- *margin-left: 0;
+ *display: inline-block;
+ *padding-left: 20px;
+ margin-left: 180px;
+ *margin-left: 0;
}
.form-horizontal .controls:first-child {
- *padding-left: 180px;
+ *padding-left: 180px;
}
.form-horizontal .help-block {
- margin-bottom: 0;
+ margin-bottom: 0;
}
.form-horizontal input + .help-block,
@@ -1081,14 +723,14 @@ legend + .control-group {
.form-horizontal .uneditable-input + .help-block,
.form-horizontal .input-prepend + .help-block,
.form-horizontal .input-append + .help-block {
- margin-top: 10px;
+ margin-top: 10px;
}
.form-horizontal .form-actions {
- padding-left: 180px;
+ padding-left: 180px;
}
.form-row div[contenteditable="true"] {
- white-space: nowrap;
- overflow: hidden;
+ white-space: nowrap;
+ overflow: hidden;
}
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/search.scss b/packages/node_modules/@node-red/editor-client/src/sass/search.scss
index 692d4e9e2..fa846a3d6 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/search.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/search.scss
@@ -19,22 +19,13 @@
display: none;
position: absolute;
width: 500px;
- background: white;
left: 50%;
margin-left: -250px;
top: 0px;
border: 1px solid $primary-border-color;
box-shadow: 0 0 10px rgba(0,0,0,0.4);
+}
- ol {
- }
-}
-.red-ui-type-search-shade {
- @include shade;
- z-index: 20;
- position: fixed;
- background: rgba(255,255,255,0.05);
-}
.red-ui-type-search {
box-shadow: 0 1px 6px -3px black;
background: none;
@@ -45,7 +36,7 @@
.red-ui-search-container {
border-top-left-radius: 5px;
border-top-right-radius: 5px;
- border: 1px dashed #aaa;
+ border: 1px dashed $primary-border-color;
border-bottom: none;
padding: 0;
}
@@ -53,8 +44,8 @@
display: none;
height: 150px;
.red-ui-editableList-container {
- border: 1px dashed #aaa;
- border-top: 1px solid #ccc;
+ border: 1px dashed $primary-border-color;
+ border-top: 1px solid $secondary-border-color;
}
}
.red-ui-search-result {
@@ -69,7 +60,7 @@
}
}
.red-ui-search-result-separator {
- border-bottom: 3px solid #ddd;
+ border-bottom: 3px solid $secondary-border-color;
}
.red-ui-search-result-node {
position: relative;
@@ -107,25 +98,27 @@
.red-ui-search-container {
padding: 3px;
+ background: $form-input-background;
border-bottom: 1px solid $secondary-border-color;
}
.red-ui-search-results-container {
position:relative;
height: 300px;
padding: 5px;
- background: #f9f9f9;
+ background: $background-color;
+ .red-ui-search-results-list {
+ }
.red-ui-editableList-container {
- background: white;
padding: 0;
- background: #f9f9f9;
+ background: $background-color;
li {
padding: 0;
&.selected {
- background: #efefef;
+ background: $list-item-background-selected;
.red-ui-search-result {
- border-left-color:#999;
- border-right-color:#999;
+ border-left-color: $list-item-border-selected;
+ border-right-color: $list-item-border-selected;
}
}
}
@@ -135,15 +128,16 @@
padding: 8px 2px 8px 5px;
display: block;
cursor: pointer;
- color: $form-text-color;
- border-left: 3px solid #fff;
- border-right: 3px solid #fff;
+ color: $list-item-color;
+ background: $list-item-background;
+ border-left: 3px solid $list-item-background;
+ border-right: 3px solid $list-item-background;
&:hover {
text-decoration: none;
color: $form-text-color;
- background: #efefef;
- border-left-color:#efefef;
- border-right-color:#efefef;
+ background: $list-item-background-hover;
+ border-left-color:$list-item-background-hover;
+ border-right-color:$list-item-background-hover;
}
&:after {
content: "";
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
index 749b631db..6fac448d0 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/workspace.scss
@@ -96,3 +96,21 @@
}
}
}
+
+#red-ui-navigator-canvas {
+ position: absolute;
+ bottom: 0;
+ right:0;
+ zIndex: 101;
+ border-left: 1px solid $primary-border-color;
+ border-top: 1px solid $primary-border-color;
+ background: $view-navigator-background;
+ box-shadow: -1px 0 3px rgba(0,0,0,0.1);
+}
+.red-ui-navigator-border {
+ stroke-dasharray: 5,5;
+ pointer-events: none;
+ stroke: #999;
+ strokeWidth: 1;
+ fill: white;
+}
diff --git a/packages/node_modules/@node-red/nodes/core/core/58-debug.html b/packages/node_modules/@node-red/nodes/core/core/58-debug.html
index a9aec6b41..bcc33ee4f 100644
--- a/packages/node_modules/@node-red/nodes/core/core/58-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/core/58-debug.html
@@ -206,14 +206,14 @@
};
RED.events.on("project:change", this.clearMessageList);
- $("#debug-tab-open").on("click", function(e) {
+ $("#red-ui-sidebar-debug-open").on("click", function(e) {
e.preventDefault();
subWindow = window.open(document.location.toString().replace(/[?#].*$/,"")+"debug/view/view.html"+document.location.search,"nodeREDDebugView","menubar=no,location=no,toolbar=no,chrome,height=500,width=600");
subWindow.onload = function() {
subWindow.postMessage({event:"workspaceChange",activeWorkspace:RED.workspaces.active()},"*");
};
});
- RED.popover.tooltip($("#debug-tab-open"),RED._('node-red:debug.sidebar.openWindow'));
+ RED.popover.tooltip($("#red-ui-sidebar-debug-open"),RED._('node-red:debug.sidebar.openWindow'));
diff --git a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js b/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
index 0dc1f99fc..ded828ea5 100644
--- a/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
+++ b/packages/node_modules/@node-red/nodes/core/core/lib/debug/debug-utils.js
@@ -41,15 +41,15 @@ RED.debug = (function() {
var content = $("").css({"position":"relative","height":"100%"});
var toolbar = $('').appendTo(content);
+ ''+
+ '
').appendTo(content);
var footerToolbar = $(''+
// ''+
- // ''+
- // ' '+
+ // ''+
+ // ' '+
// ''+
- ' ' +
+ ' ' +
'
');
messageList = $('').appendTo(content);
@@ -59,9 +59,9 @@ RED.debug = (function() {
var filterDialog = $(''+
'
'+
''+
- ''+
- ''+
- ' '+
+ ''+
+ ''+
+ ' '+
''+
'
'+
'