The Gitlab instance will be restarted on Monday April 28th at 2AM. There will be a short interruption of service.

Skip to content
Snippets Groups Projects
Commit c3bf4d14 authored by Alexander Purr's avatar Alexander Purr Committed by Mathias Maaß
Browse files

refs #24114 [finc] move font-variables section nearly at the beginning of _customVariables.scss

* remove _customFonts in finc because of no usage of @font-face
** especial in usage in instances
* simplification of custom variables
** all finc variables now in one file (flat hierarchy)
* improves re-usage of font-variables in instances (in context of unification of scss import order)
parent 971e636e
No related merge requests found
// This file is for all font-related variables incl. line height
// FONTS
//// Base font size
$font-size-base: 16px !default;
//// We use these to define default font stacks
$font-family-sans-serif: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif !default;
$font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif !default;
$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace !default;
//// SET FONT SIZES using the following pattern! This is the only way, font sizes will be adapted proportionally
//// font-size: ($font-size-base * 1.5)
//// OR us the em-calculator function below, like so: font-size: em(14)
//// There are also the variables $font-size-large and $...small which are calculated
//// $font-size-base * 1.25 --> ~18px and $font-size-base * 0.85 --> ~12px
$font-size-breadcrumbs: ($font-size-base * .85) !default;
// Default line height
$line-height-base: 1.5 !default;
......@@ -11,7 +11,6 @@
// @import '../../bootstrap3/scss/vendor/bootstrap/variables';
@import '../../bootstrap3/scss/vendor/font-awesome/variables';
@import 'components/functions';
@import 'customFonts';
// *****************************************************************
......@@ -70,6 +69,36 @@ $pagination-disabled-color: $default-disabled-color !default;
// *****************************************************************
// **** A3 **** Font-related settings ******************************
// *****************************************************************
//
// FONT variables here
// but definitions and imports of new fonts via @font-face exclusively in _customFonts.scss
//
//// Base font size
$font-size-base: 16px !default;
//// We use these to define default font stacks
$font-family-sans-serif: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif !default;
$font-family-serif: Georgia, Cambria, 'Times New Roman', Times, serif !default;
$font-family-monospace: Consolas, 'Liberation Mono', Courier, monospace !default;
//// SET FONT SIZES using the following pattern! This is the only way, font sizes will be adapted proportionally
//// font-size: ($font-size-base * 1.5)
//// OR us the em-calculator function below, like so: font-size: em(14)
//// There are also the variables $font-size-large and $...small which are calculated
//// $font-size-base * 1.25 --> ~18px and $font-size-base * 0.85 --> ~12px
$font-size-breadcrumbs: ($font-size-base * .85) !default;
// Default line height
$line-height-base: 1.5 !default;
// *****************************************************************
// **** A5 **** General dimensions *********************************
// *****************************************************************
......
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