Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
coopwire-hypothesis
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
孙灵跃 Leon Sun
coopwire-hypothesis
Commits
67cf8a10
Unverified
Commit
67cf8a10
authored
Jan 02, 2020
by
Robert Knight
Committed by
GitHub
Jan 02, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1605 from hypothesis/tag-editor-touch-input
Use mobile-friendly font size for all input fields
parents
e481878a
27ee5e90
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
39 deletions
+31
-39
markdown-editor.js
src/sidebar/components/markdown-editor.js
+1
-1
forms.scss
src/styles/forms.scss
+0
-11
forms.scss
src/styles/mixins/forms.scss
+15
-7
markdown-editor.scss
src/styles/sidebar/components/markdown-editor.scss
+9
-4
search-input.scss
src/styles/sidebar/components/search-input.scss
+6
-13
tag-editor.scss
src/styles/sidebar/components/tag-editor.scss
+0
-3
No files found.
src/sidebar/components/markdown-editor.js
View file @
67cf8a10
...
...
@@ -283,7 +283,7 @@ function MarkdownEditor({ onEditText = () => {}, text = '' }) {
/
>
)
:
(
<
textarea
className
=
"markdown-editor__input
form-input form-textarea
"
className
=
"markdown-editor__input"
ref
=
{
input
}
onClick
=
{
e
=>
e
.
stopPropagation
()}
onKeydown
=
{
handleKeyDown
}
...
...
src/styles/forms.scss
View file @
67cf8a10
...
...
@@ -5,15 +5,4 @@
@include
forms
.
form-input
;
width
:
100%
;
display
:
block
;
&
:focus
,
&
.js-focus
{
@include
forms
.
form-input-focus
;
}
}
.form-textarea
{
min-height
:
8em
;
max-width
:
100%
;
resize
:
vertical
;
}
src/styles/mixins/forms.scss
View file @
67cf8a10
...
...
@@ -28,6 +28,16 @@
0px
0px
5px
var
.
$color-focus-shadow
;
}
@mixin
form-input-focus
{
outline
:
none
;
background-color
:
var
.
$white
;
@include
focus-outline
;
@include
placeholder
{
color
:
var
.
$grey-5
;
}
}
@mixin
form-input
{
@include
var
.
font-normal
;
border
:
1px
solid
var
.
$grey-3
;
...
...
@@ -36,15 +46,13 @@
font-weight
:
normal
;
color
:
var
.
$grey-5
;
background-color
:
var
.
$grey-0
;
}
@mixin
form-input-
focus
{
outline
:
none
;
background-color
:
var
.
$white
;
&
:
focus
{
@include
form-input-focus
;
}
@include
focus-outline
;
@include
placeholder
{
color
:
var
.
$grey-5
;
@media
(
pointer
:
coarse
)
{
font-size
:
var
.
$touch-input-font-size
;
}
}
...
...
src/styles/sidebar/components/markdown-editor.scss
View file @
67cf8a10
@use
"../../mixins/forms"
;
@use
"../../variables"
as
var
;
$toolbar-border
:
0
.1em
solid
var
.
$grey-3
;
...
...
@@ -62,11 +63,15 @@ $toolbar-border: 0.1em solid var.$grey-3;
margin-bottom
:
2px
;
// Tweak to align help icon better with adjacent buttons
}
@media
(
pointer
:
coarse
)
{
.markdown-editor__input
{
font-size
:
var
.
$touch-input-font-size
;
}
.markdown-editor__input
{
@include
forms
.
form-input
;
min-height
:
8em
;
resize
:
vertical
;
width
:
100%
;
}
@media
(
pointer
:
coarse
)
{
.markdown-editor__toolbar
{
// Remove the padding to avoid the toolbar taking up too much space as we
// make the buttons larger.
...
...
src/styles/sidebar/components/search-input.scss
View file @
67cf8a10
@use
"../../mixins/fo
cu
s"
;
@use
"../../mixins/fo
rm
s"
;
@use
"../../variables"
as
var
;
.search-input__form
{
...
...
@@ -14,17 +14,16 @@
}
.search-input__input
{
@include
fo
cus
.
outline-on-keyboard-focus
;
@include
fo
rms
.
form-input
;
flex-grow
:
1
;
order
:
1
;
color
:
var
.
$text-color
;
// Disable default browser styling for the input.
&
:not
(
:focus
)
{
border
:
none
;
padding
:
0px
;
width
:
100%
;
}
// The search box expands when focused, via a change in the
// `max-width` property.
...
...
@@ -45,9 +44,3 @@
padding-left
:
6px
;
}
}
@media
(
pointer
:
coarse
)
{
.search-input__input
{
font-size
:
var
.
$touch-input-font-size
;
}
}
src/styles/sidebar/components/tag-editor.scss
View file @
67cf8a10
...
...
@@ -6,9 +6,6 @@
&
__input
{
@include
forms
.
form-input
;
width
:
100%
;
&
:focus
{
@include
forms
.
form-input-focus
;
}
}
&
__tag-list
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment