diff --git a/client/app/components/coordinator/coordinator.html b/client/app/components/coordinator/coordinator.html index 53ff039..5e44963 100644 --- a/client/app/components/coordinator/coordinator.html +++ b/client/app/components/coordinator/coordinator.html @@ -127,6 +127,7 @@
+
Commanded
N/A
+
Observed
N/A
@@ -543,6 +545,7 @@
+
Commanded
N/A
    @@ -559,6 +562,7 @@
+
Observed
N/A
diff --git a/client/app/components/coordinator/js/update_guis.js b/client/app/components/coordinator/js/update_guis.js index 2e68af7..68bf653 100644 --- a/client/app/components/coordinator/js/update_guis.js +++ b/client/app/components/coordinator/js/update_guis.js @@ -253,7 +253,8 @@ function displayLoadingOptions() { '
'; } } - }); + }); + $('#loadBagList').next().find('div.selectize-input > input').prop('disabled', 'disabled'); getBagList(function(results){ if(!results) { @@ -280,6 +281,8 @@ function displayLoadingOptions() { armSelectize.clearOptions() armSelectize.addOption([{name: 'Dual-arm', value: false}, {name: 'Single-arm', value: true}]); armSelectize.setValue(false); + + $('#armMode').next().find('div.selectize-input > input').prop('disabled', 'disabled'); } function hideLoadingOptions(loadBag) { diff --git a/client/app/main.css b/client/app/main.css index 5dfd8b6..235f744 100644 --- a/client/app/main.css +++ b/client/app/main.css @@ -348,7 +348,7 @@ html, body { } .execution-control .button-area > button { - font-size: 12pt !important; + /* font-size: 12pt !important; */ } button[class*="disabled"] { @@ -470,4 +470,20 @@ html, body { .teaching-mode-operations, .play-mode-operations { margin-left : 8.33% !important + } + + .slider-options .btn-primary { + background : #3671F9; + width: 100%; + margin-bottom: 10px; + } + + .progress-bar { + background : #3671F9; + } + + .progress-bar-label { + color: grey; + line-height: 21px; + font-size: 16px; } \ No newline at end of file diff --git a/client/include/images/palette.jpg b/client/include/images/palette.jpg new file mode 100644 index 0000000..b6df97a Binary files /dev/null and b/client/include/images/palette.jpg differ