diff --git a/css/keys_dialog.css b/css/keys_dialog.css index e443817f..39be3985 100755 --- a/css/keys_dialog.css +++ b/css/keys_dialog.css @@ -1,130 +1,3 @@ -/* Colums START> */ -.cf_column { - min-height: 20px; - margin-bottom: 0px; -} - -.full { - float: left; - width: 100%; -} - -.half { - float: left; - width: 50%; -} - -.third_left { - float: left; - width: 33%; -} - -.third_center { - display: inline-block; - width: 34%; -} - -.third_right { - float: right; - width: 33%; -} - -.fourth { - float: left; - width: 25%; -} - -.threefourth_right { - float: right; - width: 75%; -} - -.threefourth_left { - float: left; - width: 75%; -} - -.twothird { - float: left; - width: 67%; -} - -/* Columns END> */ - -/* Default Parameter Entry Field */ -input[type="number"]::-webkit-inner-spin-button { - opacity: 1; /* required for chromium 33+ beta */ - margin-left: 5px; -} - -.clear-both { - clear: both; -} - -.left { - float: left; -} - -.right { - float: right; -} - -/* Standard GUI BOX */ -.gui_box { - border: 1px solid #ccc; - border-radius: 4px; - background-color: #FFFFFF; - float: left; - width: calc(100% - 2px); - margin-bottom: 10px; - font-family: 'open_sansregular', Arial; -} - -.gui_box_titlebar { - background-color: #e4e4e4; - border-radius: 3px 3px 0px 0px; - font-size: 13px; - width: 100%; - height: 27px; - padding-bottom: 0px; - float: left; - margin-bottom: 7px; - font-family: 'open_sanssemibold', Arial; -} - -/* Spacers */ -.spacer { - padding-left: 7px; - padding-right: 7px; - width: calc(100% - 14px); - float: left; -} - -.spacer_box { - padding: 5px; - margin-bottom: 3px; -} - -.spacer_box_title { - padding-left: 10px; - padding-right: 10px; - padding-top: 4px; - margin-bottom: 0px; - float: left; -} - -.spacer_left { - padding-left: 15px; - float: left; - width: calc(100% - 15px); -} - -.spacer_right { - padding-right: 15px; - width: calc(100% - 15px); - float: left; -} - .keys-dialog .parameter th { background-color: #828885; padding: 4px; @@ -136,27 +9,27 @@ input[type="number"]::-webkit-inner-spin-button { } .keys-dialog .modal-dialog { - width:50%; - min-width:600px; + width: 90%; + min-width: 800px; } .keys-dialog .gui_box { margin-bottom: 0px; } -dialog .spacer_box { +.keys-dialog .spacer_box { padding-bottom: 10px; float: left; width: calc(100% - 5px); } -.show { +.keys-dialog .show { width:110px; float:right; margin-right:3px; } -.show a { +.keys-dialog .show a { margin-left: 10px; width: calc(100% - 10px); } @@ -168,11 +41,9 @@ dialog .spacer_box { .keys-dialog li{ - height: 3em; - text-align: left; - max-width: none; display: flex; - height: 38px; + position: static; + margin-bottom: 0.05em; } .keys-dialog ul{ @@ -210,16 +81,14 @@ dialog .spacer_box { vertical-align: middle; } -.keys-dialog .description { +.keys-dialog div.description { flex: 1; padding-left: 10px; - margin-top: 6px; - font-style: normal; - font-family: 'open_sansregular', Arial; - line-height: 1.3em; color: #7d7d7d; - font-size: 11px; text-align: left; + position: relative; + vertical-align: middle; + font-size: 11px; } @@ -241,6 +110,7 @@ dialog .spacer_box { font-size: 11px; text-align: left; min-width: 165px; + vertical-align: middle; } .noline { diff --git a/css/main.css b/css/main.css index e8d7fe1e..395d36e6 100644 --- a/css/main.css +++ b/css/main.css @@ -6,6 +6,7 @@ html, body { overflow-y: visible; /* Show page scrollbar when packaged as a Chrome app */ } + /* Add an extended wide size to the page container for large monitors */ @media (min-width: 1400px) { .container.main-pane { @@ -13,6 +14,44 @@ html, body { } } +@media (max-width: 1140px) { + .navbar-header { + float: none; + } + .navbar-toggle { + display: block; + } + .navbar-collapse { + border-top: 1px solid transparent; + box-shadow: inset 0 1px 0 rgba(255,255,255,0.1); + } + .navbar-collapse.collapse { + display: none!important; + } + .navbar-nav { + float: none!important; + margin: 7.5px -15px; + } + .navbar-nav>li { + float: none; + } + .navbar-nav>li>a { + padding-top: 10px; + padding-bottom: 10px; + } + .navbar-text { + float: none; + margin: 15px 0; + } + /* since 3.1.0 */ + .navbar-collapse.collapse.in { + display: block!important; + } + .collapsing { + overflow: hidden!important; + } +} + @media (min-width: 768px) { .welcome-pane .panel-body { min-height:320px; @@ -495,12 +534,28 @@ html.has-log .log-graph { display:block; } -.playback-rate-control { - width: 100px; - margin-right: 13px; +html.has-video .video-top-controls, +html.has-log .video-top-controls { + top:50px; + position:fixed; + z-index:10; + background-color:white; + padding-bottom:10px; + width: 100%; + min-width: 1390px; +} + +html.has-video .log-graph, +html.has-log .log-graph, +html.has-log .log-graph-config, +html.has-log .log-seek-bar, +html.has-log:not(.has-table-overlay) .log-field-values { + position:relative; + top:60px; } -.graph-zoom-control { +.playback-rate-control, +.graph-zoom-control { width: 100px; margin-right: 13px; } @@ -563,25 +618,48 @@ progress { color: #EAEAEA; } -img.navbar-brand { - height: 35px; - padding: 0px; - display:none; +.navbar { + margin-bottom:5px; +} + +.navbar-logo { + position: absolute; + display:block; + left: -40px; +} + +html.isCF .navbar-logo { + left: 16px; +} + +.navbar-logo img { + position:relative; + height: 35px; + width: 210px; + padding: 0px; + display:none; } html.isCF img.isCF, html.isBF img.isBF { display: block; } -a.navbar-brand { - padding: 15px; +.navbar-logo a { + padding: 0px; + position: absolute; + top: 44%; + left: 68%; + width: 100%; } -.navbar { - margin-bottom:5px; +.navbar-logo span { + padding-left: 0px; + position: relative; + left: -150px; + top: 20px; + color: antiquewhite; } - .navbar-static-top { position: fixed; width: 100%; diff --git a/css/user_settings_dialog.css b/css/user_settings_dialog.css index 9062a7c7..a0f70b1f 100644 --- a/css/user_settings_dialog.css +++ b/css/user_settings_dialog.css @@ -1,9 +1,15 @@ -.user-settings-dialog .custom_mixes_group img { + +.user-settings-dialog .modal-dialog { + width:75%; + min-width:954px; +} + +.user-settings-dialog .custom-mixes-group img { width: 125px; max-height: 125px; } -.user-settings-dialog .stick_mode_group img { +.user-settings-dialog .stick-mode-group img { width: 200px; max-height: 125px; } @@ -20,29 +26,65 @@ .user-settings-dialog label.option { width: 100%; + margin-bottom: 5px; + position: relative; +} + +.user-settings-dialog span { + /* display: block; */ + margin-left: 10px; + position: absolute; + left: 125px; } .user-settings-dialog label + input[type=radio] { - margin-left: 6px; - margin-bottom:5px + margin-left: 6px; + margin-right: 10px; + margin-bottom: 6px; } .user-settings-dialog input[type=radio] { margin-left: 85px; - margin-bottom:5px + margin-bottom: 5px; + margin-right: 10px; } .user-settings-dialog label { width: 75px; margin-bottom:0px; + padding-top: 0px; +} +.user-settings-dialog table { + margin-top: 10px; } +.user-settings-dialog td.position label { + width: 41px; + font-style:oblique; + margin-left: 18px; + padding-top: 0px; +} -.user-settings-dialog p { +.user-settings-dialog input[type=number] + span { + position: static; + display: inline; +} + + +.user-settings-dialog p, .user-settings-dialog span + { font-style: normal; font-family: 'open_sansregular', Arial; line-height: 19px; color: #7d7d7d; font-size: 11px; + display: inline; + margin-left: 2px; } + +/* Normal Track Override positioning*/ +.user-settings-dialog input[type="checkbox"].ios-switch + div { + position: absolute; + left: 50px; +} \ No newline at end of file diff --git a/index.html b/index.html index eb06c8ea..acf820cb 100755 --- a/index.html +++ b/index.html @@ -25,17 +25,24 @@ - - - Blackbox Explorer +
- + @@ -143,13 +150,9 @@