diff --git a/web/app/assets/fonts/Raleway/Raleway-Bold.ttf b/web/app/assets/fonts/Raleway/Raleway-Bold.ttf new file mode 100644 index 000000000..adc44af0b Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Bold.ttf differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Bold.woff b/web/app/assets/fonts/Raleway/Raleway-Bold.woff new file mode 100644 index 000000000..f4e18af9e Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Bold.woff differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Bold.woff2 b/web/app/assets/fonts/Raleway/Raleway-Bold.woff2 new file mode 100644 index 000000000..a7f145791 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Bold.woff2 differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Heavy.ttf b/web/app/assets/fonts/Raleway/Raleway-Heavy.ttf new file mode 100644 index 000000000..b32bcf64c Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Heavy.ttf differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Heavy.woff b/web/app/assets/fonts/Raleway/Raleway-Heavy.woff new file mode 100644 index 000000000..9177ea802 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Heavy.woff differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Heavy.woff2 b/web/app/assets/fonts/Raleway/Raleway-Heavy.woff2 new file mode 100644 index 000000000..6f1e37f42 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Heavy.woff2 differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Light.ttf b/web/app/assets/fonts/Raleway/Raleway-Light.ttf new file mode 100644 index 000000000..5362e52fe Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Light.ttf differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Light.woff b/web/app/assets/fonts/Raleway/Raleway-Light.woff new file mode 100644 index 000000000..85f92d954 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Light.woff differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Light.woff2 b/web/app/assets/fonts/Raleway/Raleway-Light.woff2 new file mode 100644 index 000000000..8e8ac1f40 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Light.woff2 differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Thin.ttf b/web/app/assets/fonts/Raleway/Raleway-Thin.ttf new file mode 100644 index 000000000..3721c39af Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Thin.ttf differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Thin.woff b/web/app/assets/fonts/Raleway/Raleway-Thin.woff new file mode 100644 index 000000000..115b34776 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Thin.woff differ diff --git a/web/app/assets/fonts/Raleway/Raleway-Thin.woff2 b/web/app/assets/fonts/Raleway/Raleway-Thin.woff2 new file mode 100644 index 000000000..d3e82a0f6 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway-Thin.woff2 differ diff --git a/web/app/assets/fonts/Raleway/Raleway.eot b/web/app/assets/fonts/Raleway/Raleway.eot new file mode 100644 index 000000000..fc7ce0746 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway.eot differ diff --git a/web/app/assets/fonts/Raleway/Raleway.svg b/web/app/assets/fonts/Raleway/Raleway.svg new file mode 100644 index 000000000..92afeb5d6 --- /dev/null +++ b/web/app/assets/fonts/Raleway/Raleway.svg @@ -0,0 +1,2168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/app/assets/fonts/Raleway/Raleway.ttf b/web/app/assets/fonts/Raleway/Raleway.ttf new file mode 100644 index 000000000..3b354c87e Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway.ttf differ diff --git a/web/app/assets/fonts/Raleway/Raleway.woff b/web/app/assets/fonts/Raleway/Raleway.woff new file mode 100644 index 000000000..02b0dd8f5 Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway.woff differ diff --git a/web/app/assets/fonts/Raleway/Raleway.woff2 b/web/app/assets/fonts/Raleway/Raleway.woff2 new file mode 100644 index 000000000..35e3dbeee Binary files /dev/null and b/web/app/assets/fonts/Raleway/Raleway.woff2 differ diff --git a/web/app/assets/stylesheets/client/client.css b/web/app/assets/stylesheets/client/client.css index 48b6cbfc7..1b1c05606 100644 --- a/web/app/assets/stylesheets/client/client.css +++ b/web/app/assets/stylesheets/client/client.css @@ -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 diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss index 105946377..af98aad9a 100644 --- a/web/app/assets/stylesheets/client/jamkazam.css.scss +++ b/web/app/assets/stylesheets/client/jamkazam.css.scss @@ -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; } diff --git a/web/app/assets/stylesheets/client/metronomePlaybackModeSelect.css.scss b/web/app/assets/stylesheets/client/metronomePlaybackModeSelect.css.scss index 7700a57be..79d52c274 100644 --- a/web/app/assets/stylesheets/client/metronomePlaybackModeSelect.css.scss +++ b/web/app/assets/stylesheets/client/metronomePlaybackModeSelect.css.scss @@ -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; diff --git a/web/app/assets/stylesheets/client/muteSelect.css.scss b/web/app/assets/stylesheets/client/muteSelect.css.scss index bd73ce571..c155de69d 100644 --- a/web/app/assets/stylesheets/client/muteSelect.css.scss +++ b/web/app/assets/stylesheets/client/muteSelect.css.scss @@ -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%; diff --git a/web/app/assets/stylesheets/corp/corporate.css.scss.erb b/web/app/assets/stylesheets/corp/corporate.css.scss.erb index 640360bd1..f7e8907f2 100644 --- a/web/app/assets/stylesheets/corp/corporate.css.scss.erb +++ b/web/app/assets/stylesheets/corp/corporate.css.scss.erb @@ -1,4 +1,5 @@ /** +*= require web/Raleway *= require client/ie *= require client/jamkazam *= require client/header diff --git a/web/app/assets/stylesheets/landing/landing.css b/web/app/assets/stylesheets/landing/landing.css index c3ce73d41..a37a24675 100644 --- a/web/app/assets/stylesheets/landing/landing.css +++ b/web/app/assets/stylesheets/landing/landing.css @@ -1,4 +1,5 @@ /** +*= require web/Raleway *= require client/ie *= require client/jamkazam *= require client/screen_common diff --git a/web/app/assets/stylesheets/landings/partner_agreement_v1.css.scss b/web/app/assets/stylesheets/landings/partner_agreement_v1.css.scss index 4adb0e548..647f77f9a 100644 --- a/web/app/assets/stylesheets/landings/partner_agreement_v1.css.scss +++ b/web/app/assets/stylesheets/landings/partner_agreement_v1.css.scss @@ -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; } diff --git a/web/app/assets/stylesheets/minimal/minimal.css.scss b/web/app/assets/stylesheets/minimal/minimal.css.scss index 9ec8c234a..f97d05c7f 100644 --- a/web/app/assets/stylesheets/minimal/minimal.css.scss +++ b/web/app/assets/stylesheets/minimal/minimal.css.scss @@ -1,4 +1,5 @@ /** +*= require web/Raleway *= require client/ie *= require client/jamkazam *= require client/screen_common diff --git a/web/app/assets/stylesheets/web/Raleway.css b/web/app/assets/stylesheets/web/Raleway.css new file mode 100644 index 000000000..e7c9f1caf --- /dev/null +++ b/web/app/assets/stylesheets/web/Raleway.css @@ -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'); +} + diff --git a/web/app/assets/stylesheets/web/web.css b/web/app/assets/stylesheets/web/web.css index 4a5ad0b12..12c614f5c 100644 --- a/web/app/assets/stylesheets/web/web.css +++ b/web/app/assets/stylesheets/web/web.css @@ -1,4 +1,6 @@ /** + +*= require ./Raleway *= require client/jamServer *= require client/ie *= require client/jamkazam diff --git a/web/app/views/layouts/application.html.erb b/web/app/views/layouts/application.html.erb index 26046c3f6..f97aca179 100644 --- a/web/app/views/layouts/application.html.erb +++ b/web/app/views/layouts/application.html.erb @@ -6,15 +6,6 @@ - - <%= stylesheet_link_tag "client/ie", media: "all" %> <%= stylesheet_link_tag "client/jamkazam", media: "all" %> diff --git a/web/app/views/layouts/client.html.erb b/web/app/views/layouts/client.html.erb index dd7d51a9b..033716248 100644 --- a/web/app/views/layouts/client.html.erb +++ b/web/app/views/layouts/client.html.erb @@ -6,17 +6,6 @@ - - <%= stylesheet_link_tag "client/client", media: "all" %> <% if bugsnag? %> diff --git a/web/app/views/layouts/corporate.html.erb b/web/app/views/layouts/corporate.html.erb index 763a78c93..5269a3781 100644 --- a/web/app/views/layouts/corporate.html.erb +++ b/web/app/views/layouts/corporate.html.erb @@ -2,17 +2,6 @@ <%= full_title(yield(:title)) %> - - <%= stylesheet_link_tag "corp/corporate", :media => "all" %> diff --git a/web/app/views/layouts/landing.html.erb b/web/app/views/layouts/landing.html.erb index e3c655fb0..51f1deab4 100644 --- a/web/app/views/layouts/landing.html.erb +++ b/web/app/views/layouts/landing.html.erb @@ -6,17 +6,6 @@ - - <%= stylesheet_link_tag "landing/landing", media: "all" %> <% if bugsnag? %> diff --git a/web/app/views/layouts/minimal.html.erb b/web/app/views/layouts/minimal.html.erb index 37bf88c9e..a4ab7f0d4 100644 --- a/web/app/views/layouts/minimal.html.erb +++ b/web/app/views/layouts/minimal.html.erb @@ -6,17 +6,6 @@ - - <%= stylesheet_link_tag "minimal/minimal", media: "all" %> <% if bugsnag? %> diff --git a/web/app/views/layouts/web.html.erb b/web/app/views/layouts/web.html.erb index 929e8d7ed..dfc3916de 100644 --- a/web/app/views/layouts/web.html.erb +++ b/web/app/views/layouts/web.html.erb @@ -6,17 +6,6 @@ - - <%= stylesheet_link_tag "web/web", media: "all" %> <% if bugsnag? %> diff --git a/web/public/maintenance.html b/web/public/maintenance.html index d0641191d..2edb104cc 100644 --- a/web/public/maintenance.html +++ b/web/public/maintenance.html @@ -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; }