diff --git a/sass/css/_shop.scss b/sass/css/_shop.scss index 3e88ff8..cfc8a83 100644 --- a/sass/css/_shop.scss +++ b/sass/css/_shop.scss @@ -468,7 +468,7 @@ button { top: 0; width: 100%; min-height: 70px; - max-height: 350px; + max-height: 320px; overflow-y: scroll; position: absolute; display: flex; @@ -486,7 +486,22 @@ button { } div { - margin: 0 0.2rem; + margin: 0.1rem 0.2rem; + font-size: 0.75rem; + + input { + padding: 0; + font-size: 0.75rem; + line-height: 1.1; + } + + label { + margin-bottom: 0.1rem; + } + } + + .form-check { + min-height: 1rem; } } diff --git a/static/js/shop_components.jsx b/static/js/shop_components.jsx index dca4728..d1aeeb8 100644 --- a/static/js/shop_components.jsx +++ b/static/js/shop_components.jsx @@ -36,7 +36,7 @@ class Radio extends Component { let key = this.props.id + this.props.outvar; return (
- {this.props.title} +
{this.props.title}
{this.props.variants.map((variant, _) => (
-
); @@ -186,7 +186,7 @@ class SwitchLine extends Component { handleCheck() { // Update the state object with the new value for outvar let new_state = { - text: !this.state.checked ? this.state.text : "", + ...this.state, checked: !this.state.checked } this.setState(new_state); @@ -211,7 +211,7 @@ class SwitchLine extends Component { {this.props.title}
- ); diff --git a/static/js/shop_data.js b/static/js/shop_data.js index 6da3d7b..cef0628 100644 --- a/static/js/shop_data.js +++ b/static/js/shop_data.js @@ -79,14 +79,7 @@ const shop_data = { {type: "Line", args: {title: "IPv4", outvar: "ipv4", fallback: "192.168.1.75/24"}}, {type: "SwitchLine", args: {title: "IPv6", outvar: "ipv6"}}, {type: "SwitchLine", args: {title: "MAC", outvar: "mac"}}, - {type: "Switch", args: {title: "Ext CLK", outvar: "ext_clk"}}, - { - "if": [ - {"===": [{"var": "ext_clk"}, true]}, - {type: "Line", args: {title: "Frequency", outvar: "ext_clk_freq", fallback: "125 MHz"}}, - null - ] - } + {type: "SwitchLine", args: {title: "Ext CLK", outvar: "ext_clk", fallback: {text: "125 MHz", checked: false}}}, ], null ]