mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14468 from nextcloud/fix/inline-input-confirm-button 

Fix default input element height
This commit is contained in:
Roeland Jago Douma 2019-03-04 08:49:41 +01:00 committed by GitHub
parent c706009ced 2503520121
commit 35d5d57839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/css/fixes.scss
View File

@ -5,7 +5,3 @@
border: 0;
}
/* fix height of select boxes for OS X */
select {
height: 32px;
}

16
core/css/inputs.scss
View File

@ -20,6 +20,8 @@ input, textarea, select, button, div[contenteditable=true], div[contenteditable=
font-family: var(--font-face) !important;
}
$default-height: 34px;
/* Simple selector to allow easy overriding */
select,
button,
@ -28,7 +30,7 @@ textarea,
div[contenteditable=true],
div[contenteditable=false] {
width: 130px;
min-height: 32px;
min-height: $default-height;
box-sizing: border-box;
}
@ -38,7 +40,6 @@ div[contenteditable=false] {
* color-text-maxcontrast disabled state
*/
/* Default global values */
div.select2-drop .select2-search input, // TODO: REMOVE WHEN DROPPING SELECT2
select,
@ -138,6 +139,8 @@ input {
&:not([type='radio']):not([type='checkbox']):not([type='range']):not([type='submit']):not([type='button']):not([type='reset']):not([type='color']):not([type='file']):not([type='image']) {
-webkit-appearance: textfield;
-moz-appearance: textfield;
// force height for inline elements like inputs (not textarea, contenteditable...)
height: $default-height;
}
&[type='radio'],
&[type='checkbox'],
@ -172,7 +175,7 @@ input[type='submit'],
input[type='reset'] {
padding: 6px 12px;
width: auto;
min-height: 34px;
min-height: $default-height;
cursor: pointer;
box-sizing: border-box;
background-color: var(--color-background-dark);
@ -234,6 +237,8 @@ select {
background-color: inherit;
outline: 0;
padding-right: 24px !important;
// force height for inline elements like inputs (not textarea, contenteditable...)
height: $default-height;
}
/* Confirm inputs */
@ -249,7 +254,8 @@ input {
/* Avoid background under border */
background-color: var(--color-main-background) !important;
opacity: 1;
width: 34px;
height: $default-height;
width: $default-height;
padding: 7px 6px;
cursor: pointer;
margin-right: 0;
@ -684,7 +690,7 @@ div.select2-container {
cursor: pointer;
position: relative;
border-radius: var(--border-radius);
height: 34px;
height: $default-height;
/* tag wrapper */
.multiselect__tags-wrap {
align-items: center;

4
settings/css/settings.scss
View File

@ -1492,9 +1492,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}
}
.icon-confirm {
width: 32px;
height: 32px;
flex: 0 0 32px;
flex: 0 0 auto;
cursor: pointer;
&:not(:active) {
display: none;