diff --git a/background.js b/background.js index e1ce7a777f..bca1dde458 100644 --- a/background.js +++ b/background.js @@ -11,11 +11,11 @@ function start_app() { chrome.app.window.create('main.html', { id: 'main-window', - frame: 'none', + frame: 'chrome', resizable: false }, function(createdWindow) { // set window size - createdWindow.setBounds({'width': 962, 'height': 650}); + createdWindow.setBounds({'width': 960, 'height': 625}); // bind events createdWindow.onMaximized.addListener(function() { diff --git a/main.css b/main.css index 45950255ca..a65779ceff 100644 --- a/main.css +++ b/main.css @@ -41,65 +41,7 @@ input[type="number"]::-webkit-inner-spin-button { .right { float: right; } -#outter-wrapper { - border: 1px solid silver; -} -#frame { - height: 25px; - line-height: 25px; - - -webkit-app-region: drag; - - background-color: white; -} - #frame .title { - float: left; - - margin-left: 15px; - - font-weight: bold; - /* text-shadow: 1px 1px #e4e4e4; */ - } - #frame .minimize { - float: right; - display: block; - - width: 26px; - height: 20px; - - background: url('../images/controls/minimize.png') no-repeat 0 0; - } - #frame .maximize { - float: right; - display: block; - - width: 27px; - height: 20px; - - background: url('../images/controls/maximize.png') no-repeat 0 0; - } - #frame .close { - float: right; - display: block; - - width: 45px; - height: 20px; - - background: url('../images/controls/close.png') no-repeat 0 0; - } - #frame a { - cursor: default; - -webkit-app-region: no-drag; - } - #frame a:hover { - /* hover is disabled untill webkit-app-region: drag; starts to fire events or chromium implements native frame */ - /* background-position: 0px -20px; */ - } - #frame a:active { - background-position: 0px -40px; - } #main-wrapper { - width: 940px; margin: 10px auto 0 auto; padding: 0 10px 0 10px; @@ -256,7 +198,7 @@ input[type="number"]::-webkit-inner-spin-button { padding: 10px; background-color: white; - height: 429px; + height: 431px; overflow-x: hidden; overflow-y: auto; @@ -266,10 +208,11 @@ input[type="number"]::-webkit-inner-spin-button { -webkit-transform: rotateX(0deg); /* DO NOT REMOVE! this fixes the UI freezing bug on MAC OS X */ } #status-bar { - margin-left: -10px; - margin-top: 10px; + position: fixed; - width: 940px; + bottom: 0px; + + width: 100%; height: 20px; line-height: 20px; diff --git a/main.html b/main.html index 0565c73125..5e3edaffdb 100644 --- a/main.html +++ b/main.html @@ -47,81 +47,73 @@ -
-
- Baseflight - Configurator - - - +
+
+
    +
  • + +
    • +
  • + +
    • +
  • + Connect + +
    • +
-
-
-
    -
  • - -
    • -
  • - -
    • -
  • - Connect - -
    • -
-
-
-
    -
  • Gyro
    • -
  • Accel
    • -
  • Mag
    • -
  • Baro
    • -
  • GPS
    • -
  • Sonar
    • -
+
+
    +
  • Gyro
    • +
  • Accel
    • +
  • Mag
    • +
  • Baro
    • +
  • GPS
    • +
  • Sonar
    • +
+
+
+
+
+
+ +
+
+
+
+ D: 0% U: 0% | + 0 | + 0