1 files changed, 42 insertions, 39 deletions

diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 26461d9d7a7..b7c573c2a49 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -44,11 +44,10 @@ div[contenteditable=false] {
 
 /* Default global values */
 div.select2-drop .select2-search input, // TODO: REMOVE WHEN DROPPING SELECT2
-select,
+input[type='submit'],
+input[type='button'],
+input[type='reset'],
 button:not(.button-vue), .button,
-input:not([type='range']),
-textarea,
-div[contenteditable=true],
 .pager li a {
 	margin: 3px 3px 3px 0;
 	padding: 7px 14px;
@@ -180,7 +179,8 @@ button:not(.button-vue), .button,
 input[type='button'],
 input[type='submit'],
 input[type='reset'] {
-	padding: 6px 11px;
+	padding: 8px 14px;
+	font-size: var(--default-font-size);
 	width: auto;
 	min-height: $default-height;
 	cursor: pointer;
@@ -191,6 +191,43 @@ input[type='reset'] {
 		cursor: default;
 	}
 }
+
+input:not([type='range']):not(.input-field__input):not([type='submit']):not([type='button']):not([type='reset']):not(.multiselect__input),
+select,
+div[contenteditable=true],
+textarea {
+	margin: 3px 3px 3px 0;
+	padding: 0 12px;
+	font-size: var(--default-font-size);
+	background-color: var(--color-main-background);
+	color: var(--color-main-text);
+	border: 2px solid var(--color-border-dark);
+	height: 36px;
+	outline: none;
+	border-radius: var(--border-radius-large);
+	text-overflow: ellipsis;
+	cursor: pointer;
+	&:not(:disabled):hover, &:not(:disabled):focus, &:not(:disabled):active {
+		border-color: var(--color-primary-element);
+	}
+	&:not(:disabled):focus {
+		cursor: text;
+	}
+}
+
+textarea, div[contenteditable=true] {
+	padding: 12px;
+	height: auto;
+}
+
+/* Override the ugly select arrow */
+select {
+	background: var(--icon-triangle-s-dark) no-repeat right 8px center;
+	appearance: none;
+	background-color: var(--color-main-background);
+	padding-right: 28px !important;
+}
+
 select,
 button:not(.button-vue), .button {
 	* {
@@ -235,40 +272,6 @@ button:not(.button-vue):not(.action-button), .button {
 	}
 }
 
-textarea, div[contenteditable=true] {
-	color: var(--color-main-text);
-	cursor: text;
-	font-family: inherit;
-	height: auto;
-	&:not(:disabled) {
-		&:active,
-		&:hover,
-		&:focus {
-			border-color: var(--color-background-darker) !important;
-			background-color: var(--color-main-background) !important;
-		}
-	}
-}
-
-div[contenteditable=false] {
-	color: var(--color-text-lighter);
-	font-family: inherit;
-	height: auto;
-}
-
-/* Override the ugly select arrow */
-select {
-	-webkit-appearance: none;
-	-moz-appearance: none;
-	appearance: none;
-	background: var(--icon-triangle-s-dark) no-repeat right 4px center;
-	background-color: inherit;
-	outline: 0;
-	padding-right: 24px !important;
-	// force height for inline elements like inputs (not textarea, contenteditable...)
-	height: $default-height;
-}
-
 /* Confirm inputs */
 input {
 	&[type='text'],