diff --git a/server/static/css/simulation.css b/server/static/css/simulation.css index 45babb5..8f4041c 100644 --- a/server/static/css/simulation.css +++ b/server/static/css/simulation.css @@ -199,7 +199,7 @@ body { } #simulation_adjust_main table { - width: 90%; + width: 100%; height: 100%; color: white; } @@ -213,7 +213,7 @@ body { } #simulation_adjust_main th:first-child { - width: 90%; + width: 80%; } .part { @@ -245,10 +245,41 @@ body { width: 60%; background-color: gray; position: relative; - left: 42px; + left: 47px; top: 34px; } +.adjust_part { + width: 100%; + overflow: hidden; + position: relative; + left: 0; top: 0; +} + +.adjust_part output { + bottom: 72%; + width: 70px; +} + +.adjust_part>* { + float: left; + margin: 0; +} + +.left.arrow.icon, .right.arrow.icon { + display: block; + width: 15%; + margin: 3px 0 3px 0; +} + +.left.arrow.icon:hover, .right.arrow.icon:hover { + color: #D95C5C; +} + +.adjust_part>input { + width: 70%; +} + #Static_main { width: auto; height: 100%; @@ -362,7 +393,6 @@ body { output { position: absolute; - opacity: 0.7; background-image: -moz-linear-gradient(top, #444444, #999999); background-image: -o-linear-gradient(top, #444444, #999999); background-image: -webkit-gradient(linear, left top, left bottom, from(#444444), to(#999999)); @@ -370,12 +400,13 @@ output { height: 30px; text-align: center; color: white; - border-radius: 10px; + border-radius: 2px; display: none; bottom: 180%; left: 0; margin-left: -1%; z-index: 99999; + background:rgba(0, 0, 0, 0.2); } output:after { @@ -383,7 +414,7 @@ output:after { position: absolute; width: 0; height: 0; - border-top: 10px solid #999999; + border-top: 10px solid rgba(0, 0, 0, 0.2); border-left: 5px solid transparent; border-right: 5px solid transparent; top: 100%; diff --git a/server/static/js/input-range.js b/server/static/js/input-range.js index ec356fd..95b4c2f 100644 --- a/server/static/js/input-range.js +++ b/server/static/js/input-range.js @@ -6,6 +6,8 @@ $(ShowOutput = function() { newPoint = (el.val() - el.attr("min")) / (el.attr("max") - el.attr("min")); if ($(this).parent().prop('id') == 'static_adjust_input') { offset = 15.5; + } else if ($(this).prop('name') == 'RIPS') { + offset = -2; } else { offset = 8; } @@ -18,7 +20,11 @@ $(ShowOutput = function() { display: 'inline-block', left: newPlace, marginLeft: offset + "%" - }) - .text(el.val()); + }); + if ($(this).prop('name') == 'RIPS') { + el.next("output").text(alphaList[parseInt(el.val())]); + } else { + el.next("output").text(el.val()); + } }); }); diff --git a/server/static/js/simulation-ctrl.js b/server/static/js/simulation-ctrl.js index b0ebc7a..4733268 100644 --- a/server/static/js/simulation-ctrl.js +++ b/server/static/js/simulation-ctrl.js @@ -242,8 +242,13 @@ function SetCircuits () { var newLine = $( '