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
3cb5b868
Commit
3cb5b868
authored
Jun 09, 2020
by
Lyza Danger Gardner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Consolidate font sizes and line heights in annotator as SASS variables
parent
4728b4cf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
7 deletions
+18
-7
adder.scss
src/styles/annotator/adder.scss
+2
-2
annotator.scss
src/styles/annotator/annotator.scss
+2
-3
bucket-bar.scss
src/styles/annotator/bucket-bar.scss
+2
-2
variables.scss
src/styles/variables.scss
+12
-0
No files found.
src/styles/annotator/adder.scss
View file @
3cb5b868
...
...
@@ -109,9 +109,9 @@ $adder-transition-duration: 80ms;
align-items
:
center
;
border
:
none
;
cursor
:
pointer
;
font-size
:
12px
;
font-size
:
var
.
$annotator-adder-font-size
;
font-family
:
sans-serif
;
line-height
:
1em
;
line-height
:
var
.
$annotator-adder-line-height
;
padding
:
10px
;
padding-bottom
:
7px
;
...
...
src/styles/annotator/annotator.scss
View file @
3cb5b868
...
...
@@ -12,7 +12,6 @@
@use
'./bucket-bar'
;
@use
'./highlights'
;
$annotator-font-size
:
14px
;
$sidebar-collapse-transition-time
:
150ms
;
// Sidebar
...
...
@@ -35,8 +34,8 @@ $sidebar-collapse-transition-time: 150ms;
user-select
:
none
;
direction
:
ltr
;
background
:
none
;
font-size
:
$annotator
-font-size
;
line-height
:
var
.
$base-line-height
;
font-size
:
var
.
$annotator-base
-font-size
;
line-height
:
var
.
$
annotator-
base-line-height
;
height
:
100%
;
position
:
fixed
;
top
:
0
;
...
...
src/styles/annotator/bucket-bar.scss
View file @
3cb5b868
...
...
@@ -37,8 +37,8 @@
color
:
var
.
$color-text-light
;
font-weight
:
bold
;
font-family
:
var
.
$sans-font-family
;
font-size
:
10px
;
line-height
:
14px
;
font-size
:
var
.
$annotator-bucket-bar-font-size
;
line-height
:
var
.
$annotator-bucket-bar-line-height
;
margin
:
0
auto
;
}
...
...
src/styles/variables.scss
View file @
3cb5b868
...
...
@@ -84,6 +84,18 @@ $normal-line-height: 17px;
$small-font-size
:
11px
;
$small-line-height
:
12px
;
// Transitional Typography (Temporary)
// -----------------------------------
$annotator-base-font-size
:
14px
;
$annotator-base-line-height
:
20px
;
$annotator-adder-font-size
:
12px
;
$annotator-adder-line-height
:
1em
;
$annotator-bucket-bar-font-size
:
10px
;
$annotator-bucket-bar-line-height
:
14px
;
// Minimum font size for <input> fields on iOS. If the font size is smaller than
// this, iOS will zoom into the field when focused.
$touch-input-font-size
:
16px
;
...
...
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