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-03-31 03:28:16 +01:00
parent da7fc7d901 39d4aa7b13
commit 373cda1121
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,3 @@
<% provide(:title, 'Jamkazam Password Changed') %>
You just changed your password at Jamkazam.
You just changed your password at JamKazam.

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

@ -604,7 +604,7 @@ table.audiogeartable {
left:10px;
width:150px;
height:18px;
background-image:url(../images/content/bkg_slider_gain_horiz.png);
background-image:url(/assets/content/bkg_slider_gain_horiz.png);
background-repeat:repeat-x;
}

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

@ -219,7 +219,7 @@
.share-message {
width: 100%;
padding:0;
padding:4px;
}
.error-msg {

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

@ -242,7 +242,7 @@ Version: 1.1
.carousel .slides .spinner
{
background : #000 url(loading.gif) no-repeat center; /* video preloader */
background : #000 /*url(loading.gif)*/ no-repeat center; /* video preloader */
}
/* _____________________________ *