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
366bc92f
Commit
366bc92f
authored
Feb 25, 2022
by
Lyza Danger Gardner
Committed by
Lyza Gardner
Feb 28, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Isolate annotator font sizes in TW configuration
parent
e5192bff
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
Toolbar.js
src/annotator/components/Toolbar.js
+2
-2
tailwind.config.mjs
tailwind.config.mjs
+6
-4
No files found.
src/annotator/components/Toolbar.js
View file @
366bc92f
...
...
@@ -19,7 +19,7 @@ function ToolbarButton({ ...buttonProps }) {
className
=
{
classnames
(
'w-[30px] h-[30px]'
,
// These buttons have precise dimensions
'flex items-center justify-center'
,
'border rounded bg-white text-grey-6 hover:text-grey-9 text-
xl
'
,
'border rounded bg-white text-grey-6 hover:text-grey-9 text-
annotator-lg
'
,
'shadow transition-colors'
)}
icon
=
{
icon
}
...
...
@@ -86,7 +86,7 @@ export default function Toolbar({
className
=
{
classnames
(
'w-[27px] h-[27px] mt-[140px] ml-[6px]'
,
'flex items-center justify-center bg-white border'
,
'text-grey-6 hover:text-grey-9 text-
xl
transition-colors'
,
'text-grey-6 hover:text-grey-9 text-
annotator-lg
transition-colors'
,
// Turn off right border to blend with sidebar
'border-r-0'
,
// A more intense shadow than other ToolbarButtons, to match that
...
...
tailwind.config.mjs
View file @
366bc92f
...
...
@@ -45,13 +45,15 @@ export default {
fontSize
:
{
tiny
:
[
'10px'
],
sm
:
[
'11px'
,
'1.4'
],
'annotator-sm'
:
[
'12px'
],
base
:
[
'13px'
,
'1.4'
],
lg
:
[
'14px'
],
xl
:
[
'16px'
],
annotator
:
{
sm
:
[
'12px'
],
},
// Keep separate font settings for the annotator; these may need to
// remain as pixels when sidebar converts to rems or otherwise be
// independent of sidebar font sizes
'annotator-sm'
:
[
'12px'
],
'annotator-lg'
:
[
'16px'
],
'annotator-xl'
:
[
'18px'
],
},
keyframes
:
{
adderPopDown
:
{
...
...
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