Commit 3cb5b868 authored by Lyza Danger Gardner's avatar Lyza Danger Gardner

Consolidate font sizes and line heights in annotator as SASS variables

parent 4728b4cf
...@@ -109,9 +109,9 @@ $adder-transition-duration: 80ms; ...@@ -109,9 +109,9 @@ $adder-transition-duration: 80ms;
align-items: center; align-items: center;
border: none; border: none;
cursor: pointer; cursor: pointer;
font-size: 12px; font-size: var.$annotator-adder-font-size;
font-family: sans-serif; font-family: sans-serif;
line-height: 1em; line-height: var.$annotator-adder-line-height;
padding: 10px; padding: 10px;
padding-bottom: 7px; padding-bottom: 7px;
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
@use './bucket-bar'; @use './bucket-bar';
@use './highlights'; @use './highlights';
$annotator-font-size: 14px;
$sidebar-collapse-transition-time: 150ms; $sidebar-collapse-transition-time: 150ms;
// Sidebar // Sidebar
...@@ -35,8 +34,8 @@ $sidebar-collapse-transition-time: 150ms; ...@@ -35,8 +34,8 @@ $sidebar-collapse-transition-time: 150ms;
user-select: none; user-select: none;
direction: ltr; direction: ltr;
background: none; background: none;
font-size: $annotator-font-size; font-size: var.$annotator-base-font-size;
line-height: var.$base-line-height; line-height: var.$annotator-base-line-height;
height: 100%; height: 100%;
position: fixed; position: fixed;
top: 0; top: 0;
......
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
color: var.$color-text-light; color: var.$color-text-light;
font-weight: bold; font-weight: bold;
font-family: var.$sans-font-family; font-family: var.$sans-font-family;
font-size: 10px; font-size: var.$annotator-bucket-bar-font-size;
line-height: 14px; line-height: var.$annotator-bucket-bar-line-height;
margin: 0 auto; margin: 0 auto;
} }
......
...@@ -84,6 +84,18 @@ $normal-line-height: 17px; ...@@ -84,6 +84,18 @@ $normal-line-height: 17px;
$small-font-size: 11px; $small-font-size: 11px;
$small-line-height: 12px; $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 // Minimum font size for <input> fields on iOS. If the font size is smaller than
// this, iOS will zoom into the field when focused. // this, iOS will zoom into the field when focused.
$touch-input-font-size: 16px; $touch-input-font-size: 16px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment