From f1f147bbed0f318bb91d74cddacd421410e2c69d Mon Sep 17 00:00:00 2001 From: Christian Hoffmeister Date: Wed, 8 Jun 2016 11:47:51 +0200 Subject: [PATCH] Fix trailing whitespaces/missing new lines at eof --- bower.json | 2 +- css/mixins.less | 4 +- css/mixins.scss | 4 +- .../less/roboto-condensed-fontface.less | 4 +- .../roboto-condensed-fontface.css | 2 +- .../sass/roboto-condensed-fontface.scss | 2 +- css/roboto/less/roboto-fontface.less | 8 ++-- css/roboto/roboto-fontface.css | 2 +- css/roboto/sass/roboto-fontface.scss | 6 +-- package.json | 2 +- test.html | 40 +++++++++---------- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/bower.json b/bower.json index 87ac88f..8411b9a 100644 --- a/bower.json +++ b/bower.json @@ -15,4 +15,4 @@ "test", "tests" ] -} \ No newline at end of file +} diff --git a/css/mixins.less b/css/mixins.less index 5af9be0..dad81b8 100644 --- a/css/mixins.less +++ b/css/mixins.less @@ -1,9 +1,9 @@ @roboto-font-path: '../../../fonts'; .roboto-font(@variant, @type, @weight, @style) { - + @font-full-path: '@{roboto-font-path}/@{variant}/@{variant}'; - + @font-face { font-family: '@{variant}'; src: url('@{font-full-path}-@{type}.eot'); diff --git a/css/mixins.scss b/css/mixins.scss index 0de56f7..fec67d2 100644 --- a/css/mixins.scss +++ b/css/mixins.scss @@ -1,9 +1,9 @@ $roboto-font-path: '../../../fonts' !default; @mixin roboto-font($variant, $type, $weight, $style) { - + $font-full-path: '#{$roboto-font-path}/#{$variant}/#{$variant}'; - + @font-face { font-family: '#{$variant}'; src: url('#{$font-full-path}-#{$type}.eot'); diff --git a/css/roboto-condensed/less/roboto-condensed-fontface.less b/css/roboto-condensed/less/roboto-condensed-fontface.less index 64f3f9f..18a3c41 100644 --- a/css/roboto-condensed/less/roboto-condensed-fontface.less +++ b/css/roboto-condensed/less/roboto-condensed-fontface.less @@ -1,6 +1,6 @@ @import "roboto-condensed-fontface-regular"; @import "roboto-condensed-fontface-regular-italic"; @import "roboto-condensed-fontface-light"; -@import "roboto-condensed-fontface-light-italic"; +@import "roboto-condensed-fontface-light-italic"; @import "roboto-condensed-fontface-bold"; -@import "roboto-condensed-fontface-bold-italic"; \ No newline at end of file +@import "roboto-condensed-fontface-bold-italic"; diff --git a/css/roboto-condensed/roboto-condensed-fontface.css b/css/roboto-condensed/roboto-condensed-fontface.css index 242228f..dfe1398 100644 --- a/css/roboto-condensed/roboto-condensed-fontface.css +++ b/css/roboto-condensed/roboto-condensed-fontface.css @@ -80,4 +80,4 @@ font-family: "Roboto-Condensed-BoldItalic"; src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot"); src: local("Roboto-Condensed BoldItalic"), local("Roboto-Condensed-BoldItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.svg#Roboto-Condensed") format("svg"); -} \ No newline at end of file +} diff --git a/css/roboto-condensed/sass/roboto-condensed-fontface.scss b/css/roboto-condensed/sass/roboto-condensed-fontface.scss index 166d7be..18a3c41 100644 --- a/css/roboto-condensed/sass/roboto-condensed-fontface.scss +++ b/css/roboto-condensed/sass/roboto-condensed-fontface.scss @@ -1,6 +1,6 @@ @import "roboto-condensed-fontface-regular"; @import "roboto-condensed-fontface-regular-italic"; @import "roboto-condensed-fontface-light"; -@import "roboto-condensed-fontface-light-italic"; +@import "roboto-condensed-fontface-light-italic"; @import "roboto-condensed-fontface-bold"; @import "roboto-condensed-fontface-bold-italic"; diff --git a/css/roboto/less/roboto-fontface.less b/css/roboto/less/roboto-fontface.less index f153122..64ef2b6 100644 --- a/css/roboto/less/roboto-fontface.less +++ b/css/roboto/less/roboto-fontface.less @@ -1,12 +1,12 @@ @import "roboto-fontface-regular"; @import "roboto-fontface-regular-italic"; @import "roboto-fontface-light"; -@import "roboto-fontface-light-italic"; +@import "roboto-fontface-light-italic"; @import "roboto-fontface-thin"; -@import "roboto-fontface-thin-italic"; +@import "roboto-fontface-thin-italic"; @import "roboto-fontface-medium"; -@import "roboto-fontface-medium-italic"; +@import "roboto-fontface-medium-italic"; @import "roboto-fontface-bold"; @import "roboto-fontface-bold-italic"; @import "roboto-fontface-black"; -@import "roboto-fontface-black-italic"; \ No newline at end of file +@import "roboto-fontface-black-italic"; diff --git a/css/roboto/roboto-fontface.css b/css/roboto/roboto-fontface.css index a7a9033..91b8b81 100644 --- a/css/roboto/roboto-fontface.css +++ b/css/roboto/roboto-fontface.css @@ -164,4 +164,4 @@ font-family: 'Roboto-BlackItalic'; src: url('../../fonts/roboto/Roboto-BlackItalic.eot'); src: local('Roboto BlackItalic'), local('Roboto-BlackItalic'), url('../../fonts/roboto/Roboto-BlackItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-BlackItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-BlackItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-BlackItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-BlackItalic.svg#Roboto') format('svg'); -} \ No newline at end of file +} diff --git a/css/roboto/sass/roboto-fontface.scss b/css/roboto/sass/roboto-fontface.scss index 2c2e33b..64ef2b6 100644 --- a/css/roboto/sass/roboto-fontface.scss +++ b/css/roboto/sass/roboto-fontface.scss @@ -1,11 +1,11 @@ @import "roboto-fontface-regular"; @import "roboto-fontface-regular-italic"; @import "roboto-fontface-light"; -@import "roboto-fontface-light-italic"; +@import "roboto-fontface-light-italic"; @import "roboto-fontface-thin"; -@import "roboto-fontface-thin-italic"; +@import "roboto-fontface-thin-italic"; @import "roboto-fontface-medium"; -@import "roboto-fontface-medium-italic"; +@import "roboto-fontface-medium-italic"; @import "roboto-fontface-bold"; @import "roboto-fontface-bold-italic"; @import "roboto-fontface-black"; diff --git a/package.json b/package.json index 8015339..281d7b9 100644 --- a/package.json +++ b/package.json @@ -25,4 +25,4 @@ "less": "2.6.0", "node-sass": "3.4.2" } -} \ No newline at end of file +} diff --git a/test.html b/test.html index a9e323b..3de80b5 100644 --- a/test.html +++ b/test.html @@ -9,7 +9,7 @@ body { background: #F2F2F2; } - + .test-header { text-align: center; font-family: 'Roboto-Black'; @@ -17,79 +17,79 @@ padding: 0; margin: 0; } - + .test-header h1 { padding: 0; margin: 0; } - + section { padding: 2% 10%; margin: 0 auto; } /*Roboto*/ - + .roboto { font-family: 'Roboto'; } - + .roboto-italic { font-family: 'Roboto-RegularItalic'; } - + .roboto-light { font-family: 'Roboto-Light'; } - + .roboto-light-italic { font-family: 'Roboto-LightItalic'; } - + .roboto-bold { font-family: 'Roboto-Bold'; } - + .roboto-bold-italic { font-family: 'Roboto-BoldItalic'; } - + .roboto-medium { font-family: 'Roboto-Medium'; } - + .roboto-medium-italic { font-family: 'Roboto-MediumItalic'; } - + .roboto-thin { font-family: 'Roboto-Thin'; } - + .roboto-thin-italic { font-family: 'Roboto-ThinItalic'; } /*Roboto Condensed*/ - + .roboto-condensed { font-family: 'Roboto-Condensed'; } - + .roboto-condensed-italic { font-family: 'Roboto-Condensed-RegularItalic'; } - + .roboto-condensed-light { font-family: 'Roboto-Condensed-Light'; } - + .roboto-condensed-light-italic { font-family: 'Roboto-Condensed-LightItalic'; } - + .roboto-condensed-bold { font-family: 'Roboto-Condensed-Bold'; } - + .roboto-condensed-bold-italic { font-family: 'Roboto-Condensed-BoldItalic'; } @@ -234,4 +234,4 @@ - \ No newline at end of file +