Merge branch 'feature/datadoghq' into production

SmartcitySantiagoChile · Sep 14, 2021 · d5e4450 · d5e4450
2 parents 9e76846 + b32d551
commit d5e4450
Show file tree

Hide file tree

Showing 4 changed files with 203 additions and 42 deletions.
diff --git a/dataUploader b/dataUploader
diff --git a/shape/static/shape/css/mapBase.css b/shape/static/shape/css/mapBase.css
@@ -77,15 +77,22 @@
     width: 80%;
 }
 
-#addRouteButton, #addStopButton {
-    float: right;
+#addRouteButton, #addStopButton{
+    float: left;
+}
+#backToRouteControl, #backToStopControl{
+    float: right
 }
 
 .select2-selection--multiple {
     max-height: 60px;
     overflow: auto
 }
 
+.select2-container .select2-selection--single .select2-selection__rendered{
+    display: inline !important;
+}
+
 /* used for layer group control */
 
 #layerGroupContainer {
@@ -107,7 +114,7 @@
     display: block;
 }
 
-#listControl {
+#listControl, #stopListControl {
     padding: 0px;
 }
 
@@ -129,7 +136,7 @@
     opacity: 1;
 }
 
-#routeLegendControl table thead tr th, #routeLegendControl table tbody tr td {
+#routeLegendControl, table thead tr th, #routeLegendControl, table tbody tr td {
     padding: 0px 2px;
 }