diff --git a/admin/app/views/admin/recordings/_form.html.haml b/admin/app/views/admin/recordings/_form.html.haml index 8d172f364..880f26823 100644 --- a/admin/app/views/admin/recordings/_form.html.haml +++ b/admin/app/views/admin/recordings/_form.html.haml @@ -14,7 +14,7 @@ %h3 Validations %p It should not be possible to create an invalid recording/track/mix/claim; there are a great deal of validations that will prevent you from doing something invalid. If you find otherwise, please fill out a JIRA . -= semantic_form_for([:admin, @recording], :html => {:multipart => true}, :url => @recording.new_record? ? admin_recordings_path : "/admin/recordings/#{@recording.id}") do |f| += semantic_form_for([:admin, @recording], :html => {:multipart => true}, :url => @recording.new_record? ? admin_recordings_path : "#{ENV['RAILS_RELATIVE_URL_ROOT']}/admin/recordings/#{@recording.id}") do |f| = f.semantic_errors *f.object.errors.keys = f.inputs name: 'Recording Fields' do diff --git a/admin/config/application.rb b/admin/config/application.rb index 48690b907..0ae29cd8e 100644 --- a/admin/config/application.rb +++ b/admin/config/application.rb @@ -36,7 +36,7 @@ module JamAdmin # Activate observers that should always be running. config.active_record.observers = "JamRuby::InvitedUserObserver" - #config.assets.prefix = ENV['RAILS_RELATIVE_URL_ROOT'] || '/' + config.assets.prefix = "#{ENV['RAILS_RELATIVE_URL_ROOT']}/assets" # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb index d5c91c673..1261901fa 100644 --- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb +++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb @@ -1,6 +1,6 @@ <% provide(:title, 'New JamKazam Musicians in your Area') %> -<% link_style = "background-color:#ED3618; margin:0px 8px 0px 8px; border: solid 1px #F27861; outline: solid 2px #ED3618; padding:3px 10px; font-family:raleway; font-size:12px; font-weight:300; cursor:pointer; color:#FC9; text-decoration:none;" %> +<% link_style = "background-color:#ED3618; margin:0px 8px 0px 8px; border: solid 1px #F27861; outline: solid 2px #ED3618; padding:3px 10px; font-family:Raleway, Arial, Helvetica, sans-serif; font-size:12px; font-weight:300; cursor:pointer; color:#FC9; text-decoration:none;" %>

<% @new_nearby.each do |user| %> diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js index 7540d7f75..86b82f397 100644 --- a/web/app/assets/javascripts/session.js +++ b/web/app/assets/javascripts/session.js @@ -1312,7 +1312,7 @@ } function events() { - $('#session-resync').on('click', sessionResync); + $('#session-resync').on('click', sessionResync); $('#session-contents').on("click", '[action="delete"]', deleteSession); $('#tracks').on('click', 'div[control="mute"]', toggleMute); $('#recording-start-stop').on('click', startStopRecording); diff --git a/web/app/assets/javascripts/utils.js b/web/app/assets/javascripts/utils.js index bb9927fed..1458b7d3c 100644 --- a/web/app/assets/javascripts/utils.js +++ b/web/app/assets/javascripts/utils.js @@ -126,10 +126,9 @@ padding: 8, cornerRadius: 0, cssStyles: { - fontFamily: 'Raleway, Arial, Helvetica, sans-serif', - fontSize: '11px', - color:'white', - whiteSpace:'normal' + fontSize: '11px', + color:'white', + whiteSpace:'normal' } }; diff --git a/web/app/assets/stylesheets/client/band.css.scss b/web/app/assets/stylesheets/client/band.css.scss index 7a310468e..37f40c2bb 100644 --- a/web/app/assets/stylesheets/client/band.css.scss +++ b/web/app/assets/stylesheets/client/band.css.scss @@ -152,6 +152,7 @@ font-size: 12px; font-weight: bold; margin-bottom: 2px; + padding-right:4px; } .stats { margin-top: 4px; @@ -162,6 +163,10 @@ .lcol { width: 148px; } + .whitespace { + // equal to lcol width. + padding-left: 148px; + } .instruments { width:128px; img { diff --git a/web/app/assets/stylesheets/client/content-orig.css.scss b/web/app/assets/stylesheets/client/content-orig.css.scss index 039a9e928..bdc0e4cb2 100644 --- a/web/app/assets/stylesheets/client/content-orig.css.scss +++ b/web/app/assets/stylesheets/client/content-orig.css.scss @@ -99,7 +99,6 @@ } .content-wrapper select, .content-wrapper textarea, .content-wrapper input[type=text], .content-wrapper input[type=password], div.friendbox, .ftue-inner input[type=text], .ftue-inner input[type=password], .dialog-inner textarea, .dialog-inner input[type=text] { - font-family:"Raleway", arial, sans-serif; background-color:#c5c5c5; border:none; -webkit-box-shadow: inset 2px 2px 3px 0px #888; diff --git a/web/app/assets/stylesheets/client/content.css.scss b/web/app/assets/stylesheets/client/content.css.scss index 33debfe60..058c41b21 100644 --- a/web/app/assets/stylesheets/client/content.css.scss +++ b/web/app/assets/stylesheets/client/content.css.scss @@ -214,7 +214,6 @@ .content-wrapper, .dialog, .dialog-inner, .ftue-inner { select, textarea, input[type=text], input[type=password], div.friendbox { - font-family:"Raleway", arial, sans-serif; background-color:#c5c5c5; border:none; -webkit-box-shadow: inset 2px 2px 3px 0px #888; diff --git a/web/app/assets/stylesheets/client/findSession.css.scss b/web/app/assets/stylesheets/client/findSession.css.scss index 1039c9645..cb19f37be 100644 --- a/web/app/assets/stylesheets/client/findSession.css.scss +++ b/web/app/assets/stylesheets/client/findSession.css.scss @@ -24,7 +24,6 @@ div[layout-id="findSession"] { } .session-filter select { - font-family:"Raleway", arial, sans-serif; background-color:#c5c5c5; border:none; -webkit-box-shadow: inset 2px 2px 3px 0px #888; diff --git a/web/app/assets/stylesheets/client/invitationDialog.css.scss b/web/app/assets/stylesheets/client/invitationDialog.css.scss index 78c5bbe0c..6b15927df 100644 --- a/web/app/assets/stylesheets/client/invitationDialog.css.scss +++ b/web/app/assets/stylesheets/client/invitationDialog.css.scss @@ -10,7 +10,6 @@ } .invitation-overlay textarea { - font-family:"Raleway", arial, sans-serif; background-color:#c5c5c5; border:none; -webkit-box-shadow: inset 2px 2px 3px 0px #888; diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss index 0d6321bb4..305eba56f 100644 --- a/web/app/assets/stylesheets/client/jamkazam.css.scss +++ b/web/app/assets/stylesheets/client/jamkazam.css.scss @@ -11,14 +11,20 @@ @import "client/common.css.scss"; +html.wf-inactive { + body { + font-family: Arial, Helvetica, sans-serif; + } +} + body { color: $ColorText; background-color: $ColorUIBackground; width: 100%; height: 100%; overflow: hidden; - font-family: Raleway, Arial, Helvetica, sans-serif; font-size: 14px; + font-family: Raleway, Arial, Helvetica, sans-serif; font-weight: 300; } @@ -104,7 +110,6 @@ input[type="button"] { border: solid 1px #868686; outline:solid 2px #666; padding:3px 10px; - font-family:raleway; font-size:12px; font-weight:300; cursor:pointer; diff --git a/web/app/assets/stylesheets/client/profile.css.scss b/web/app/assets/stylesheets/client/profile.css.scss index 9e24ce83b..7ea0f6f47 100644 --- a/web/app/assets/stylesheets/client/profile.css.scss +++ b/web/app/assets/stylesheets/client/profile.css.scss @@ -211,6 +211,7 @@ font-size: 12px; font-weight: bold; margin-bottom: 2px; + padding-right:4px; } .stats { margin-top: 4px; @@ -221,6 +222,10 @@ .lcol { width: 148px; } + .whitespace { + // equal to lcol width. + padding-left: 148px; + } .instruments { width:128px; img { diff --git a/web/app/assets/stylesheets/client/screen_common.css.scss b/web/app/assets/stylesheets/client/screen_common.css.scss index fbc3dbdf9..4181455be 100644 --- a/web/app/assets/stylesheets/client/screen_common.css.scss +++ b/web/app/assets/stylesheets/client/screen_common.css.scss @@ -150,7 +150,6 @@ textarea { /* Start of Jeff's common.css file */ body { - font-family: Raleway, Arial, Helvetica, sans-serif; font-size: 14px; font-weight: 300; color: #FFF; @@ -178,7 +177,6 @@ small, .small {font-size:11px;} border: solid 1px #868686; outline:solid 2px #666; padding:3px 10px; - font-family:raleway; font-size:12px; font-weight:300; cursor:pointer; @@ -198,7 +196,6 @@ small, .small {font-size:11px;} border: solid 1px #F27861; outline: solid 2px #ED3618; padding:3px 10px; - font-family:raleway; font-size:12px; font-weight:300; cursor:pointer; diff --git a/web/app/assets/stylesheets/client/session.css.scss b/web/app/assets/stylesheets/client/session.css.scss index fc455d55a..90dc9d1f6 100644 --- a/web/app/assets/stylesheets/client/session.css.scss +++ b/web/app/assets/stylesheets/client/session.css.scss @@ -19,7 +19,6 @@ .audio-devices { - font-family:"Raleway", arial, sans-serif; border:none; -webkit-box-shadow: inset 2px 2px 3px 0px #888; box-shadow: inset 2px 2px 3px 0px #888; diff --git a/web/app/assets/stylesheets/client/sidebar.css.scss b/web/app/assets/stylesheets/client/sidebar.css.scss index 2d42dcdec..16630b93c 100644 --- a/web/app/assets/stylesheets/client/sidebar.css.scss +++ b/web/app/assets/stylesheets/client/sidebar.css.scss @@ -175,7 +175,6 @@ } .chat-select select { - font-family:Raleway; font-size:12px; color:$ColorSidebarText; background-color:shade($ColorElementPrimary, 20); diff --git a/web/app/assets/stylesheets/corp/corporate.css.scss.erb b/web/app/assets/stylesheets/corp/corporate.css.scss.erb index d0d067896..668403804 100644 --- a/web/app/assets/stylesheets/corp/corporate.css.scss.erb +++ b/web/app/assets/stylesheets/corp/corporate.css.scss.erb @@ -128,7 +128,7 @@ body.corporate input[type=text], body.corporate textarea{ border: medium none; box-shadow: 2px 2px 3px 0 #888888 inset; color: #666666; - font-family: "Raleway",arial,sans-serif; + } body.corporate #contact-submit { diff --git a/web/app/views/artifacts/versioncheck.html.erb b/web/app/views/artifacts/versioncheck.html.erb index 417e14a28..cfc38032f 100644 --- a/web/app/views/artifacts/versioncheck.html.erb +++ b/web/app/views/artifacts/versioncheck.html.erb @@ -1,5 +1,5 @@ -
+
<%= image_tag "logo.png" %>

New version available

diff --git a/web/app/views/layouts/application.html.erb b/web/app/views/layouts/application.html.erb index 851374485..975d3d55e 100644 --- a/web/app/views/layouts/application.html.erb +++ b/web/app/views/layouts/application.html.erb @@ -6,7 +6,16 @@ - + + + <%= stylesheet_link_tag "client/ie", media: "all" %> <%= stylesheet_link_tag "client/jamkazam", media: "all" %> <%= stylesheet_link_tag "client/faders", media: "all" %> diff --git a/web/app/views/layouts/client.html.erb b/web/app/views/layouts/client.html.erb index 0f500f827..ed645fe5b 100644 --- a/web/app/views/layouts/client.html.erb +++ b/web/app/views/layouts/client.html.erb @@ -5,7 +5,16 @@ - + + + <%= 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 a7016fcb3..b15738de9 100644 --- a/web/app/views/layouts/corporate.html.erb +++ b/web/app/views/layouts/corporate.html.erb @@ -2,7 +2,16 @@ <%= full_title(yield(:title)) %> - + + + <%= stylesheet_link_tag "corp/corporate", :media => "all" %> <% if bugsnag? %> diff --git a/web/app/views/layouts/landing.erb b/web/app/views/layouts/landing.erb index 1dca6a7dd..54c6ef95a 100644 --- a/web/app/views/layouts/landing.erb +++ b/web/app/views/layouts/landing.erb @@ -6,7 +6,16 @@ - + + + <%= stylesheet_link_tag "landing/landing", media: "all" %> <% if bugsnag? %> diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb index effb7a281..ffb8878f2 100644 --- a/web/app/views/layouts/web.erb +++ b/web/app/views/layouts/web.erb @@ -6,7 +6,16 @@ - + + + <%= stylesheet_link_tag "web/web", media: "all" %> <% if bugsnag? %>