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

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-02-14 23:10:51 -06:00
parent 9f7dfa4fcc c02bc4e872
commit 7dd0751409
22 changed files with 76 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/app/views/admin/recordings/_form.html.haml
View File

@ -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

2
admin/config/application.rb
View File

@ -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.

2
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
View File

@ -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;" %>
<p>
<table bgcolor="#242323" cellpadding="3px" cellspacing="5px">
<% @new_nearby.each do |user| %>

2
web/app/assets/javascripts/session.js
View File

@ -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);

7
web/app/assets/javascripts/utils.js
View File

@ -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'
}
};

5
web/app/assets/stylesheets/client/band.css.scss
View File

@ -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 {

1
web/app/assets/stylesheets/client/content-orig.css.scss
View File

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

5
web/app/assets/stylesheets/client/profile.css.scss
View File

@ -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 {

3
web/app/assets/stylesheets/client/screen_common.css.scss
View File

@ -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;

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

@ -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;

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

@ -175,7 +175,6 @@
}
.chat-select select {
font-family:Raleway;
font-size:12px;
color:$ColorSidebarText;
background-color:shade($ColorElementPrimary, 20);

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

@ -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 {

2
web/app/views/artifacts/versioncheck.html.erb
View File

@ -1,5 +1,5 @@
<!-- modeled after dialog in original client -->
<table style="background: #262626; color: white; font-family: Raleway, Arial, Helvetica, sans-serif;">
<table style="background: #262626; color: white; ">
<tr>
<td width=70><%= image_tag "logo.png" %></td>
<td><h1>New version available</h1>

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

@ -6,7 +6,16 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>
<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" %>
<%= stylesheet_link_tag "client/faders", media: "all" %>

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

@ -5,7 +5,16 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>
<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/client", media: "all" %>
<% if bugsnag? %>
<!-- THIS NEEDS TO BE IN FRONT OF ANY OTHER JAVASCRIPT INCLUDES ACCORDING TO BUGSNAG -->

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

@ -2,7 +2,16 @@
<html>
<head>
<title><%= full_title(yield(:title)) %></title>
<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>
<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'>-->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<%= stylesheet_link_tag "corp/corporate", :media => "all" %>
<% if bugsnag? %>

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

@ -6,7 +6,16 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>
<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 "landing/landing", media: "all" %>
<% if bugsnag? %>
<!-- THIS NEEDS TO BE IN FRONT OF ANY OTHER JAVASCRIPT INCLUDES ACCORDING TO BUGSNAG -->

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

@ -6,7 +6,16 @@
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="css/ie.css" media="screen, projection"/>
<![endif]-->
<link href='http://fonts.googleapis.com/css?family=Raleway:100,200,300,400,500,600,700' rel='stylesheet' type='text/css'>
<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 "web/web", media: "all" %>
<% if bugsnag? %>
<!-- THIS NEEDS TO BE IN FRONT OF ANY OTHER JAVASCRIPT INCLUDES ACCORDING TO BUGSNAG -->