diff --git a/bemani/frontend/static/components/slider.react.js b/bemani/frontend/static/components/slider.react.js index 053901d..84e7be7 100644 --- a/bemani/frontend/static/components/slider.react.js +++ b/bemani/frontend/static/components/slider.react.js @@ -4,7 +4,7 @@ var Slider = React.createClass({ render: function() { return (
- ); - }, -}); diff --git a/bemani/frontend/static/controllers/arcade/arcade.react.js b/bemani/frontend/static/controllers/arcade/arcade.react.js index 7c4b747..af54b28 100644 --- a/bemani/frontend/static/controllers/arcade/arcade.react.js +++ b/bemani/frontend/static/controllers/arcade/arcade.react.js @@ -478,29 +478,62 @@ var arcade_management = React.createClass({ } {this.renderPIN()} {this.renderRegion()} - - { this.state.paseli_enabled ? 'yes' : 'no' } - - { this.state.paseli_enabled_saving ? - : - null - } + + PASELI Enabled + { this.state.paseli_enabled_saving ? + : + null + } + + }> + - - { this.state.paseli_infinite ? 'yes' : 'no' } - - { this.state.paseli_infinite_saving ? - : - null - } + + PASELI Infinite + { this.state.paseli_infinite_saving ? + : + null + } + + }> + - - { this.state.mask_services_url ? 'yes' : 'no' } - - { this.state.mask_services_url_saving ? - : - null - } + + Mask Web Address + { this.state.mask_services_url_saving ? + : + null + } + + }> +
diff --git a/bemani/frontend/static/controllers/ddr/settings.react.js b/bemani/frontend/static/controllers/ddr/settings.react.js index e28b6cb..3cf86ab 100644 --- a/bemani/frontend/static/controllers/ddr/settings.react.js +++ b/bemani/frontend/static/controllers/ddr/settings.react.js @@ -321,21 +321,44 @@ var settings_view = React.createClass({

User Profile

{this.renderName(player)} - - { this.state.player[this.state.version].early_late ? 'on' : 'off' } - - { this.state.saving_early_late ? - : - null - } + + Fast/Slow Display + { this.state.saving_early_late ? + : + null + } + + }> + - - { this.state.player[this.state.version].background_combo ? 'background' : 'foreground' } - - { this.state.saving_background_combo ? - : - null - } + + Combo Position + { this.state.saving_background_combo ? + : + null + } + + }> + + { + this.state.player[this.state.version].background_combo ? 'background' : 'foreground' + } {this.renderWeight(player)}
diff --git a/bemani/frontend/static/themes/dark/section.css b/bemani/frontend/static/themes/dark/section.css index 853aaa5..4c890ae 100644 --- a/bemani/frontend/static/themes/dark/section.css +++ b/bemani/frontend/static/themes/dark/section.css @@ -178,3 +178,19 @@ span.filter:not(:last-child) { padding-right: 20px; } +.slider.padded { + margin-right: 5px; + margin-top: 2px; + margin-bottom: 2px; +} + +span.slider-label { + position: relative; + padding-right: 20px; + top: -4px; +} + +.slider.fix .label { + margin-top: 1px; + margin-bottom: -1px; +} diff --git a/bemani/frontend/static/themes/dark/site.css b/bemani/frontend/static/themes/dark/site.css index 06a155d..c9f0cf9 100644 --- a/bemani/frontend/static/themes/dark/site.css +++ b/bemani/frontend/static/themes/dark/site.css @@ -125,6 +125,7 @@ ul.navigation { -moz-user-select: none; -ms-user-select: none; user-select: none; + z-index: 1; } ul.navigation li { @@ -280,8 +281,8 @@ div.slider { } div.slider.on { - background: #2196F3; - border: 1px solid #0a6fc2; + background: #6eb9f7; + border: 1px solid #3da2f5; } div.slider.off { diff --git a/bemani/frontend/static/themes/default/section.css b/bemani/frontend/static/themes/default/section.css index 853aaa5..4c890ae 100644 --- a/bemani/frontend/static/themes/default/section.css +++ b/bemani/frontend/static/themes/default/section.css @@ -178,3 +178,19 @@ span.filter:not(:last-child) { padding-right: 20px; } +.slider.padded { + margin-right: 5px; + margin-top: 2px; + margin-bottom: 2px; +} + +span.slider-label { + position: relative; + padding-right: 20px; + top: -4px; +} + +.slider.fix .label { + margin-top: 1px; + margin-bottom: -1px; +} diff --git a/bemani/frontend/static/themes/default/site.css b/bemani/frontend/static/themes/default/site.css index 8ad34f3..f2efd85 100644 --- a/bemani/frontend/static/themes/default/site.css +++ b/bemani/frontend/static/themes/default/site.css @@ -119,6 +119,7 @@ ul.navigation { -moz-user-select: none; -ms-user-select: none; user-select: none; + z-index: 1; } ul.navigation li { @@ -274,8 +275,8 @@ div.slider { } div.slider.on { - background: #2196F3; - border: 1px solid #0a6fc2; + background: #6eb9f7; + border: 1px solid #3da2f5; } div.slider.off {