Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: icidasset/ongaku_ryoho
base: 3ac0d9eb45
...
head fork: icidasset/ongaku_ryoho
compare: 2417a9c670
  • 3 commits
  • 23 files changed
  • 0 commit comments
  • 1 contributor
Showing with 172 additions and 120 deletions.
  1. +1 −1  Gemfile
  2. +2 −2 Gemfile.lock
  3. +22 −28 app/assets/javascripts/_helpers.js
  4. +1 −0  app/assets/javascripts/application.js
  5. +15 −15 app/assets/javascripts/views/controller_view.js
  6. +2 −3 app/assets/javascripts/views/playlist_view.js
  7. +1 −1  app/assets/javascripts/views/source_manager_view.js
  8. +2 −2 app/assets/javascripts/views/track_list_view.js
  9. +2 −0  app/assets/stylesheets/application.css.scss
  10. +1 −4 app/assets/stylesheets/application/controller.css.scss
  11. +8 −0 app/assets/stylesheets/application/general.css.scss
  12. +43 −0 app/assets/stylesheets/application/message_center.css.scss
  13. +3 −2 app/assets/stylesheets/application/playlist.css.scss
  14. +1 −1  app/assets/stylesheets/base.css.scss
  15. +1 −0  app/assets/stylesheets/sessions.css.scss
  16. +2 −2 app/assets/stylesheets/sessions/general.css.scss
  17. +1 −0  app/views/default/_message_center.html.slim
  18. +1 −1  app/views/default/_playlist.html.slim
  19. +5 −1 app/views/default/index.html.slim
  20. +1 −1  app/views/layouts/default.html.slim
  21. +0 −1  app/views/layouts/sessions.html.slim
  22. +2 −0  vendor/assets/javascripts/spin.js
  23. +55 −55 vendor/assets/stylesheets/fonts/stylesheet.css
View
2  Gemfile
@@ -21,7 +21,7 @@ end
gem 'slim'
gem 'rails-backbone'
-gem 'fugue_icons_rails'
+gem 'fugue_icons_shadowless_rails'
group :test do
gem 'turn', '0.8.2', :require => false
View
4 Gemfile.lock
@@ -78,7 +78,7 @@ GEM
multipart-post (~> 1.1)
rack (~> 1.1)
fssm (0.2.9)
- fugue_icons_rails (3.3.4.1)
+ fugue_icons_shadowless_rails (3.3.4.2)
railties (>= 3.1.0)
hike (1.2.1)
i18n (0.6.0)
@@ -181,7 +181,7 @@ DEPENDENCIES
daemons
delayed_job
delayed_job_mongo_mapper!
- fugue_icons_rails
+ fugue_icons_shadowless_rails
mongo_mapper
rack
rails (~> 3.2)
View
50 app/assets/javascripts/_helpers.js
@@ -2,38 +2,11 @@ var helpers = {
/**************************************
- * Mouse interactions
- */
- mouse_interactions : {
-
- focus : function(e) {
- var t = e.target;
- if (t.value === t.defaultValue) { $(this).val(''); }
- },
-
- blur : function(e) {
- var t = e.target;
-
- if (t.value === t.defaultValue || t.value === '') {
- $(this).removeClass('dont');
-
- } else {
- $(this).addClass('dont');
-
- }
-
- if (t.value === '') { $(this).val(t.defaultValue); }
- }
-
- },
-
-
- /**************************************
* CSS Helpers
*/
css : {
- rotate: function($el, degrees) {
+ rotate : function($el, degrees) {
var css;
css = {};
@@ -46,6 +19,27 @@ var helpers = {
$el.css(css);
}
+ },
+
+
+ /**************************************
+ * Loading animation
+ */
+ add_loading_animation : function($target) {
+ var opts = {
+ lines: 6,
+ length: 3,
+ width: 1,
+ radius: 3,
+ rotate: 90,
+ color: '#fff',
+ speed: 1,
+ trail: 60,
+ shadow: false
+ },
+
+ spinner = new Spinner(opts).spin($target[0]);
+ return spinner;
}
View
1  app/assets/javascripts/application.js
@@ -23,6 +23,7 @@
//= require 'chosen'
//= require 'noisy'
//= require 'labelify'
+//= require 'spin'
//= require 'soundmanager2/soundmanager2'
//= provide 'soundmanager2/dependencies'
View
30 app/assets/javascripts/views/controller_view.js
@@ -327,27 +327,27 @@ OngakuRyoho.Views.Controller = Backbone.View.extend({
$knobs = $controls.find('a .knob');
// play/pause button
- $buttons.filter('.play-pause').bind('click', this.button_playpause_click_handler);
+ $buttons.filter('.play-pause').on('click', this.button_playpause_click_handler);
// previous and next
$button_columns.filter('.previous-next')
.children('.btn.previous')
- .bind('click', this.button_previous_click_handler).end()
+ .on('click', this.button_previous_click_handler).end()
.children('.btn.next')
- .bind('click', this.button_next_click_handler);
+ .on('click', this.button_next_click_handler);
// shuffle
- $switches.filter('.shuffle').bind('click', this.switch_shuffle_click_handler);
+ $switches.filter('.shuffle').on('click', this.switch_shuffle_click_handler);
// repeat
- $switches.filter('.repeat').bind('click', this.switch_repeat_click_handler);
+ $switches.filter('.repeat').on('click', this.switch_repeat_click_handler);
// volume
$knobs.filter('.volume')
- .bind('mousedown', this.knob_volume_mousedown_handler)
- .bind('dblclick', this.knob_volume_doubleclick_handler);
+ .on('mousedown', this.knob_volume_mousedown_handler)
+ .on('dblclick', this.knob_volume_doubleclick_handler);
- $switches.filter('.volume').bind('click', this.switch_volume_click_handler);
+ $switches.filter('.volume').on('click', this.switch_volume_click_handler);
},
@@ -518,9 +518,9 @@ OngakuRyoho.Views.Controller = Backbone.View.extend({
knob_volume_mousedown_handler : function(e) {
- $(e.currentTarget).unbind('mousedown', this.knob_volume_mousedown_handler);
- $(document).bind('mousemove', this.document_mousemove_handler_for_volume_knob);
- $(document).bind('mouseup', this.document_mouseup_handler_for_volume_knob);
+ $(e.currentTarget).off('mousedown', this.knob_volume_mousedown_handler);
+ $(document).on('mousemove', this.document_mousemove_handler_for_volume_knob);
+ $(document).on('mouseup', this.document_mouseup_handler_for_volume_knob);
},
@@ -556,13 +556,13 @@ OngakuRyoho.Views.Controller = Backbone.View.extend({
document_mouseup_handler_for_volume_knob : function(e) {
// unbind
- $(document).unbind('mousemove', this.document_mousemove_handler_for_volume_knob);
- $(document).unbind('mouseup', this.document_mouseup_handler_for_volume_knob);
+ $(document).off('mousemove', this.document_mousemove_handler_for_volume_knob);
+ $(document).off('mouseup', this.document_mouseup_handler_for_volume_knob);
// rebind
this.$el
.find('.controls .knob.volume')
- .bind('mousedown', this.knob_volume_mousedown_handler);
+ .on('mousedown', this.knob_volume_mousedown_handler);
},
@@ -605,7 +605,7 @@ OngakuRyoho.Views.Controller = Backbone.View.extend({
*/
setup_progress_bar : function() {
// mouse events
- this.$progress_bar.parent().bind('click', this.progress_bar_click_handler);
+ this.$progress_bar.parent().on('click', this.progress_bar_click_handler);
},
View
5 app/assets/javascripts/views/playlist_view.js
@@ -38,9 +38,8 @@ OngakuRyoho.Views.Playlist = Backbone.View.extend({
* Search
*/
setup_search : function() {
- // mouse interactions
- this.$search.bind('focus', helpers.mouse_interactions.focus)
- .bind('blur', helpers.mouse_interactions.blur);
+ // labelify
+ this.$search.labelify();
// change
this.$search.on('change', this.search_input_change);
View
2  app/assets/javascripts/views/source_manager_view.js
@@ -45,7 +45,7 @@ OngakuRyoho.Views.SourceManager = Backbone.View.extend({
$select.chosen();
// when the 'source selection' has changed
- $select.bind('change', function() {
+ $select.on('change', function() {
var $t = $(this),
klass = '.' + $t.val();
View
4 app/assets/javascripts/views/track_list_view.js
@@ -12,10 +12,10 @@ OngakuRyoho.Views.TrackListView = Backbone.View.extend({
_.bindAll(this, 'render', 'resize', 'activate_scrollbar', 'add_playing_class_to_track');
this.collection = Tracks;
- this.collection.bind('reset', this.render);
+ this.collection.on('reset', this.render);
// track list (window) resize
- $(window).bind('resize', this.resize)
+ $(window).on('resize', this.resize)
.trigger('resize');
},
View
2  app/assets/stylesheets/application.css.scss
@@ -16,6 +16,7 @@
@import 'compass';
@import 'reset';
@import 'chosen';
+@import 'fonts/stylesheet';
@import 'base';
@import 'scrollbar';
@@ -24,3 +25,4 @@
@import 'application/controller';
@import 'application/playlist';
@import 'application/source_manager';
+@import 'application/message_center';
View
5 app/assets/stylesheets/application/controller.css.scss
@@ -1,10 +1,7 @@
$button_height: 52px;
#controller {
- left: 0;
- position: absolute;
- top: 0;
- width: $controller_width;
+ position: relative;
-webkit-font-smoothing: antialiased;
View
8 app/assets/stylesheets/application/general.css.scss
@@ -1,3 +1,11 @@
body {
@include disable-user-select;
+}
+
+#wrapper aside {
+ display: block;
+ left: 0;
+ position: absolute;
+ top: 0;
+ width: $controller_width;
}
View
43 app/assets/stylesheets/application/message_center.css.scss
@@ -0,0 +1,43 @@
+#message-center {
+ margin-top: 26px;
+
+ @include alternate-font;
+
+ .message {
+ border: 1px dashed rgba(#fff, .17);
+ color: rgba(#fff, .6);
+ font-size: 11px;
+ line-height: 20px;
+ margin-bottom: 4px;
+ padding: 14px 17px 13px;
+ position: relative;
+
+ & > div { display: none }
+ }
+
+ i {
+ background-position: center bottom;
+ background-repeat: no-repeat;
+ display: inline-block;
+ height: 16px;
+ margin-right: 9px;
+ position: relative;
+ top: 4px;
+ width: 16px;
+
+ @include opacity(.8);
+ }
+
+ .message.loading { padding-left: 42px }
+ .message.loading > div {
+ bottom: 0;
+ display: block;
+ left: 17px;
+ position: absolute;
+ top: 0;
+ width: 16px;
+
+ @include opacity(.8);
+ }
+
+}
View
5 app/assets/stylesheets/application/playlist.css.scss
@@ -92,14 +92,15 @@ $track_height : 28px;
input {
background: none;
border: none;
- color: #6c7075;
+ color: #b6babf;
display: block;
padding: 0 34px 0 7px;
width: 100%;
@include box-sizing(border-box);
- &.dont, &:focus { color: #b6babf; outline: none }
+ &:focus { outline: none }
+ &.labelify { color: #6c7075 }
}
.input-wrap.search {
View
2  app/assets/stylesheets/base.css.scss
@@ -37,7 +37,7 @@ body {
margin: $body_margin;
overflow: hidden;
- @include background-image(linear-gradient(#644E74, #724562, darken(#9B5161, 2%) ));
+ @include background-image(linear-gradient(#644E74, #724562, #944D5D));
}
#wrapper {
View
1  app/assets/stylesheets/sessions.css.scss
@@ -15,6 +15,7 @@
@import 'compass';
@import 'reset';
+@import 'fonts/stylesheet';
@import 'base';
@import 'scrollbar';
View
4 app/assets/stylesheets/sessions/general.css.scss
@@ -38,12 +38,12 @@ h1 {
}
.flash.alert {
- i { background-image: image-url('fugue-icons/user-gray.png') }
+ i { background-image: image-url('fugue-icons-shadowless/user-gray.png') }
}
.flash.error {
border-color: rgba(#d41f1f, .135);
color: rgba(#d41f1f, .475);
- i { background-image: image-url('fugue-icons/fire-big.png') }
+ i { background-image: image-url('fugue-icons-shadowless/fire-big.png') }
}
View
1  app/views/default/_message_center.html.slim
@@ -0,0 +1 @@
+#message-center
View
2  app/views/default/_playlist.html.slim
@@ -13,7 +13,7 @@
a.change: span: span change
.input-wrap.search
- input type="text" name="search" value="Search"
+ input type="text" name="search" title="Search"
.icon
.list
View
6 app/views/default/index.html.slim
@@ -1,7 +1,11 @@
#wrapper
- = render 'controller'
+
= render 'playlist'
+
+ aside
+ = render 'controller'
+ = render 'message_center'
View
2  app/views/layouts/default.html.slim
@@ -12,4 +12,4 @@ html
body style=custom_background?
= yield
- = javascript_include_tag 'application'
+ = javascript_include_tag "application"
View
1  app/views/layouts/sessions.html.slim
@@ -6,7 +6,6 @@ html
title Ongaku Ryoho
- = stylesheet_link_tag "fonts/stylesheet"
= stylesheet_link_tag "sessions"
= csrf_meta_tags
View
2  vendor/assets/javascripts/spin.js
@@ -0,0 +1,2 @@
+//fgnass.github.com/spin.js#v1.2.5
+(function(a,b,c){function g(a,c){var d=b.createElement(a||"div"),e;for(e in c)d[e]=c[e];return d}function h(a){for(var b=1,c=arguments.length;b<c;b++)a.appendChild(arguments[b]);return a}function j(a,b,c,d){var g=["opacity",b,~~(a*100),c,d].join("-"),h=.01+c/d*100,j=Math.max(1-(1-a)/b*(100-h),a),k=f.substring(0,f.indexOf("Animation")).toLowerCase(),l=k&&"-"+k+"-"||"";return e[g]||(i.insertRule("@"+l+"keyframes "+g+"{"+"0%{opacity:"+j+"}"+h+"%{opacity:"+a+"}"+(h+.01)+"%{opacity:1}"+(h+b)%100+"%{opacity:"+a+"}"+"100%{opacity:"+j+"}"+"}",0),e[g]=1),g}function k(a,b){var e=a.style,f,g;if(e[b]!==c)return b;b=b.charAt(0).toUpperCase()+b.slice(1);for(g=0;g<d.length;g++){f=d[g]+b;if(e[f]!==c)return f}}function l(a,b){for(var c in b)a.style[k(a,c)||c]=b[c];return a}function m(a){for(var b=1;b<arguments.length;b++){var d=arguments[b];for(var e in d)a[e]===c&&(a[e]=d[e])}return a}function n(a){var b={x:a.offsetLeft,y:a.offsetTop};while(a=a.offsetParent)b.x+=a.offsetLeft,b.y+=a.offsetTop;return b}var d=["webkit","Moz","ms","O"],e={},f,i=function(){var a=g("style");return h(b.getElementsByTagName("head")[0],a),a.sheet||a.styleSheet}(),o={lines:12,length:7,width:5,radius:10,rotate:0,color:"#000",speed:1,trail:100,opacity:.25,fps:20,zIndex:2e9,className:"spinner",top:"auto",left:"auto"},p=function q(a){if(!this.spin)return new q(a);this.opts=m(a||{},q.defaults,o)};p.defaults={},m(p.prototype,{spin:function(a){this.stop();var b=this,c=b.opts,d=b.el=l(g(0,{className:c.className}),{position:"relative",zIndex:c.zIndex}),e=c.radius+c.length+c.width,h,i;a&&(a.insertBefore(d,a.firstChild||null),i=n(a),h=n(d),l(d,{left:(c.left=="auto"?i.x-h.x+(a.offsetWidth>>1):c.left+e)+"px",top:(c.top=="auto"?i.y-h.y+(a.offsetHeight>>1):c.top+e)+"px"})),d.setAttribute("aria-role","progressbar"),b.lines(d,b.opts);if(!f){var j=0,k=c.fps,m=k/c.speed,o=(1-c.opacity)/(m*c.trail/100),p=m/c.lines;!function q(){j++;for(var a=c.lines;a;a--){var e=Math.max(1-(j+a*p)%m*o,c.opacity);b.opacity(d,c.lines-a,e,c)}b.timeout=b.el&&setTimeout(q,~~(1e3/k))}()}return b},stop:function(){var a=this.el;return a&&(clearTimeout(this.timeout),a.parentNode&&a.parentNode.removeChild(a),this.el=c),this},lines:function(a,b){function e(a,d){return l(g(),{position:"absolute",width:b.length+b.width+"px",height:b.width+"px",background:a,boxShadow:d,transformOrigin:"left",transform:"rotate("+~~(360/b.lines*c+b.rotate)+"deg) translate("+b.radius+"px"+",0)",borderRadius:(b.width>>1)+"px"})}var c=0,d;for(;c<b.lines;c++)d=l(g(),{position:"absolute",top:1+~(b.width/2)+"px",transform:b.hwaccel?"translate3d(0,0,0)":"",opacity:b.opacity,animation:f&&j(b.opacity,b.trail,c,b.lines)+" "+1/b.speed+"s linear infinite"}),b.shadow&&h(d,l(e("#000","0 0 4px #000"),{top:"2px"})),h(a,h(d,e(b.color,"0 0 1px rgba(0,0,0,.1)")));return a},opacity:function(a,b,c){b<a.childNodes.length&&(a.childNodes[b].style.opacity=c)}}),!function(){function a(a,b){return g("<"+a+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',b)}var b=l(g("group"),{behavior:"url(#default#VML)"});!k(b,"transform")&&b.adj?(i.addRule(".spin-vml","behavior:url(#default#VML)"),p.prototype.lines=function(b,c){function f(){return l(a("group",{coordsize:e+" "+e,coordorigin:-d+" "+ -d}),{width:e,height:e})}function k(b,e,g){h(i,h(l(f(),{rotation:360/c.lines*b+"deg",left:~~e}),h(l(a("roundrect",{arcsize:1}),{width:d,height:c.width,left:c.radius,top:-c.width>>1,filter:g}),a("fill",{color:c.color,opacity:c.opacity}),a("stroke",{opacity:0}))))}var d=c.length+c.width,e=2*d,g=-(c.width+c.length)*2+"px",i=l(f(),{position:"absolute",top:g,left:g}),j;if(c.shadow)for(j=1;j<=c.lines;j++)k(j,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(j=1;j<=c.lines;j++)k(j);return h(b,i)},p.prototype.opacity=function(a,b,c,d){var e=a.firstChild;d=d.shadow&&d.lines||0,e&&b+d<e.childNodes.length&&(e=e.childNodes[b+d],e=e&&e.firstChild,e=e&&e.firstChild,e&&(e.opacity=c))}):f=k(b,"animation")}(),a.Spinner=p})(window,document);
View
110 vendor/assets/stylesheets/fonts/stylesheet.css
@@ -1,120 +1,120 @@
@font-face {
font-family: 'OstrichSansMedium';
- src: url('ostrich-regular-webfont.eot');
- src: url('ostrich-regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('ostrich-regular-webfont.woff') format('woff'),
- url('ostrich-regular-webfont.ttf') format('truetype'),
- url('ostrich-regular-webfont.svg#OstrichSansMedium') format('svg');
+ src: url('fonts/ostrich-regular-webfont.eot');
+ src: url('fonts/ostrich-regular-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/ostrich-regular-webfont.woff') format('woff'),
+ url('fonts/ostrich-regular-webfont.ttf') format('truetype'),
+ url('fonts/ostrich-regular-webfont.svg#OstrichSansMedium') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-BlackItalic-webfont.eot');
- src: url('Lato-BlackItalic-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-BlackItalic-webfont.woff') format('woff'),
- url('Lato-BlackItalic-webfont.ttf') format('truetype'),
- url('Lato-BlackItalic-webfont.svg#LatoBlackItalic') format('svg');
+ src: url('fonts/Lato-BlackItalic-webfont.eot');
+ src: url('fonts/Lato-BlackItalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-BlackItalic-webfont.woff') format('woff'),
+ url('fonts/Lato-BlackItalic-webfont.ttf') format('truetype'),
+ url('fonts/Lato-BlackItalic-webfont.svg#LatoBlackItalic') format('svg');
font-weight: bolder;
font-style: italic;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-Black-webfont.eot');
- src: url('Lato-Black-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-Black-webfont.woff') format('woff'),
- url('Lato-Black-webfont.ttf') format('truetype'),
- url('Lato-Black-webfont.svg#LatoBlack') format('svg');
+ src: url('fonts/Lato-Black-webfont.eot');
+ src: url('fonts/Lato-Black-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-Black-webfont.woff') format('woff'),
+ url('fonts/Lato-Black-webfont.ttf') format('truetype'),
+ url('fonts/Lato-Black-webfont.svg#LatoBlack') format('svg');
font-weight: bolder;
font-style: normal;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-BoldItalic-webfont.eot');
- src: url('Lato-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-BoldItalic-webfont.woff') format('woff'),
- url('Lato-BoldItalic-webfont.ttf') format('truetype'),
- url('Lato-BoldItalic-webfont.svg#LatoBoldItalic') format('svg');
+ src: url('fonts/Lato-BoldItalic-webfont.eot');
+ src: url('fonts/Lato-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-BoldItalic-webfont.woff') format('woff'),
+ url('fonts/Lato-BoldItalic-webfont.ttf') format('truetype'),
+ url('fonts/Lato-BoldItalic-webfont.svg#LatoBoldItalic') format('svg');
font-weight: bold;
font-style: italic;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-Bold-webfont.eot');
- src: url('Lato-Bold-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-Bold-webfont.woff') format('woff'),
- url('Lato-Bold-webfont.ttf') format('truetype'),
- url('Lato-Bold-webfont.svg#LatoBold') format('svg');
+ src: url('fonts/Lato-Bold-webfont.eot');
+ src: url('fonts/Lato-Bold-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-Bold-webfont.woff') format('woff'),
+ url('fonts/Lato-Bold-webfont.ttf') format('truetype'),
+ url('fonts/Lato-Bold-webfont.svg#LatoBold') format('svg');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-Italic-webfont.eot');
- src: url('Lato-Italic-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-Italic-webfont.woff') format('woff'),
- url('Lato-Italic-webfont.ttf') format('truetype'),
- url('Lato-Italic-webfont.svg#LatoItalic') format('svg');
+ src: url('fonts/Lato-Italic-webfont.eot');
+ src: url('fonts/Lato-Italic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-Italic-webfont.woff') format('woff'),
+ url('fonts/Lato-Italic-webfont.ttf') format('truetype'),
+ url('fonts/Lato-Italic-webfont.svg#LatoItalic') format('svg');
font-weight: normal;
font-style: italic;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-Regular-webfont.eot');
- src: url('Lato-Regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-Regular-webfont.woff') format('woff'),
- url('Lato-Regular-webfont.ttf') format('truetype'),
- url('Lato-Regular-webfont.svg#LatoRegular') format('svg');
+ src: url('fonts/Lato-Regular-webfont.eot');
+ src: url('fonts/Lato-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-Regular-webfont.woff') format('woff'),
+ url('fonts/Lato-Regular-webfont.ttf') format('truetype'),
+ url('fonts/Lato-Regular-webfont.svg#LatoRegular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-LightItalic-webfont.eot');
- src: url('Lato-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-LightItalic-webfont.woff') format('woff'),
- url('Lato-LightItalic-webfont.ttf') format('truetype'),
- url('Lato-LightItalic-webfont.svg#LatoLightItalic') format('svg');
+ src: url('fonts/Lato-LightItalic-webfont.eot');
+ src: url('fonts/Lato-LightItalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-LightItalic-webfont.woff') format('woff'),
+ url('fonts/Lato-LightItalic-webfont.ttf') format('truetype'),
+ url('fonts/Lato-LightItalic-webfont.svg#LatoLightItalic') format('svg');
font-weight: lighter;
font-style: italic;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-Light-webfont.eot');
- src: url('Lato-Light-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-Light-webfont.woff') format('woff'),
- url('Lato-Light-webfont.ttf') format('truetype'),
- url('Lato-Light-webfont.svg#LatoLight') format('svg');
+ src: url('fonts/Lato-Light-webfont.eot');
+ src: url('fonts/Lato-Light-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-Light-webfont.woff') format('woff'),
+ url('fonts/Lato-Light-webfont.ttf') format('truetype'),
+ url('fonts/Lato-Light-webfont.svg#LatoLight') format('svg');
font-weight: lighter;
font-style: normal;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-HairlineItalic-webfont.eot');
- src: url('Lato-HairlineItalic-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-HairlineItalic-webfont.woff') format('woff'),
- url('Lato-HairlineItalic-webfont.ttf') format('truetype'),
- url('Lato-HairlineItalic-webfont.svg#LatoHairlineItalic') format('svg');
+ src: url('fonts/Lato-HairlineItalic-webfont.eot');
+ src: url('fonts/Lato-HairlineItalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-HairlineItalic-webfont.woff') format('woff'),
+ url('fonts/Lato-HairlineItalic-webfont.ttf') format('truetype'),
+ url('fonts/Lato-HairlineItalic-webfont.svg#LatoHairlineItalic') format('svg');
font-weight: 100;
font-style: italic;
}
@font-face {
font-family: 'Lato';
- src: url('Lato-Hairline-webfont.eot');
- src: url('Lato-Hairline-webfont.eot?#iefix') format('embedded-opentype'),
- url('Lato-Hairline-webfont.woff') format('woff'),
- url('Lato-Hairline-webfont.ttf') format('truetype'),
- url('Lato-Hairline-webfont.svg#LatoHairline') format('svg');
+ src: url('fonts/Lato-Hairline-webfont.eot');
+ src: url('fonts/Lato-Hairline-webfont.eot?#iefix') format('embedded-opentype'),
+ url('fonts/Lato-Hairline-webfont.woff') format('woff'),
+ url('fonts/Lato-Hairline-webfont.ttf') format('truetype'),
+ url('fonts/Lato-Hairline-webfont.svg#LatoHairline') format('svg');
font-weight: 100;
font-style: normal;
}

No commit comments for this range

Something went wrong with that request. Please try again.