From 2dd8acce1594d18b612dd19d0034af8232c9dd62 Mon Sep 17 00:00:00 2001 From: Alvin Wang Date: Sun, 1 Mar 2015 16:29:30 -0500 Subject: [PATCH] converted files from CRLF to LF --- res/materialize.svg | 326 +++++++++++------------ robots.txt | 6 +- sass/components/_typography.scss | 108 ++++---- sitemap.xml | 86 +++--- templates/starter-template/css/style.css | 20 +- 5 files changed, 273 insertions(+), 273 deletions(-) diff --git a/res/materialize.svg b/res/materialize.svg index b91cb3fca9..903fed55f8 100644 --- a/res/materialize.svg +++ b/res/materialize.svg @@ -1,163 +1,163 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/robots.txt b/robots.txt index d7741b1236..2b08a70ea7 100644 --- a/robots.txt +++ b/robots.txt @@ -1,4 +1,4 @@ -# Allow crawling of all content -User-agent: * -Disallow: +# Allow crawling of all content +User-agent: * +Disallow: Sitemap: http://materializecss.com/sitemap.xml \ No newline at end of file diff --git a/sass/components/_typography.scss b/sass/components/_typography.scss index 2533d3d252..47416f9883 100755 --- a/sass/components/_typography.scss +++ b/sass/components/_typography.scss @@ -1,55 +1,55 @@ -a { - text-decoration: none; -} - -html{ - line-height: 1.5; - - @media only screen and (min-width: 0) { - font-size: 14px; - } - - @media only screen and (min-width: $medium-screen) { - font-size: 14.5px; - } - - @media only screen and (min-width: $large-screen) { - font-size: 15px; - } - - font-family: "Roboto", sans-serif; - font-weight: normal; - color: $off-black; -} -h1, h2, h3, h4, h5, h6 { - font-weight: 400; -} - -// Header Styles -h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { font-weight: inherit; } -h1 { font-size: $h1-fontsize; line-height: 1.1*$h1-fontsize; margin: ($h1-fontsize / 2) 0 ($h1-fontsize / 2.5) 0;} -h2 { font-size: $h2-fontsize; line-height: 1.1*$h2-fontsize; margin: ($h2-fontsize / 2) 0 ($h2-fontsize / 2.5) 0;} -h3 { font-size: $h3-fontsize; line-height: 1.1*$h3-fontsize; margin: ($h3-fontsize / 2) 0 ($h3-fontsize / 2.5) 0;} -h4 { font-size: $h4-fontsize; line-height: 1.1*$h4-fontsize; margin: ($h4-fontsize / 2) 0 ($h4-fontsize / 2.5) 0;} -h5 { font-size: $h5-fontsize; line-height: 1.1*$h5-fontsize; margin: ($h5-fontsize / 2) 0 ($h5-fontsize / 2.5) 0;} -h6 { font-size: $h6-fontsize; line-height: 1.1*$h6-fontsize; margin: ($h6-fontsize / 2) 0 ($h6-fontsize / 2.5) 0;} - -// Text Styles -em { font-style: italic; } -strong { font-weight: 500; } -small { font-size: 75%; } -.light { font-weight: 300; } - -.flow-text{ - font-weight: 300; - $i: 0; - @while $i <= $intervals { - @media only screen and (min-width : 360 + ($i * $interval-size)) { - font-size: 1.2rem * (1 + (.02 * $i)); - } - @media only screen and (min-width : 0 + ($i * $interval-size)) { - line-height: .8rem * (1 + (.13 * $i)); - } - $i: $i + 1; - } +a { + text-decoration: none; +} + +html{ + line-height: 1.5; + + @media only screen and (min-width: 0) { + font-size: 14px; + } + + @media only screen and (min-width: $medium-screen) { + font-size: 14.5px; + } + + @media only screen and (min-width: $large-screen) { + font-size: 15px; + } + + font-family: "Roboto", sans-serif; + font-weight: normal; + color: $off-black; +} +h1, h2, h3, h4, h5, h6 { + font-weight: 400; +} + +// Header Styles +h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { font-weight: inherit; } +h1 { font-size: $h1-fontsize; line-height: 1.1*$h1-fontsize; margin: ($h1-fontsize / 2) 0 ($h1-fontsize / 2.5) 0;} +h2 { font-size: $h2-fontsize; line-height: 1.1*$h2-fontsize; margin: ($h2-fontsize / 2) 0 ($h2-fontsize / 2.5) 0;} +h3 { font-size: $h3-fontsize; line-height: 1.1*$h3-fontsize; margin: ($h3-fontsize / 2) 0 ($h3-fontsize / 2.5) 0;} +h4 { font-size: $h4-fontsize; line-height: 1.1*$h4-fontsize; margin: ($h4-fontsize / 2) 0 ($h4-fontsize / 2.5) 0;} +h5 { font-size: $h5-fontsize; line-height: 1.1*$h5-fontsize; margin: ($h5-fontsize / 2) 0 ($h5-fontsize / 2.5) 0;} +h6 { font-size: $h6-fontsize; line-height: 1.1*$h6-fontsize; margin: ($h6-fontsize / 2) 0 ($h6-fontsize / 2.5) 0;} + +// Text Styles +em { font-style: italic; } +strong { font-weight: 500; } +small { font-size: 75%; } +.light { font-weight: 300; } + +.flow-text{ + font-weight: 300; + $i: 0; + @while $i <= $intervals { + @media only screen and (min-width : 360 + ($i * $interval-size)) { + font-size: 1.2rem * (1 + (.02 * $i)); + } + @media only screen and (min-width : 0 + ($i * $interval-size)) { + line-height: .8rem * (1 + (.13 * $i)); + } + $i: $i + 1; + } } \ No newline at end of file diff --git a/sitemap.xml b/sitemap.xml index 65eafea237..b6f5956c3c 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -1,43 +1,43 @@ - - - - http://materializecss.com/about.html - 2014-11-27 - - - http://materializecss.com/components.html - 2014-11-27 - - - http://materializecss.com/index.html - 2014-11-27 - - - http://materializecss.com/ - 2014-11-27 - - - http://materializecss.com/getting-started.html - 2014-11-27 - - - http://materializecss.com/javascript.html - 2014-11-27 - - - http://materializecss.com/bin/materialize-sass_v0.82.zip - 2014-11-27 - - - http://materializecss.com/bin/materialize_v0.82.zip - 2014-11-27 - - - http://materializecss.com/parallax.html - 2014-11-27 - - - http://materializecss.com/sass.html - 2014-11-27 - - + + + + http://materializecss.com/about.html + 2014-11-27 + + + http://materializecss.com/components.html + 2014-11-27 + + + http://materializecss.com/index.html + 2014-11-27 + + + http://materializecss.com/ + 2014-11-27 + + + http://materializecss.com/getting-started.html + 2014-11-27 + + + http://materializecss.com/javascript.html + 2014-11-27 + + + http://materializecss.com/bin/materialize-sass_v0.82.zip + 2014-11-27 + + + http://materializecss.com/bin/materialize_v0.82.zip + 2014-11-27 + + + http://materializecss.com/parallax.html + 2014-11-27 + + + http://materializecss.com/sass.html + 2014-11-27 + + diff --git a/templates/starter-template/css/style.css b/templates/starter-template/css/style.css index 39401cf27a..8cc600f843 100644 --- a/templates/starter-template/css/style.css +++ b/templates/starter-template/css/style.css @@ -1,11 +1,11 @@ -/* Custom Stylesheet */ -/** - * Use this file to override Materialize files so you can update - * the core Materialize files in the future - * - * Made By MaterializeCSS.com - */ - -.icon-block { - padding: 0 15px; +/* Custom Stylesheet */ +/** + * Use this file to override Materialize files so you can update + * the core Materialize files in the future + * + * Made By MaterializeCSS.com + */ + +.icon-block { + padding: 0 15px; } \ No newline at end of file