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

contenteditable divs should look like textareas 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2017-10-17 23:09:18 +02:00
parent d1afbedc5f
commit df0e72d8d9
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/css/guest.css
View File

@ -152,7 +152,7 @@ form #datadirField legend {
applied to the button instead. */ applied to the button instead. */
} }
input, textarea, select, button { input, textarea, select, button, div[contenteditable=true] {
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
} }
input { input {
@ -662,16 +662,16 @@ p.info {
margin: -9px 0 0 -9px; margin: -9px 0 0 -9px;
} }
/* Css replaced elements don't have ::after nor ::before */ /* Css replaced elements don't have ::after nor ::before */
img.icon-loading, object.icon-loading, video.icon-loading, button.icon-loading, textarea.icon-loading, input.icon-loading, select.icon-loading { img.icon-loading, object.icon-loading, video.icon-loading, button.icon-loading, textarea.icon-loading, input.icon-loading, select.icon-loading, div[contenteditable=true].icon-loading {
background-image: url('../img/loading.gif'); background-image: url('../img/loading.gif');
} }
img.icon-loading-dark, object.icon-loading-dark, video.icon-loading-dark, button.icon-loading-dark, textarea.icon-loading-dark, input.icon-loading-dark, select.icon-loading-dark { img.icon-loading-dark, object.icon-loading-dark, video.icon-loading-dark, button.icon-loading-dark, textarea.icon-loading-dark, input.icon-loading-dark, select.icon-loading-dark, div[contenteditable=true].icon-loading-dark {
background-image: url('../img/loading-dark.gif'); background-image: url('../img/loading-dark.gif');
} }
img.icon-loading-small, object.icon-loading-small, video.icon-loading-small, button.icon-loading-small, textarea.icon-loading-small, input.icon-loading-small, select.icon-loading-small { img.icon-loading-small, object.icon-loading-small, video.icon-loading-small, button.icon-loading-small, textarea.icon-loading-small, input.icon-loading-small, select.icon-loading-small, div[contenteditable=true].icon-loading-small {
background-image: url('../img/loading-small.gif'); background-image: url('../img/loading-small.gif');
} }
img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-small-dark, button.icon-loading-small-dark, textarea.icon-loading-small-dark, input.icon-loading-small-dark, select.icon-loading-small-dark { img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-small-dark, button.icon-loading-small-dark, textarea.icon-loading-small-dark, input.icon-loading-small-dark, select.icon-loading-small-dark, div[contenteditable=true].icon-loading-small-dark {
background-image: url('../img/loading-small-dark.gif'); background-image: url('../img/loading-small-dark.gif');
} }
@-webkit-keyframes rotate { @-webkit-keyframes rotate {

2
core/css/icons.scss
View File

@ -61,7 +61,7 @@
} }
/* Css replaced elements don't have ::after nor ::before */ /* Css replaced elements don't have ::after nor ::before */
img, object, video, button, textarea, input, select { img, object, video, button, textarea, input, select, div[contenteditable=true] {
.icon-loading { .icon-loading {
background-image: url('../img/loading.gif'); background-image: url('../img/loading.gif');
} }

8
core/css/inputs.scss
View File

@ -13,7 +13,7 @@
*/ */
/* Specifically override browser styles */ /* Specifically override browser styles */
input, textarea, select, button { input, textarea, select, button, div[contenteditable=true] {
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
} }
.select2-container-multi .select2-choices .select2-search-field input, .select2-search input, .ui-widget { .select2-container-multi .select2-choices .select2-search-field input, .select2-search input, .ui-widget {
@ -24,7 +24,8 @@ input, textarea, select, button {
select, select,
button, button,
input, input,
textarea { textarea,
div[contenteditable=true] {
width: 130px; width: 130px;
min-height: 32px; min-height: 32px;
box-sizing: border-box; box-sizing: border-box;
@ -35,6 +36,7 @@ select,
button, .button, button, .button,
input:not([type='range']), input:not([type='range']),
textarea, textarea,
div[contenteditable=true],
.pager li a { .pager li a {
margin: 3px 3px 3px 0; margin: 3px 3px 3px 0;
padding: 7px 6px; padding: 7px 6px;
@ -154,7 +156,7 @@ button, .button {
} }
} }
textarea { textarea, div[contenteditable=true] {
color: nc-lighten($color-main-text, 33%); color: nc-lighten($color-main-text, 33%);
cursor: text; cursor: text;
font-family: inherit; font-family: inherit;