diff --git a/client/src/styles/partials/generic/forms/dropdowns.scss b/client/src/styles/partials/generic/forms/dropdowns.scss index b346dec4..7bf7b2c1 100644 --- a/client/src/styles/partials/generic/forms/dropdowns.scss +++ b/client/src/styles/partials/generic/forms/dropdowns.scss @@ -1,11 +1,20 @@ +.bd-form-dropdown { + h3 + .bd-dropdown { + width: 180px; + margin-left: 15px; + } + + .bd-form-item-fullwidth & { + .bd-dropdown { + margin-top: 10px; + } + } +} + .bd-dropdown { position: relative; width: 100%; - h3 + & { - width: 180px; - } - .bd-dropdown-current { color: #f6f6f7; background: rgba(0,0,0,.1); diff --git a/client/src/styles/partials/generic/forms/radios.scss b/client/src/styles/partials/generic/forms/radios.scss index 5e0a8c68..eb600e68 100644 --- a/client/src/styles/partials/generic/forms/radios.scss +++ b/client/src/styles/partials/generic/forms/radios.scss @@ -1,14 +1,23 @@ .bd-form-radio { display: flex; - flex-direction: column; .bd-form-radio-details { flex: 1 1 auto; } - .bd-form-radio-group { - flex: 0 0 auto; - margin-top: 10px; + .bd-radio-group { + width: 180px; + margin-left: 15px; + } + + .bd-form-item-fullwidth & { + flex-direction: column; + + .bd-radio-group { + width: 100%; + margin-top: 10px; + margin-left: 0; + } } } diff --git a/client/src/styles/partials/generic/forms/sliders.scss b/client/src/styles/partials/generic/forms/sliders.scss index cb52c9fd..b11f1cc2 100644 --- a/client/src/styles/partials/generic/forms/sliders.scss +++ b/client/src/styles/partials/generic/forms/sliders.scss @@ -1,3 +1,20 @@ +.bd-form-slider { + h3 + .bd-slider { + margin-left: 15px; + } + + .bd-form-item-fullwidth & { + .bd-title { + flex-direction: column; + } + + h3 + .bd-slider { + margin-top: 15px; + margin-left: 0; + } + } +} + .bd-slider { min-height: 24px; min-width: 180px; diff --git a/client/src/styles/partials/generic/forms/text.scss b/client/src/styles/partials/generic/forms/text.scss index 3721680b..7709b624 100644 --- a/client/src/styles/partials/generic/forms/text.scss +++ b/client/src/styles/partials/generic/forms/text.scss @@ -2,12 +2,16 @@ .bd-form-numberinput { h3 { + .bd-textinput-wrapper, - + .bd-textinput-wrapper input[type="text"], - + .bd-textinput-wrapper input[type="number"] { + + .bd-number { width: 180px; } } + .bd-textinput-wrapper, + .bd-number { + margin-left: 15px; + } + input[type="text"], input[type="number"] { background: transparent; @@ -25,9 +29,27 @@ border-color: $colbdblue; } } + + .bd-form-item-fullwidth & { + .bd-title { + flex-direction: column; + } + + .bd-textinput-wrapper, + .bd-number { + width: 100%; + margin-top: 10px; + margin-left: 0; + } + + .bd-hint { + margin-top: 10px; + } + } } -.bd-textinput-wrapper { +.bd-textinput-wrapper, +.bd-number { width: 100%; } diff --git a/client/src/ui/components/bd/setting/Array.vue b/client/src/ui/components/bd/setting/Array.vue index ee533255..ec398de3 100644 --- a/client/src/ui/components/bd/setting/Array.vue +++ b/client/src/ui/components/bd/setting/Array.vue @@ -1,5 +1,5 @@ /** - * BetterDiscord Setting File Component + * BetterDiscord Setting Array Component * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks * All rights reserved. * https://betterdiscord.net diff --git a/client/src/ui/components/bd/setting/Dropdown.vue b/client/src/ui/components/bd/setting/Dropdown.vue index 1fd64ba2..034bee3a 100644 --- a/client/src/ui/components/bd/setting/Dropdown.vue +++ b/client/src/ui/components/bd/setting/Dropdown.vue @@ -12,47 +12,19 @@