diff --git a/public/app/features/dashboard/timepicker/timepicker.html b/public/app/features/dashboard/timepicker/timepicker.html index 10a1d6820a3..008f4a149ce 100644 --- a/public/app/features/dashboard/timepicker/timepicker.html +++ b/public/app/features/dashboard/timepicker/timepicker.html @@ -1,6 +1,6 @@
`s get reset. However, we also reset the
+// bottom margin to use `rem` units instead of `em`.
+p {
+ margin-top: 0;
+ margin-bottom: 1rem;
+}
+
+// Abbreviations and acronyms
+abbr[title],
+// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
+abbr[data-original-title] {
+ cursor: help;
+ border-bottom: 1px dotted $abbr-border-color;
+}
+
+address {
+ margin-bottom: 1rem;
+ font-style: normal;
+ line-height: inherit;
+}
+
+ol,
+ul,
+dl {
+ margin-top: 0;
+ margin-bottom: 1rem;
+}
+
+ol ol,
+ul ul,
+ol ul,
+ul ol {
+ margin-bottom: 0;
+}
+
+dt {
+ font-weight: $dt-font-weight;
+}
+
+dd {
+ margin-bottom: .5rem;
+ margin-left: 0; // Undo browser default
+}
+
+blockquote {
+ margin: 0 0 1rem;
+}
+
+
+//
+// Links
+//
+
+a {
+ color: $link-color;
+ text-decoration: $link-decoration;
+
+ @include hover-focus {
+ color: $link-hover-color;
+ text-decoration: $link-hover-decoration;
+ }
+
+ &:focus {
+ @include tab-focus();
+ }
+}
+
+
+//
+// Code
+//
+
+pre {
+ // Remove browser default top margin
+ margin-top: 0;
+ // Reset browser default of `1em` to use `rem`s
+ margin-bottom: 1rem;
+}
+
+
+//
+// Figures
+//
+
+figure {
+ // Normalize adds `margin` to `figure`s as browsers apply it inconsistently.
+ // We reset that to create a better flow in-page.
+ margin: 0 0 1rem;
+}
+
+
+//
+// Images
+//
+
+img {
+ // By default, ``s are `inline-block`. This assumes that, and vertically
+ // centers them. This won't apply should you reset them to `block` level.
+ vertical-align: middle;
+ // Note: `
`s are deliberately not made responsive by default.
+ // For the rationale behind this, see the comments on the `.img-fluid` class.
+}
+
+
+// iOS "clickable elements" fix for role="button"
+//
+// Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
+// for traditionally non-focusable elements with role="button"
+// see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
+
+[role="button"] {
+ cursor: pointer;
+}
+
+
+// Avoid 300ms click delay on touch devices that support the `touch-action` CSS property.
+//
+// In particular, unlike most other browsers, IE11+Edge on Windows 10 on touch devices and IE Mobile 10-11
+// DON'T remove the click delay when `` is present.
+// However, they DO support removing the click delay via `touch-action: manipulation`.
+// See:
+// * http://v4-alpha.getbootstrap.com/content/reboot/#click-delay-optimization-for-touch
+// * http://caniuse.com/#feat=css-touch-action
+// * http://patrickhlauke.github.io/touch/tests/results/#suppressing-300ms-delay
+
+a,
+area,
+button,
+[role="button"],
+input,
+label,
+select,
+summary,
+textarea {
+ touch-action: manipulation;
+}
+
+
+//
+// Tables
+//
+
+table {
+ // Reset for nesting within parents with `background-color`.
+ background-color: $table-bg;
+}
+
+caption {
+ padding-top: $table-cell-padding;
+ padding-bottom: $table-cell-padding;
+ color: $text-muted;
+ text-align: left;
+ caption-side: bottom;
+}
+
+th {
+ // Centered by default, but left-align-ed to match the `td`s below.
+ text-align: left;
+}
+
+
+//
+// Forms
+//
+
+label {
+ // Allow labels to use `margin` for spacing.
+ display: inline-block;
+ margin-bottom: .5rem;
+}
+
+// Work around a Firefox/IE bug where the transparent `button` background
+// results in a loss of the default `button` focus styles.
+//
+// Credit: https://github.com/suitcss/base/
+button:focus {
+ outline: 1px dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+}
+
+input,
+button,
+select,
+textarea {
+ // Remove all `margin`s so our classes don't have to do it themselves.
+ margin: 0;
+ // Normalize includes `font: inherit;`, so `font-family`. `font-size`, etc are
+ // properly inherited. However, `line-height` isn't addressed there. Using this
+ // ensures we don't need to unnecessarily redeclare the global font stack.
+ line-height: inherit;
+ // iOS adds rounded borders by default
+ border-radius: 0;
+}
+
+textarea {
+ // Textareas should really only resize vertically so they don't break their (horizontal) containers.
+ resize: vertical;
+}
+
+fieldset {
+ // Chrome and Firefox set a `min-width: min-content;` on fieldsets,
+ // so we reset that to ensure it behaves more like a standard block element.
+ // See https://github.com/twbs/bootstrap/issues/12359.
+ min-width: 0;
+ // Reset the default outline behavior of fieldsets so they don't affect page layout.
+ padding: 0;
+ margin: 0;
+ border: 0;
+}
+
+legend {
+ // Reset the entire legend element to match the `fieldset`
+ display: block;
+ width: 100%;
+ padding: 0;
+ margin-bottom: .5rem;
+ font-size: 1.5rem;
+ line-height: inherit;
+// border: 0;
+}
+
+input[type="search"] {
+ // This overrides the extra rounded corners on search inputs in iOS so that our
+ // `.form-control` class can properly style them. Note that this cannot simply
+ // be added to `.form-control` as it's not specific enough. For details, see
+ // https://github.com/twbs/bootstrap/issues/11586.
+ -webkit-appearance: none;
+}
+
+// todo: needed?
+output {
+ display: inline-block;
+// font-size: $font-size-base;
+// line-height: $line-height;
+// color: $input-color;
+}
+
+// Always hide an element with the `hidden` HTML attribute (from PureCSS).
+[hidden] {
+ display: none !important;
+}
diff --git a/public/sass/base/_type.scss b/public/sass/base/_type.scss
index 6910d3a795d..60a02755fe7 100644
--- a/public/sass/base/_type.scss
+++ b/public/sass/base/_type.scss
@@ -7,13 +7,13 @@
// -------------------------
p {
- margin: 0 0 $baseLineHeight / 2;
+ margin: 0 0 $line-height-base / 2;
}
.lead {
- margin-bottom: $baseLineHeight;
- font-size: $baseFontSize * 1.5;
+ margin-bottom: $line-height-base;
+ font-size: $font-size-base * 1.5;
font-weight: 200;
- line-height: $baseLineHeight * 1.5;
+ line-height: $line-height-base * 1.5;
}
// Emphasis & misc
@@ -21,11 +21,9 @@ p {
// -------------------------
// Ex: 14px base font * 85% = about 12px
-.small, small { font-size: 85%; }
-.large { font-size: 120%; }
-
+small { font-size: 85%; }
strong { font-weight: bold; }
-em { font-style: italic; color: $headingsColor; }
+em { font-style: italic; color: $headings-color; }
cite { font-style: normal; }
// Utility classes
@@ -33,9 +31,9 @@ cite { font-style: normal; }
a.muted:hover,
a.muted:focus { color: darken($gray-light, 10%); }
-.text-warning { color: $warningText; }
+.text-warning { color: $state-warning-text; }
a.text-warning:hover,
-a.text-warning:focus { color: darken($warningText, 10%); }
+a.text-warning:focus { color: darken($state-warning-text, 10%); }
.text-error { color: $errorText; }
a.text-error:hover,
@@ -54,40 +52,77 @@ a { cursor: pointer; }
.text-right { text-align: right; }
.text-center { text-align: center; }
-
+//
// Headings
-// -------------------------
+//
-h1, h2, h3, h4, h5, h6 {
- margin: ($baseLineHeight / 2) 0;
- font-family: $headingsFontFamily;
- font-weight: $headingsFontWeight;
- line-height: $baseLineHeight;
- color: $headingsColor;
- text-rendering: optimizelegibility; // Fix the character spacing for headings
- font-style: $headingsFontStyle;
- small {
- font-weight: normal;
- line-height: 1;
- color: $gray-light;
- }
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+ margin-bottom: $headings-margin-bottom;
+ font-family: $headings-font-family;
+ font-weight: $headings-font-weight;
+ line-height: $headings-line-height;
+ color: $headings-color;
}
-h1,
-h2,
-h3 { line-height: $baseLineHeight * 2; }
+h1, .h1 { font-size: $font-size-h1; }
+h2, .h2 { font-size: $font-size-h2; }
+h3, .h3 { font-size: $font-size-h3; }
+h4, .h4 { font-size: $font-size-h4; }
+h5, .h5 { font-size: $font-size-h5; }
+h6, .h6 { font-size: $font-size-h6; }
-h1 { font-size: $baseFontSize * 2.00; } // ~38px
-h2 { font-size: $baseFontSize * 1.75; } // ~32px
-h3 { font-size: $baseFontSize * 1.50; } // ~24px
-h4 { font-size: $baseFontSize * 1.25; } // ~18px
-h5 { font-size: $baseFontSize; }
-h6 { font-size: $baseFontSize * 0.85; } // ~12px
+.lead {
+ font-size: $lead-font-size;
+ font-weight: $lead-font-weight;
+}
-h1 small { font-size: $baseFontSize * 1.75; } // ~24px
-h2 small { font-size: $baseFontSize * 1.25; } // ~18px
-h3 small { font-size: $baseFontSize; }
-h4 small { font-size: $baseFontSize; }
+// Type display classes
+.display-1 {
+ font-size: $display1-size;
+ font-weight: $display1-weight;
+}
+.display-2 {
+ font-size: $display2-size;
+ font-weight: $display2-weight;
+}
+.display-3 {
+ font-size: $display3-size;
+ font-weight: $display3-weight;
+}
+.display-4 {
+ font-size: $display4-size;
+ font-weight: $display4-weight;
+}
+
+
+//
+// Horizontal rules
+//
+
+hr {
+ margin-top: $spacer-y;
+ margin-bottom: $spacer-y;
+ border: 0;
+ border-top: $hr-border-width solid $hr-border-color;
+}
+
+
+//
+// Emphasis
+//
+
+small,
+.small {
+ font-size: 80%;
+ font-weight: normal;
+}
+
+mark,
+.mark {
+ padding: .2em;
+ background-color: $state-warning-bg;
+}
// Lists
@@ -96,7 +131,7 @@ h4 small { font-size: $baseFontSize; }
// Unordered and Ordered lists
ul, ol {
padding: 0;
- margin: 0 0 $baseLineHeight / 2 25px;
+ margin: 0 0 $line-height-base / 2 25px;
}
ul ul,
ul ol,
@@ -105,7 +140,7 @@ ol ul {
margin-bottom: 0;
}
li {
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
}
// Remove default list styles
@@ -129,17 +164,17 @@ ol.inline {
// Description Lists
dl {
- margin-bottom: $baseLineHeight;
+ margin-bottom: $line-height-base;
}
dt,
dd {
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
}
dt {
font-weight: bold;
}
dd {
- margin-left: $baseLineHeight / 2;
+ margin-left: $line-height-base / 2;
}
// Horizontal layout (like forms)
.dl-horizontal {
@@ -161,7 +196,7 @@ dd {
// Horizontal rules
hr {
- margin: $baseLineHeight 0;
+ margin: $line-height-base 0;
border: 0;
border-top: 1px solid $hrBorder;
border-bottom: 1px solid $white;
@@ -182,17 +217,17 @@ abbr.initialism {
// Blockquotes
blockquote {
padding: 0 0 0 15px;
- margin: 0 0 $baseLineHeight;
+ margin: 0 0 $line-height-base;
border-left: 5px solid $gray-lighter;
p {
margin-bottom: 0;
- font-size: $baseFontSize * 1.25;
+ font-size: $font-size-base * 1.25;
font-weight: 300;
line-height: 1.25;
}
small {
display: block;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
color: $gray-light;
&:before {
content: '\2014 \00A0';
@@ -232,9 +267,9 @@ blockquote:after {
// Addresses
address {
display: block;
- margin-bottom: $baseLineHeight;
+ margin-bottom: $line-height-base;
font-style: normal;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
}
a.external-link {
@@ -249,7 +284,7 @@ a.external-link {
}
.link:hover {
- color: $link-color-hover;
+ color: $link-hover-color;
}
.pointer {
diff --git a/public/sass/bootstrap/responsive-767px-max.scss b/public/sass/bootstrap/responsive-767px-max.scss
index 5c01855cbc2..37d9c11e700 100644
--- a/public/sass/bootstrap/responsive-767px-max.scss
+++ b/public/sass/bootstrap/responsive-767px-max.scss
@@ -96,7 +96,7 @@
// Block level the page header small tag for readability
.page-header h1 small {
display: block;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
}
// Update checkboxes for iOS
diff --git a/public/sass/components/_alerts.scss b/public/sass/components/_alerts.scss
index 914543d9852..9dca45f7c49 100644
--- a/public/sass/components/_alerts.scss
+++ b/public/sass/components/_alerts.scss
@@ -8,9 +8,9 @@
.alert {
padding: 8px 35px 13px 14px;
- margin-bottom: $baseLineHeight;
+ margin-bottom: $line-height-base;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
- background-color: $warningBackground;
+ background-color: $state-warning-bg;
position: relative;
color: $white;
text-shadow: 0 1px 0 rgba(0,0,0,.5);
@@ -32,7 +32,7 @@
background-color: $infoBackground;
}
.alert-warning {
- background-color: $warningBackground;
+ background-color: $state-warning-bg;
}
.page-alert-list {
@@ -63,6 +63,6 @@
}
.alert-title {
- font-weight: $fontWeightSemi;
+ font-weight: $font-weight-semi-bold;
padding-bottom: 2px;
}
diff --git a/public/sass/components/_buttons.scss b/public/sass/components/_buttons.scss
index 4435e641eba..47d74b8dc89 100644
--- a/public/sass/components/_buttons.scss
+++ b/public/sass/components/_buttons.scss
@@ -10,8 +10,8 @@
display: inline-block;
padding: 8px 12px;
margin-right: 10px;
- font-size: $baseFontSize;
- line-height: $baseLineHeight;
+ font-size: $font-size-base;
+ line-height: $line-height-base;
text-align: center;
vertical-align: middle;
cursor: pointer;
@@ -57,14 +57,14 @@
.btn-small {
padding: 2px 10px;
- font-size: $fontSizeSmall;
+ font-size: $font-size-sm;
}
.btn-mini {
padding: 2px 6px;
margin-right: 0;
margin-right: 0;
- font-size: $fontSizeMini;
+ font-size: $font-size-xs;
}
// Set the backgrounds
diff --git a/public/sass/components/_dashboard.scss b/public/sass/components/_dashboard.scss
index e50ed83a464..c7232dcb26e 100644
--- a/public/sass/components/_dashboard.scss
+++ b/public/sass/components/_dashboard.scss
@@ -143,7 +143,7 @@ div.flot-text {
.panel-title {
border: 0px;
- font-weight: $fontWeightSemi;
+ font-weight: $font-weight-semi-bold;
position: relative;
cursor: pointer;
width: 100%;
diff --git a/public/sass/components/_dropdown.scss b/public/sass/components/_dropdown.scss
index 3f3d7290d1e..7f1d0bedff3 100644
--- a/public/sass/components/_dropdown.scss
+++ b/public/sass/components/_dropdown.scss
@@ -61,7 +61,7 @@
.divider {
height: 1px;
- margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
+ margin: (($line-height-base / 2) - 1) 1px; // 8px 1px
overflow: hidden;
background-color: $dropdownDividerTop;
border-bottom: 1px solid $dropdownDividerBottom;
@@ -73,7 +73,7 @@
padding: 3px 20px 3px 15px;
clear: both;
font-weight: normal;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
color: $dropdownLinkColor;
white-space: nowrap;
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index ec67c6011c1..a52fed03057 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -43,7 +43,7 @@ $gf-form-margin: 4px;
background-color: $labelBackground;
display: block;
padding: 8px 7px;
- font-size: $fontSizeSmall;
+ font-size: $font-size-sm;
margin-right: $gf-form-margin;
}
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index 0b524fcf76f..435e46f9634 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -126,7 +126,7 @@
.share-snapshot-info-text {
margin: 10px 105px;
strong {
- color: $headingsColor;
+ color: $headings-color;
font-weight: 500;
}
}
diff --git a/public/sass/components/_navbar.scss b/public/sass/components/_navbar.scss
index 9c0a548749e..9b0f8df4a0a 100644
--- a/public/sass/components/_navbar.scss
+++ b/public/sass/components/_navbar.scss
@@ -104,6 +104,7 @@
img {
width: 30px;
position: relative;
+ top: -2px;
}
.top-nav-logo-background {
display: inline-block;
@@ -111,8 +112,8 @@
padding: 4px;
border-radius: 50%;
background: $iconContainerBackground;
- width: 30px;
- height: 30px;
+ width: 40px;
+ height: 40px;
}
.icon-gf-grafana_wordmark {
font-size: 21px;
@@ -129,7 +130,7 @@
overflow: hidden;
white-space: nowrap;
display: block;
- padding: 16px 17px 16px 13px;
+ padding: 11px 17px 12px 13px;
}
.fa-th-large {
diff --git a/public/sass/components/_navs.scss b/public/sass/components/_navs.scss
index 14861537633..2087feef823 100644
--- a/public/sass/components/_navs.scss
+++ b/public/sass/components/_navs.scss
@@ -8,7 +8,7 @@
.nav {
margin-left: 0;
- margin-bottom: $baseLineHeight;
+ margin-bottom: $line-height-base;
list-style: none;
}
@@ -33,7 +33,7 @@
padding: 3px 15px;
font-size: 11px;
font-weight: bold;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
color: $gray-light;
text-shadow: 0 1px 0 rgba(255,255,255,.5);
text-transform: uppercase;
@@ -109,7 +109,7 @@
.nav-tabs > li > a {
padding-top: 8px;
padding-bottom: 8px;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
border: 1px solid transparent;
@include border-radius(4px 4px 0 0);
&:hover,
@@ -139,8 +139,8 @@
}
.nav .dropdown-toggle:hover .caret,
.nav .dropdown-toggle:focus .caret {
- border-top-color: $link-color-hover;
- border-bottom-color: $link-color-hover;
+ border-top-color: $link-hover-color;
+ border-bottom-color: $link-hover-color;
}
/* move down carets for tabs */
.nav-tabs .dropdown-toggle .caret {
diff --git a/public/sass/components/_pagination.scss b/public/sass/components/_pagination.scss
index 505c84ce7df..0b87172551b 100644
--- a/public/sass/components/_pagination.scss
+++ b/public/sass/components/_pagination.scss
@@ -15,7 +15,7 @@
.pagination ul > li > span {
float: left; // Collapse white-space
padding: 4px 12px;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
text-decoration: none;
background-color: $paginationBackground;
border: 1px solid $paginationBorder;
@@ -100,7 +100,7 @@
ul > li > a,
ul > li > span {
padding: $paddingSmall;
- font-size: $fontSizeSmall;
+ font-size: $font-size-sm;
}
}
// Mini
@@ -108,6 +108,6 @@
ul > li > a,
ul > li > span {
padding: $paddingMini;
- font-size: $fontSizeMini;
+ font-size: $font-size-xs;
}
}
diff --git a/public/sass/components/_panel_graph.scss b/public/sass/components/_panel_graph.scss
index 17f4bceea0f..2a85d9195ab 100644
--- a/public/sass/components/_panel_graph.scss
+++ b/public/sass/components/_panel_graph.scss
@@ -224,7 +224,7 @@
.graph-tooltip-time {
text-align: center;
- font-weight: $fontWeightSemi;
+ font-weight: $font-weight-semi-bold;
position: relative;
top: -3px;
}
@@ -287,7 +287,7 @@
.axisLabel {
color: $text-color;
- font-size: $fontSizeSmall;
+ font-size: $font-size-sm;
position: absolute;
text-align: center;
font-size: 12px;
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index a8dd1f02d2f..3198a3190f4 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -60,7 +60,6 @@ $sideMenuWidth: 220px;
}
.sidemenu {
- font-weight: $baseFontWeight;
list-style: none;
margin: 0;
padding: 0;
diff --git a/public/sass/components/_submenu.scss b/public/sass/components/_submenu.scss
index ed00de860f7..a3d9ac5e886 100644
--- a/public/sass/components/_submenu.scss
+++ b/public/sass/components/_submenu.scss
@@ -54,7 +54,7 @@
background-color: $dropdownBackground;
box-shadow: 0 0 25px 0 rgba(0,0,0,0.4);
z-index: 1000;
- font-size: $baseFontSize;
+ font-size: $font-size-base;
border-radius: 3px 3px 0 0;
border: 1px solid $tight-form-func-bg;
diff --git a/public/sass/components/_tags.scss b/public/sass/components/_tags.scss
index 80be64a9b05..7932a20a6bb 100644
--- a/public/sass/components/_tags.scss
+++ b/public/sass/components/_tags.scss
@@ -3,7 +3,7 @@
.badge {
display: inline-block;
padding: 2px 4px;
- font-size: $baseFontSize * .846;
+ font-size: $font-size-base * .846;
font-weight: bold;
line-height: 14px; // ensure proper line-height if floated
color: $white;
diff --git a/public/sass/mixins/_hover.scss b/public/sass/mixins/_hover.scss
new file mode 100644
index 00000000000..3a11254e847
--- /dev/null
+++ b/public/sass/mixins/_hover.scss
@@ -0,0 +1,59 @@
+@mixin hover {
+ @if $enable-hover-media-query {
+ // See Media Queries Level 4: http://drafts.csswg.org/mediaqueries/#hover
+ // Currently shimmed by https://github.com/twbs/mq4-hover-shim
+ @media (hover: hover) {
+ &:hover { @content }
+ }
+ }
+ @else {
+ &:hover { @content }
+ }
+}
+
+@mixin hover-focus {
+ @if $enable-hover-media-query {
+ &:focus { @content }
+ @include hover { @content }
+ }
+ @else {
+ &:focus,
+ &:hover {
+ @content
+ }
+ }
+}
+
+@mixin plain-hover-focus {
+ @if $enable-hover-media-query {
+ &,
+ &:focus {
+ @content
+ }
+ @include hover { @content }
+ }
+ @else {
+ &,
+ &:focus,
+ &:hover {
+ @content
+ }
+ }
+}
+
+@mixin hover-focus-active {
+ @if $enable-hover-media-query {
+ &:focus,
+ &:active {
+ @content
+ }
+ @include hover { @content }
+ }
+ @else {
+ &:focus,
+ &:active,
+ &:hover {
+ @content
+ }
+ }
+}
diff --git a/public/sass/mixins/_mixins.scss b/public/sass/mixins/_mixins.scss
index ded17c0288a..34135fd1d07 100644
--- a/public/sass/mixins/_mixins.scss
+++ b/public/sass/mixins/_mixins.scss
@@ -89,23 +89,23 @@
font-family: $font-family-monospace;
}
-@mixin font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+@mixin font-shorthand($size: $font-size-base, $weight: normal, $lineHeight: $line-height-base) {
font-size: $size;
font-weight: $weight;
line-height: $lineHeight;
}
-@mixin font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+@mixin font-serif($size: $font-size-base, $weight: normal, $lineHeight: $line-height-base) {
@include font-family-serif();
@include font-shorthand($size, $weight, $lineHeight);
}
-@mixin font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+@mixin font-sans-serif($size: $font-size-base, $weight: normal, $lineHeight: $line-height-base) {
@include font-family-sans-serif();
@include font-shorthand($size, $weight, $lineHeight);
}
-@mixin monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
+@mixin monospace($size: $font-size-base, $weight: normal, $lineHeight: $line-height-base) {
@include font-family-monospace;
@include font-shorthand($size, $weight, $lineHeight);
}
diff --git a/public/sass/utils/_utils.scss b/public/sass/utils/_utils.scss
index 9d74bf12741..70c39ecbb34 100644
--- a/public/sass/utils/_utils.scss
+++ b/public/sass/utils/_utils.scss
@@ -12,7 +12,7 @@
float: right;
font-size: 20px;
font-weight: bold;
- line-height: $baseLineHeight;
+ line-height: $line-height-base;
color: $black;
text-shadow: 0 1px 0 rgba(255,255,255,1);
@include opacity(20);