Commit 3356be78 authored by Randall Leeds's avatar Randall Leeds

Clean up font sizes and margins in inject

Fixes #831.

Since I can't think of a way to reset specifically to the browser
default font size we'll have to just set the font size explicitly.
parent 1e601db7
...@@ -90,14 +90,12 @@ $baseFontSize: 14px; ...@@ -90,14 +90,12 @@ $baseFontSize: 14px;
.heatmap-pointer { .heatmap-pointer {
@include transition-property(left); @include transition-property(left);
@include transition-duration(.2s); @include transition-duration(.2s);
margin-top: -1em; // TODO: Less janking v-align
// color: rgb(238, 238, 238);
color: #666; color: #666;
left: 0; left: 0;
position: absolute; position: absolute;
height: 20.1px; height: 20px;
width: 40.1px; width: 40px;
vertical-align: middle; margin-top: -10px;
-webkit-tap-highlight-color: rgba(255, 255, 255, 0); -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
...@@ -115,7 +113,7 @@ $baseFontSize: 14px; ...@@ -115,7 +113,7 @@ $baseFontSize: 14px;
background: none; background: none;
font-weight: bold; font-weight: bold;
font-family: $sansFontFamily; font-family: $sansFontFamily;
font-size: 13.1px; font-size: 13px;
line-height: 17.5px; line-height: 17.5px;
left: 5px; left: 5px;
right: 2px; right: 2px;
...@@ -226,8 +224,8 @@ $baseFontSize: 14px; ...@@ -226,8 +224,8 @@ $baseFontSize: 14px;
@include reset-box-model; @include reset-box-model;
@include user-select(none); @include user-select(none);
@extend .noise; @extend .noise;
font-size: $baseFontSize / 16px * 1em; font-size: $baseFontSize;
line-height: $baseLineHeight / 16px * 1em; line-height: $baseLineHeight;
height: 100%; height: 100%;
position: fixed; position: fixed;
top: 0; top: 0;
...@@ -261,8 +259,6 @@ $baseFontSize: 14px; ...@@ -261,8 +259,6 @@ $baseFontSize: 14px;
//CONTROLBAR STUFF//////////////////////////////// //CONTROLBAR STUFF////////////////////////////////
.annotator-toolbar { .annotator-toolbar {
@include single-transition(height, .25s, ease, .25s); @include single-transition(height, .25s, ease, .25s);
font-size: $baseFontSize;
line-height: $baseLineHeight;
position: absolute; position: absolute;
overflow: hidden; overflow: hidden;
height: 200px; height: 200px;
......
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