diff --git a/index.html b/index.html index 65193061..6a5cfddc 100644 --- a/index.html +++ b/index.html @@ -88,13 +88,7 @@
-
-
- +
+
+
+
    +
  • +
    +
  • +
+
  • diff --git a/js/serial_backend.js b/js/serial_backend.js index e73022b4..4f475c1a 100755 --- a/js/serial_backend.js +++ b/js/serial_backend.js @@ -482,6 +482,8 @@ var SerialBackend = (function () { interval.add('global_data_refresh', periodicStatusUpdater.run, periodicStatusUpdater.getUpdateInterval(CONFIGURATOR.connection.bitrate), false); }); + $('#profiles_wrapper_global').show(); + } privateScope.onClosed = function (result) { @@ -497,6 +499,7 @@ var SerialBackend = (function () { $('#sensor-status').hide(); $('#portsinput').show(); $('#dataflash_wrapper_global').hide(); + $('#profiles_wrapper_global').hide(); $('#quad-status_wrapper').hide(); //updateFirmwareVersion(); diff --git a/src/css/main.css b/src/css/main.css index 829b19f0..9e632f93 100644 --- a/src/css/main.css +++ b/src/css/main.css @@ -1696,11 +1696,11 @@ dialog { color: white; font-size: 10px; margin-top: 20px; - width: 410px; + width: 100px; float: right; - margin-right: 10px; + margin-right: 20px; line-height: 12px; - height: 33px; + height: 64px; border-radius: 5px; border: 1px solid #272727; box-shadow: 0 1px 0 rgba(92, 92, 92, 0.5); @@ -1708,36 +1708,66 @@ dialog { padding-top: 5px; display: none; text-shadow: 0 1px rgba(0, 0, 0, 1.0); +} +@media screen and (max-width: 1060px) { + #dataflash_wrapper_global { + display: none !important; + } +} + +/* Profile selector styling*/ + +#profiles_wrapper_global { + color: white; + font-size: 10px; + margin-top: 20px; + width: 130px; + float: right; + margin-right: 10px; + line-height: 12px; + height: 64px; + padding: 0px; + display: none; + text-shadow: 0 1px rgba(0, 0, 0, 1.0); } #profile_change { color: white; - margin-top: 16px; + margin: 0px; width: 130px; float: left; - margin-right: 10px; line-height: 12px; } +#profile_change > .dropdown { + margin: 0px; +} + #mixer_profile_change { color: white; - margin-top: 16px; + margin: 0px; width: 130px; float: left; - margin-right: 0; line-height: 12px; } +#mixer_profile_change > .dropdown { + margin: 0px; +} + #battery_profile_change { color: white; - margin-top: 16px; + margin: 0px; width: 130px; float: right; - margin-right: 0; line-height: 12px; } +#battery_profile_change > .dropdown { + margin: 0px; +} + .dataflash-contents_global { margin-top: 18px; border: 1px solid #4A4A4A;