seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-3268 - use our own webfont

This commit is contained in:
Seth Call 2015-05-29 17:09:52 -05:00
parent 666fbfff2a
commit 8e75465ccd
34 changed files with 2220 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
web/app/assets/fonts/Raleway/Raleway-Bold.ttf Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Bold.woff Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Bold.woff2 Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Heavy.ttf Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Heavy.woff Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Heavy.woff2 Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Light.ttf Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Light.woff Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Light.woff2 Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Thin.ttf Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Thin.woff Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway-Thin.woff2 Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway.eot Normal file
View File

Binary file not shown.

2168
web/app/assets/fonts/Raleway/Raleway.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 121 KiB

BIN
web/app/assets/fonts/Raleway/Raleway.ttf Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway.woff Normal file
View File

Binary file not shown.

BIN
web/app/assets/fonts/Raleway/Raleway.woff2 Normal file
View File

Binary file not shown.

1
web/app/assets/stylesheets/client/client.css
View File

@ -9,6 +9,7 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require web/Raleway
*= require jquery.ui.datepicker
*= require ./ie
*= require jquery.bt

12
web/app/assets/stylesheets/client/jamkazam.css.scss
View File

@ -24,11 +24,11 @@ body {
height: 100%;
overflow: hidden;
font-size: 14px;
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
font-weight: 300;
input,textarea {
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
font-weight: 300;
}
}
@ -556,22 +556,22 @@ hr {
}
::-webkit-input-placeholder {
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
font-size:14px;
}
:-moz-placeholder { /* Firefox 18- */
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
font-size:14px;
}
::-moz-placeholder { /* Firefox 19+ */
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
font-size:14px;
}
:-ms-input-placeholder {
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
font-size:14px;
}

2
web/app/assets/stylesheets/client/metronomePlaybackModeSelect.css.scss
View File

@ -7,7 +7,7 @@
overflow:auto;
border:1px solid #ED3618;
text-align:left;
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
ul {
height:100%;
margin-left:20px;

2
web/app/assets/stylesheets/client/muteSelect.css.scss
View File

@ -8,7 +8,7 @@
overflow:auto;
border:1px solid #ED3618;
text-align:center;
font-family: Raleway, Arial, Helvetica, sans-serif;
font-family: 'Raleway', Arial, Helvetica, sans-serif;
ul {
@include vertical-align-column;
height:100%;

1
web/app/assets/stylesheets/corp/corporate.css.scss.erb
View File

@ -1,4 +1,5 @@
/**
*= require web/Raleway
*= require client/ie
*= require client/jamkazam
*= require client/header

1
web/app/assets/stylesheets/landing/landing.css
View File

@ -1,4 +1,5 @@
/**
*= require web/Raleway
*= require client/ie
*= require client/jamkazam
*= require client/screen_common

2
web/app/assets/stylesheets/landings/partner_agreement_v1.css.scss
View File

@ -4,7 +4,7 @@
* {
color:black! important;
background-color:#eee;
font-family: Raleway, Arial, Helvetica, sans-serif ! important;
font-family: 'Raleway', Arial, Helvetica, sans-serif ! important;
font-weight: 300 ! important;
}

1
web/app/assets/stylesheets/minimal/minimal.css.scss
View File

@ -1,4 +1,5 @@
/**
*= require web/Raleway
*= require client/ie
*= require client/jamkazam
*= require client/screen_common

36
web/app/assets/stylesheets/web/Raleway.css Normal file
View File

@ -0,0 +1,36 @@
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 100;
src: local('Raleway Thin'), local('Raleway-Thin'), url(/assets/raleway/Raleway-Thin.ttf) format('truetype'), url(/assets/raleway/Raleway-Thin.woff2) format('woff2'), url(/assets/raleway/Raleway-Thin.woff) format('woff');
}
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 300;
src: local('Raleway Light'), local('Raleway-Light'), url(/assets/raleway/Raleway-Light.ttf) format('truetype'), url(/assets/raleway/Raleway-Light.woff2) format('woff2'), url(/assets/raleway/Raleway-Light.woff) format('woff');
}
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 400;
src: url(/assets/raleway/Raleway.eot);
src: local('Raleway'), url(/assets/raleway/Raleway.eot?#iefix) format('embedded-opentype'), url(/assets/raleway/Raleway.svg#Raleway) format('svg'), url(/assets/raleway/Raleway.ttf) format('truetype'), url(/assets/raleway/Raleway.woff2) format('woff2'), url(/assets/raleway/Raleway.woff) format('woff');
}
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 700;
src: local('Raleway Bold'), local('Raleway-Bold'), url(/assets/raleway/Raleway-Bold.ttf) format('truetype'), url(/assets/raleway/Raleway-Bold.woff2) format('woff2'), url(/assets/raleway/Raleway-Bold.woff) format('woff');
}
@font-face {
font-family: 'Raleway';
font-style: normal;
font-weight: 900;
src: local('Raleway Heavy'), local('Raleway-Heavy'), url(/assets/raleway/Raleway-Heavy.ttf) format('truetype'), url(/assets/raleway/Raleway-Heavy.woff2) format('woff2'), url(/assets/raleway/Raleway-Heavy.woff) format('woff');
}

2
web/app/assets/stylesheets/web/web.css
View File

@ -1,4 +1,6 @@
/**
*= require ./Raleway
*= require client/jamServer
*= require client/ie
*= require client/jamkazam

9
web/app/views/layouts/application.html.erb
View File

@ -6,15 +6,6 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
<script>
WebFont.load({
google: {
families: ['Raleway:100,200,300,400,500,600,700']
},
timeout :5000
});
</script>
<!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
<%= stylesheet_link_tag "client/ie", media: "all" %>
<%= stylesheet_link_tag "client/jamkazam", media: "all" %>

11
web/app/views/layouts/client.html.erb
View File

@ -6,17 +6,6 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
<script>
if (window.WebFont) {
WebFont.load({
google: {
families: ['Raleway:100,200,300,400,500,600,700']
},
timeout :5000
});
}
</script>
<!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
<%= stylesheet_link_tag "client/client", media: "all" %>
<% if bugsnag? %>

11
web/app/views/layouts/corporate.html.erb
View File

@ -2,17 +2,6 @@
<html>
<head>
<title><%= full_title(yield(:title)) %></title>
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
<script>
if (window.WebFont) {
WebFont.load({
google: {
families: ['Raleway:100,200,300,400,500,600,700']
},
timeout :5000
});
}
</script>
<!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<%= stylesheet_link_tag "corp/corporate", :media => "all" %>

11
web/app/views/layouts/landing.html.erb
View File

@ -6,17 +6,6 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
<script>
if(window.WebFont){
WebFont.load({
google: {
families: ['Raleway:100,200,300,400,500,600,700']
},
timeout :5000
});
}
</script>
<!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
<%= stylesheet_link_tag "landing/landing", media: "all" %>
<% if bugsnag? %>

11
web/app/views/layouts/minimal.html.erb
View File

@ -6,17 +6,6 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
<script>
if (window.WebFont) {
WebFont.load({
google: {
families: ['Raleway:100,200,300,400,500,600,700']
},
timeout :5000
});
}
</script>
<!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
<%= stylesheet_link_tag "minimal/minimal", media: "all" %>
<% if bugsnag? %>

11
web/app/views/layouts/web.html.erb
View File

@ -6,17 +6,6 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
<script>
if (window.WebFont) {
WebFont.load({
google: {
families: ['Raleway:100,200,300,400,500,600,700']
},
timeout:5000
});
}
</script>
<!--<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>-->
<%= stylesheet_link_tag "web/web", media: "all" %>
<% if bugsnag? %>

2
web/public/maintenance.html
View File

@ -82,7 +82,7 @@
table { border-collapse: collapse; border-spacing: 0px; }
caption, th, td { text-align: left; font-weight: normal; vertical-align: middle; }
a img { border: medium none; }
body { color: white; background-color: rgb(38, 38, 38); width: 100%; height: 100%; overflow: hidden; font-size: 14px; font-family: Raleway,Arial,Helvetica,sans-serif; font-weight: 300; }
body { color: white; background-color: rgb(38, 38, 38); width: 100%; height: 100%; overflow: hidden; font-size: 14px; font-family: 'Raleway',Arial,Helvetica,sans-serif; font-weight: 300; }
a { cursor: pointer; color: rgb(255, 204, 0); text-decoration: none; display: inline-block; }
a:hover { text-decoration: underline; color: rgb(130, 174, 175); }
select { padding: 3px; font-size: 15px; border-radius: 6px; }