mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2024-11-23 01:57:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

#755 reviewed typography against the spec, seems like a good starting point.

Browse Source
This commit is contained in:
Kevin Ross 2015-12-06 09:29:08 -06:00
parent 83186db2d3
commit 0e1ab986f8
4 changed files with 18 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -415,7 +415,11 @@ module.exports = function (grunt) {
options: {
// //https://regex101.com/r/cZ7aO8/2
process: function (content, srcpath) {
return content.replace(/(---[\s\S]+?---)([\s\S]+)/mg, referenceDocNotice);
return content
// insert docs reference
.replace(/(---[\s\S]+?---)([\s\S]+)/mg, referenceDocNotice)
// remove sample text 'display' as this is a particular style and is confusing
.replace(/Fancy display heading/, 'Fancy heading');
}
},
expand: true,

2
docs/content/typography.md
View File

@ -83,7 +83,7 @@ Use the included utility classes to recreate the small secondary heading text fr
{% example html %}
<h3>
Fancy display heading
Fancy heading
<small class="text-muted">With faded secondary text</small>
</h3>
{% endexample %}

29
scss/includes/_type.scss
View File

@ -1,25 +1,4 @@
//body, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4 {
// //font-family: $font-family-sans-serif;
// //font-weight: 300;
//}
//
//h5, h6{
// font-weight: 400;
//}
//
//.text-warning {
// color: $brand-warning;
//}
//.text-primary {
// color: $brand-primary;
//}
//.text-danger {
// color: $brand-danger;
//}
//.text-success {
// color: $brand-success;
//}
//.text-info {
// color: $brand-info;
//}
// adjust up the h6 weight
h6 {
font-weight: 500;
}

13
scss/includes/variables/_type.scss
View File

@ -2,6 +2,9 @@
//
// Font, line-height, and color for body text, headings, and more.
// https://www.google.com/design/spec/style/typography.html#typography-styles
// http://www.getmdl.io/styles/index.html
$font-family-sans-serif: 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
//$font-family-serif: Georgia, "Times New Roman", Times, serif !default;
//$font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace !default;
@ -22,10 +25,10 @@ $font-family-sans-serif: 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
//$font-size-h5: 1.25rem !default;
//$font-size-h6: 1rem !default;
//
//$display1-size: 6rem !default;
//$display2-size: 5.5rem !default;
//$display3-size: 4.5rem !default;
//$display4-size: 3.5rem !default;
$display1-size: 7rem !default; // md display-4 112px was 6rem;
$display2-size: 3.5rem !default; // md display-3 56px was 5.5rem
$display3-size: 2.8125rem !default; // md display-2 45px was 4.5rem
$display4-size: 2.125rem !default; // md display-1 34px was 3.5rem
//
//$display1-weight: 300 !default;
//$display2-weight: 300 !default;
@ -36,7 +39,7 @@ $font-family-sans-serif: 'Roboto', 'Helvetica', 'Arial', sans-serif !default;
//
//$headings-margin-bottom: ($spacer / 2) !default;
//$headings-font-family: inherit !default;
//$headings-font-weight: 500 !default;
$headings-font-weight: 400 !default; // was 500
//$headings-line-height: 1.1 !default;
//$headings-color: inherit !default;
//