senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetic changes

Browse Source
This commit is contained in:
Rohit
2019-07-08 18:48:12 -04:00
parent 3ceaca926d
commit c1287159e4
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/app/components/coordinator/coordinator.html
View File

@@ -127,6 +127,7 @@
<div class="status-list"> <div class="status-list">
<div class="commanded"> <div class="commanded">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Commanded</div>
<div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div> <div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div>
</div> </div>
<ul class="list-group list-group-horizontal text-center"> <ul class="list-group list-group-horizontal text-center">
@@ -143,6 +144,7 @@
</div> </div>
<div class="observed"> <div class="observed">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Observed</div>
<div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200"> <div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedLeft" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">
<span>N/A</span> <span>N/A</span>
<div> <div>
@@ -543,6 +545,7 @@
<div class="status-list"> <div class="status-list">
<div class="commanded"> <div class="commanded">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Commanded</div>
<div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div> <div class="progress-bar bg-success" role="progressbar" id="frankaForceCommandedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">N/A</div>
</div> </div>
<ul class="list-group list-group-horizontal text-center"> <ul class="list-group list-group-horizontal text-center">
@@ -559,6 +562,7 @@
</div> </div>
<div class="observed"> <div class="observed">
<div class="progress"> <div class="progress">
<div class="progress-bar-label">Observed</div>
<div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200"> <div class="progress-bar bg-success" role="progressbar" id="frankaForceObservedRight" aria-valuenow="25" aria-valuemin="0" aria-valuemax="200">
<span>N/A</span> <span>N/A</span>
<div> <div>

5
client/app/components/coordinator/js/update_guis.js
View File

@@ -253,7 +253,8 @@ function displayLoadingOptions() {
'</div>'; '</div>';
} }
} }
}); });
$('#loadBagList').next().find('div.selectize-input > input').prop('disabled', 'disabled');
getBagList(function(results){ getBagList(function(results){
if(!results) { if(!results) {
@@ -280,6 +281,8 @@ function displayLoadingOptions() {
armSelectize.clearOptions() armSelectize.clearOptions()
armSelectize.addOption([{name: 'Dual-arm', value: false}, {name: 'Single-arm', value: true}]); armSelectize.addOption([{name: 'Dual-arm', value: false}, {name: 'Single-arm', value: true}]);
armSelectize.setValue(false); armSelectize.setValue(false);
$('#armMode').next().find('div.selectize-input > input').prop('disabled', 'disabled');
} }
function hideLoadingOptions(loadBag) { function hideLoadingOptions(loadBag) {

18
client/app/main.css
View File

@@ -348,7 +348,7 @@ html, body {
} }
.execution-control .button-area > button { .execution-control .button-area > button {
font-size: 12pt !important; /* font-size: 12pt !important; */
} }
button[class*="disabled"] { button[class*="disabled"] {
@@ -470,4 +470,20 @@ html, body {
.teaching-mode-operations, .play-mode-operations { .teaching-mode-operations, .play-mode-operations {
margin-left : 8.33% !important 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;
} }

BIN
client/include/images/palette.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB