Skip to content

Commit

Permalink
modified: Rakefile
Browse files Browse the repository at this point in the history
modified:   app/controllers/media_controller.rb
modified:   config.ru
modified:   config/application.rb
modified:   config/environment.rb
modified:   config/environments/development.rb
modified:   config/environments/production.rb
modified:   config/environments/test.rb
modified:   config/initializers/secret_token.rb
modified:   config/initializers/session_store.rb
modified:   config/settings.rb
modified:   lib/modules/cache.rb
modified:   lib/tasks/qubar-beginagain-task.rake
	-- renamed Qubar abbreviation to more generic Baw (bio-acoustic workbench)

modified:   config/routes.rb
	-- added an angular catch all route that redirects to master view unless a html request for assets, or a api call. Closes 48.

modified:   app/assets/stylesheets/base.css.scss
modified:   app/assets/stylesheets/layout.css.scss
modified:   app/assets/stylesheets/projects.css.scss
	-- fixed a couple of css bugs
  • Loading branch information
atruskie committed Nov 12, 2012
1 parent a4ec467 commit 07f214e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 13 deletions.
9 changes: 6 additions & 3 deletions app/assets/stylesheets/base.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $master-complementary: #4A2B66 #73305F #34346A;

$standard-padding-horizontal: 0.5em;
$standard-padding-vertical: 0.25em;
$standrd-padding: $standard-padding-vertical $standard-padding-horizontal;
$standard-padding: $standard-padding-vertical $standard-padding-horizontal;


/*
Expand Down Expand Up @@ -51,15 +51,18 @@ $standrd-padding: $standard-padding-vertical $standard-padding-horiz
}

.ui-show {
@extend .standard-transition;
//@extend .standard-transition;

}
.ui-hide {
opacity: 0;
@extend .standard-transition;
//@extend .standard-transition;
display: none;

}



/*
*
* Styles
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/layout.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ a {
color: nth($master-dark-2, 1);;
}

&:hover{
&:hover {
text-decoration: none;
color: nth($master-highlight, 1);
}
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/projects.css.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
& div{
vertical-align: top;
display: inline-block;
padding: $standrd-padding;
padding: $standard-padding;

}

& img{
padding: $standrd-padding;
padding: $standard-padding;

display: inline-block;
}
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/media_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class MediaController < ApplicationController

def index
# index page for media files
#@testing = QubarSite::Application.config.media_file_config
#@testing = BawSite::Application.config.media_file_config
end

def item
Expand Down
10 changes: 5 additions & 5 deletions lib/modules/cache.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def self.original_audio_file(modify_parameters = {})

# get all the storage paths for original audio
def self.original_audio_storage_paths()
storage_paths = QubarSite::Application.config.media_file_config.original_audio_paths
storage_paths = BawSite::Application.config.media_file_config.original_audio_paths
storage_paths
end

Expand All @@ -29,17 +29,17 @@ def self.cached_audio_file(modify_parameters = {})

# get all the storage paths for cached audio
def self.cached_audio_storage_paths()
storage_paths = QubarSite::Application.config.media_file_config.cached_audio_paths
storage_paths = BawSite::Application.config.media_file_config.cached_audio_paths
storage_paths
end

def self. cached_audio_defaults()
cache_defaults = QubarSite::Application.config.media_file_config.cached_audio_defaults
cache_defaults = BawSite::Application.config.media_file_config.cached_audio_defaults
cache_defaults
end

def self. cached_spectrogram_defaults()
cache_defaults = QubarSite::Application.config.media_file_config.cached_spectrogram_defaults
cache_defaults = BawSite::Application.config.media_file_config.cached_spectrogram_defaults
cache_defaults
end

Expand All @@ -55,7 +55,7 @@ def self.cached_spectrogram_file(modify_parameters = {})

# get all the storage paths for cached spectrograms
def self.cached_spectrogram_storage_paths()
storage_paths = QubarSite::Application.config.media_file_config.cached_spectrogram_paths
storage_paths = BawSite::Application.config.media_file_config.cached_spectrogram_paths
storage_paths
end

Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/qubar-beginagain-task.rake
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ namespace :db do
end

desc "Drop, create, migrate then seed the development database"
task :qubarbeginagain => %w(environment db:development_environment_only db:drop db:create db:migrate db:seed)
task :bawbeginagain => %w(environment db:development_environment_only db:drop db:create db:migrate db:seed)
end

0 comments on commit 07f214e

Please sign in to comment.