Skip to content

Commit a5c44da

Browse files
authored
Merge pull request #901 from nextcloud/bugfix/819/checkbox-input-rule
2 parents 12f4880 + 4c6b17b commit a5c44da

35 files changed

+122
-104
lines changed

css/prosemirror.scss

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,17 @@ div.ProseMirror {
3030
display: flex;
3131
align-items: start;
3232
// Left-align with list item text
33-
margin-left: -24px;
33+
margin-left: -23px;
3434

3535
input[type=checkbox] {
3636
display: none;
3737
}
3838
&:before {
3939
content: '';
40-
display: inline-block;
41-
height: 14px;
42-
width: 14px;
4340
vertical-align: middle;
44-
border-radius: 50%;
45-
margin: 2px 6px 3px 3px;
41+
margin: 3px 6px 3px 2px;
4642
border: 1px solid var(--color-text-maxcontrast);
47-
content: "";
4843
position: relative;
49-
width: 44px;
50-
height: 44px;
5144
display: block;
5245
border-radius: var(--border-radius);
5346
height: 14px;
@@ -65,40 +58,10 @@ div.ProseMirror {
6558
display: block;
6659
flex-grow: 1;
6760
max-width: calc(100% - 28px);
68-
> *:first-child {
69-
margin-top: 0;
70-
}
7161
}
7262
}
7363

74-
li label.checkbox-label {
75-
width: 100%;
76-
display: flex;
77-
margin-top: 10px;
78-
margin-bottom: 1em;
79-
80-
&:before {
81-
position: relative;
82-
top: 2px;
83-
}
84-
div.checkbox-wrapper {
85-
margin-bottom: -1em;
86-
width: 100%;
87-
88-
& > p {
89-
margin-top: -1px;
90-
margin-bottom: 0;
91-
padding-bottom: 10px;
92-
}
93-
}
94-
}
95-
p:first-child,
96-
h1:first-child,
97-
h2:first-child,
98-
h3:first-child,
99-
h4:first-child,
100-
h5:first-child,
101-
h6:first-child {
64+
> *:first-child {
10265
margin-top: 10px;
10366
}
10467

@@ -193,6 +156,11 @@ div.ProseMirror {
193156

194157
li {
195158
position: relative;
159+
padding-left: 3px;
160+
161+
p {
162+
margin-bottom: 0.5em;
163+
}
196164
}
197165

198166
ul, ol {

js/editor-collab.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)