Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap-sass.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Mazovetskiy <glex.spb@gmail.com>2018-04-18 01:42:39 +0300
committerGleb Mazovetskiy <glex.spb@gmail.com>2018-12-14 15:16:04 +0300
commit8c0b5db239cc5af72882d662decbd39fabefce64 (patch)
tree37e7410d35242eced80d174f8e31d47528b25a5f /templates
parent92aa0c8b4631d7b0af6071f9c0aa08d49593678c (diff)
rake convert[v3.4.0-dev]
Diffstat (limited to 'templates')
-rw-r--r--templates/project/_bootstrap-variables.sass16
1 files changed, 8 insertions, 8 deletions
diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass
index 898495d4..598642a2 100644
--- a/templates/project/_bootstrap-variables.sass
+++ b/templates/project/_bootstrap-variables.sass
@@ -44,22 +44,22 @@
//
//## Font, line-height, and color for body text, headings, and more.
-// $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif
+// $font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif
// $font-family-serif: Georgia, "Times New Roman", Times, serif
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
-// $font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace
+// $font-family-monospace: "SFMono-Regular", Menlo, Monaco, Consolas, "Courier New", monospace
// $font-family-base: $font-family-sans-serif
// $font-size-base: 14px
// $font-size-large: ceil(($font-size-base * 1.25)) // ~18px
-// $font-size-small: ceil(($font-size-base * 0.85)) // ~12px
+// $font-size-small: ceil(($font-size-base * .85)) // ~12px
// $font-size-h1: floor(($font-size-base * 2.6)) // ~36px
// $font-size-h2: floor(($font-size-base * 2.15)) // ~30px
// $font-size-h3: ceil(($font-size-base * 1.7)) // ~24px
// $font-size-h4: ceil(($font-size-base * 1.25)) // ~18px
// $font-size-h5: $font-size-base
-// $font-size-h6: ceil(($font-size-base * 0.85)) // ~12px
+// $font-size-h6: ceil(($font-size-base * .85)) // ~12px
//** Unit-less `line-height` for use in components like buttons.
// $line-height-base: 1.428571429 // 20/14
@@ -240,7 +240,7 @@
//** Background for the dropdown menu.
// $dropdown-bg: #fff
//** Dropdown menu `border-color`.
-// $dropdown-border: rgba(0,0,0,.15)
+// $dropdown-border: rgba(0, 0, 0, .15)
//** Dropdown menu `border-color` **for IE8**.
// $dropdown-fallback-border: #ccc
//** Divider color for between dropdown items.
@@ -546,7 +546,7 @@
//** Popover maximum width
// $popover-max-width: 276px
//** Popover border color
-// $popover-border-color: rgba(0,0,0,.2)
+// $popover-border-color: rgba(0, 0, 0, .2)
//** Popover fallback border color
// $popover-fallback-border-color: #ccc
@@ -604,7 +604,7 @@
//** Background color of modal content area
// $modal-content-bg: #fff
//** Modal content border color
-// $modal-content-border-color: rgba(0,0,0,.2)
+// $modal-content-border-color: rgba(0, 0, 0, .2)
//** Modal content border color **for IE8**
// $modal-content-fallback-border-color: #999
@@ -809,7 +809,7 @@
//
//##
-// $carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6)
+// $carousel-text-shadow: 0 1px 2px rgba(0, 0, 0, .6)
// $carousel-control-color: #fff
// $carousel-control-width: 15%