diff options
| author | Sam Potts <me@sampotts.me> | 2015-04-15 21:51:59 +1000 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2015-04-15 21:51:59 +1000 |
| commit | d04b278802f971ddd96fa8f67516265ae4d23546 (patch) | |
| tree | 9691b7d0d8921296a5326deb2d9534565395b206 /docs/src/less/lib | |
| parent | 7345f656c1122195af0f354f8ecf8c3e350b1fab (diff) | |
| parent | 530abac3a70285f3a00c99089b3faabee73eb8be (diff) | |
| download | plyr-d04b278802f971ddd96fa8f67516265ae4d23546.tar.lz plyr-d04b278802f971ddd96fa8f67516265ae4d23546.tar.xz plyr-d04b278802f971ddd96fa8f67516265ae4d23546.zip | |
Merge branch 'master' into develop
# Conflicts:
# src/js/plyr.js
Diffstat (limited to 'docs/src/less/lib')
| -rw-r--r-- | docs/src/less/lib/fontface.less | 24 | ||||
| -rw-r--r-- | docs/src/less/lib/mixins.less | 32 |
2 files changed, 28 insertions, 28 deletions
diff --git a/docs/src/less/lib/fontface.less b/docs/src/less/lib/fontface.less index 704503d1..479f7fa4 100644 --- a/docs/src/less/lib/fontface.less +++ b/docs/src/less/lib/fontface.less @@ -1,16 +1,16 @@ @font-face { - font-family: "Avenir"; - src: url("//cdn.plyr.io/fonts/avenir-medium.woff2") format("woff2"), - url("//cdn.plyr.io/fonts/avenir-medium.woff") format("woff"), - url("//cdn.plyr.io/fonts/avenir-medium.ttf") format("truetype"); - font-style: normal; - font-weight: 400; + font-family: "Avenir"; + src: url("//cdn.plyr.io/fonts/avenir-medium.woff2") format("woff2"), + url("//cdn.plyr.io/fonts/avenir-medium.woff") format("woff"), + url("//cdn.plyr.io/fonts/avenir-medium.ttf") format("truetype"); + font-style: normal; + font-weight: 400; } @font-face { - font-family: "Avenir"; - src: url("//cdn.plyr.io/fonts/avenir-bold.woff2") format("woff2"), - url("//cdn.plyr.io/fonts/avenir-bold.woff") format("woff"), - url("//cdn.plyr.io/fonts/avenir-bold.ttf") format("truetype"); - font-style: normal; - font-weight: 600; + font-family: "Avenir"; + src: url("//cdn.plyr.io/fonts/avenir-bold.woff2") format("woff2"), + url("//cdn.plyr.io/fonts/avenir-bold.woff") format("woff"), + url("//cdn.plyr.io/fonts/avenir-bold.ttf") format("truetype"); + font-style: normal; + font-weight: 600; }
\ No newline at end of file diff --git a/docs/src/less/lib/mixins.less b/docs/src/less/lib/mixins.less index b3a1f63b..a4451b1c 100644 --- a/docs/src/less/lib/mixins.less +++ b/docs/src/less/lib/mixins.less @@ -5,38 +5,38 @@ // Contain floats: nicolasgallagher.com/micro-clearfix-hack/ // --------------------------------------- .clearfix() { - zoom: 1; - &:before, - &:after { content: ""; display: table; } - &:after { clear: both; } + zoom: 1; + &:before, + &:after { content: ""; display: table; } + &:after { clear: both; } } // Webkit-style focus // --------------------------------------- .tab-focus() { - // Default - outline: thin dotted @gray-dark; - // Webkit - //outline: 5px auto -webkit-focus-ring-color; - outline-offset: 1px; + // Default + outline: thin dotted @gray-dark; + // Webkit + //outline: 5px auto -webkit-focus-ring-color; + outline-offset: 1px; } // Use rems for font sizing // Leave <body> at 100%/16px // --------------------------------------- .font-size(@font-size: 16){ - @rem: round((@font-size / 16), 1); - font-size: (@font-size * 1px); - font-size: ~"@{rem}rem"; + @rem: round((@font-size / 16), 1); + font-size: (@font-size * 1px); + font-size: ~"@{rem}rem"; } // Font smoothing // --------------------------------------- .font-smoothing(@mode: on) when (@mode = on) { - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; } .font-smoothing(@mode: on) when (@mode = off) { - -moz-osx-font-smoothing: auto; - -webkit-font-smoothing: subpixel-antialiased; + -moz-osx-font-smoothing: auto; + -webkit-font-smoothing: subpixel-antialiased; }
\ No newline at end of file |