From 06936bcdce135e85985f58ea125a66d26bcd12d6 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Wed, 21 Mar 2012 15:12:03 -0700 Subject: [PATCH 01/20] stylesheets are basically now being served from sprockets --- Gemfile | 9 + Gemfile.lock | 20 + {public => app/assets}/stylesheets/.gitkeep | 0 .../assets/stylesheets/_mixins.css.scss | 0 .../assets/stylesheets/application.css.sass | 10 +- .../assets/stylesheets/autocomplete.css.sass | 0 app/assets/stylesheets/blueprint.css | 3 + app/assets/stylesheets/bootstrap.css | 4 + app/assets/stylesheets/default.css | 14 + .../assets/stylesheets/hovercard.css.scss | 2 +- .../assets/stylesheets/lightbox.css.scss | 2 +- .../assets/stylesheets/loader.css.scss | 0 .../assets/stylesheets/login.css.scss | 4 +- .../assets/stylesheets/media-box.css.scss | 0 .../assets/stylesheets/mentions.css.scss | 2 +- .../assets/stylesheets/mobile.css.scss | 6 +- .../assets/stylesheets/new-templates.css.scss | 5 +- .../assets/stylesheets/popup.css.scss | 0 .../assets/stylesheets/rtl.css.sass | 2 + .../assets/stylesheets/sessions.css.sass | 0 .../assets/stylesheets/tags.css.sass | 0 .../assets/stylesheets/ui.css.sass | 2 +- .../stylesheets/vendor/autoSuggest.css | 0 .../assets}/stylesheets/vendor/blank.gif | Bin .../vendor}/blueprint/AUTHORS.textile | 0 .../stylesheets/vendor}/blueprint/LICENSE | 0 .../stylesheets/vendor}/blueprint/ie.css | 0 .../blueprint/plugins/buttons/icons/cross.png | Bin .../blueprint/plugins/buttons/icons/key.png | Bin .../blueprint/plugins/buttons/icons/tick.png | Bin .../blueprint/plugins/buttons/readme.txt | 0 .../blueprint/plugins/buttons/screen.css | 0 .../blueprint/plugins/fancy-type/readme.txt | 0 .../blueprint/plugins/fancy-type/screen.css | 0 .../plugins/link-icons/icons/doc.png | Bin .../plugins/link-icons/icons/email.png | Bin .../plugins/link-icons/icons/external.png | Bin .../plugins/link-icons/icons/feed.png | Bin .../blueprint/plugins/link-icons/icons/im.png | Bin .../plugins/link-icons/icons/pdf.png | Bin .../plugins/link-icons/icons/visited.png | Bin .../plugins/link-icons/icons/xls.png | Bin .../blueprint/plugins/link-icons/readme.txt | 0 .../blueprint/plugins/link-icons/screen.css | 0 .../vendor}/blueprint/plugins/rtl/readme.txt | 0 .../vendor}/blueprint/plugins/rtl/screen.css | 0 .../stylesheets/vendor}/blueprint/print.css | 0 .../stylesheets/vendor}/blueprint/screen.css | 0 .../vendor}/blueprint/src/forms.css | 0 .../vendor}/blueprint/src/grid.css | 0 .../vendor}/blueprint/src/grid.png | Bin .../stylesheets/vendor}/blueprint/src/ie.css | 0 .../vendor}/blueprint/src/print.css | 0 .../vendor}/blueprint/src/reset.css | 0 .../vendor}/blueprint/src/typography.css | 0 .../vendor}/bootstrap-responsive.css | 0 .../assets/stylesheets/vendor}/bootstrap.css | 0 .../assets}/stylesheets/vendor/facebox.css | 0 .../stylesheets/vendor/fileuploader.css | 0 .../vendor/html5-boilerplate-mobile.css | 0 .../stylesheets/vendor/images/ajax-loader.png | Bin .../vendor/images/icon-search-black.png | Bin .../vendor/images/icons-18-black.png | Bin .../vendor/images/icons-18-white.png | Bin .../vendor/images/icons-36-black.png | Bin .../vendor/images/icons-36-white.png | Bin .../stylesheets/vendor}/interim-bootstrap.css | 0 .../vendor/jquery.mentionsInput.css | 0 .../vendor/jquery.mobile-1.0b2.min.css | 0 .../vendor/jquery.ui.autocomplete.css | 0 .../assets}/stylesheets/vendor/tipsy.css | 0 app/helpers/application_helper.rb | 7 - app/helpers/layout_helper.rb | 4 +- app/views/layouts/application.html.haml | 6 +- config/application.rb | 3 + config/assets.yml | 44 +- config/environments/development.rb | 7 +- config/environments/production.rb | 11 +- config/environments/test.rb | 7 + public/javascripts/clear-form.js | 18 + public/javascripts/rails.js | 373 -- public/javascripts/vendor/jquery-1.7.1.min.js | 4 - public/stylesheets/bootstrap2.css | 3309 ----------------- 83 files changed, 121 insertions(+), 3757 deletions(-) rename {public => app/assets}/stylesheets/.gitkeep (100%) rename public/stylesheets/sass/_mixins.scss => app/assets/stylesheets/_mixins.css.scss (100%) rename public/stylesheets/sass/application.sass => app/assets/stylesheets/application.css.sass (99%) rename public/stylesheets/sass/autocomplete.sass => app/assets/stylesheets/autocomplete.css.sass (100%) create mode 100644 app/assets/stylesheets/blueprint.css create mode 100644 app/assets/stylesheets/bootstrap.css create mode 100644 app/assets/stylesheets/default.css rename public/stylesheets/sass/hovercard.scss => app/assets/stylesheets/hovercard.css.scss (98%) rename public/stylesheets/sass/lightbox.scss => app/assets/stylesheets/lightbox.css.scss (98%) rename public/stylesheets/sass/loader.scss => app/assets/stylesheets/loader.css.scss (100%) rename public/stylesheets/sass/login.scss => app/assets/stylesheets/login.css.scss (97%) rename public/stylesheets/sass/media-box.scss => app/assets/stylesheets/media-box.css.scss (100%) rename public/stylesheets/sass/mentions.scss => app/assets/stylesheets/mentions.css.scss (98%) rename public/stylesheets/sass/mobile.scss => app/assets/stylesheets/mobile.css.scss (98%) rename public/stylesheets/sass/new-templates.scss => app/assets/stylesheets/new-templates.css.scss (99%) rename public/stylesheets/sass/popup.scss => app/assets/stylesheets/popup.css.scss (100%) rename public/stylesheets/sass/rtl.sass => app/assets/stylesheets/rtl.css.sass (99%) rename public/stylesheets/sass/sessions.sass => app/assets/stylesheets/sessions.css.sass (100%) rename public/stylesheets/sass/tags.sass => app/assets/stylesheets/tags.css.sass (100%) rename public/stylesheets/sass/ui.sass => app/assets/stylesheets/ui.css.sass (99%) rename {public => app/assets}/stylesheets/vendor/autoSuggest.css (100%) rename {public => app/assets}/stylesheets/vendor/blank.gif (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/AUTHORS.textile (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/LICENSE (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/ie.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/buttons/icons/cross.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/buttons/icons/key.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/buttons/icons/tick.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/buttons/readme.txt (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/buttons/screen.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/fancy-type/readme.txt (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/fancy-type/screen.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/doc.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/email.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/external.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/feed.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/im.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/pdf.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/visited.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/icons/xls.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/readme.txt (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/link-icons/screen.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/rtl/readme.txt (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/plugins/rtl/screen.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/print.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/screen.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/src/forms.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/src/grid.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/src/grid.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/src/ie.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/src/print.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/src/reset.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/blueprint/src/typography.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/bootstrap-responsive.css (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/bootstrap.css (100%) rename {public => app/assets}/stylesheets/vendor/facebox.css (100%) rename {public => app/assets}/stylesheets/vendor/fileuploader.css (100%) rename {public => app/assets}/stylesheets/vendor/html5-boilerplate-mobile.css (100%) rename {public => app/assets}/stylesheets/vendor/images/ajax-loader.png (100%) rename {public => app/assets}/stylesheets/vendor/images/icon-search-black.png (100%) rename {public => app/assets}/stylesheets/vendor/images/icons-18-black.png (100%) rename {public => app/assets}/stylesheets/vendor/images/icons-18-white.png (100%) rename {public => app/assets}/stylesheets/vendor/images/icons-36-black.png (100%) rename {public => app/assets}/stylesheets/vendor/images/icons-36-white.png (100%) rename {public/stylesheets => app/assets/stylesheets/vendor}/interim-bootstrap.css (100%) rename {public => app/assets}/stylesheets/vendor/jquery.mentionsInput.css (100%) rename {public => app/assets}/stylesheets/vendor/jquery.mobile-1.0b2.min.css (100%) rename {public => app/assets}/stylesheets/vendor/jquery.ui.autocomplete.css (100%) rename {public => app/assets}/stylesheets/vendor/tipsy.css (100%) create mode 100644 public/javascripts/clear-form.js delete mode 100644 public/javascripts/rails.js delete mode 100644 public/javascripts/vendor/jquery-1.7.1.min.js delete mode 100644 public/stylesheets/bootstrap2.css diff --git a/Gemfile b/Gemfile index 6efc0df6c..365f97502 100644 --- a/Gemfile +++ b/Gemfile @@ -107,6 +107,15 @@ gem 'sass' gem 'will_paginate' gem 'client_side_validations' +# assets + +group :assets do + gem 'sass-rails' + gem 'uglifier' +end + +gem 'jquery-rails' + # web gem 'faraday' diff --git a/Gemfile.lock b/Gemfile.lock index d3e313444..a7ee25cda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -145,6 +145,8 @@ GEM erubis (2.7.0) eventmachine (1.0.0.beta.4) excon (0.12.0) + execjs (1.3.0) + multi_json (~> 1.0) factory_girl (2.6.4) activesupport (>= 2.3.9) factory_girl_rails (1.7.0) @@ -219,7 +221,14 @@ GEM rspec (>= 1.3.1) selenium-webdriver (>= 0.1.3) jasmine-core (1.1.0) +<<<<<<< HEAD json (1.6.6) +======= + jquery-rails (1.0.19) + railties (~> 3.0) + thor (~> 0.14) + json (1.6.5) +>>>>>>> stylesheets are basically now being served from sprockets jsonpath (0.5.0) multi_json jwt (0.1.4) @@ -390,6 +399,11 @@ GEM s3 (0.3.11) proxies (~> 0.2.0) sass (3.1.15) + sass-rails (3.1.6) + actionpack (~> 3.1.0) + railties (~> 3.1.0) + sass (>= 3.1.10) + tilt (~> 1.3.2) selenium-webdriver (2.16.0) childprocess (>= 0.2.5) ffi (~> 1.0.9) @@ -425,6 +439,9 @@ GEM typhoeus (0.3.3) mime-types tzinfo (0.3.32) + uglifier (1.2.3) + execjs (>= 0.3.0) + multi_json (>= 1.0.2) unicorn (4.2.0) kgio (~> 2.6) rack @@ -486,6 +503,7 @@ DEPENDENCIES i18n-inflector-rails (~> 1.0) jammit-s3 jasmine (~> 1.1.2) + jquery-rails json jwt linecache (= 0.46) @@ -528,6 +546,7 @@ DEPENDENCIES ruby-debug19 ruby-oembed (~> 0.8.7) sass + sass-rails selenium-webdriver (~> 2.16.0) settingslogic! sqlite3 @@ -535,6 +554,7 @@ DEPENDENCIES timecop twitter (= 2.0.2) typhoeus + uglifier unicorn (~> 4.2.0) webmock whenever diff --git a/public/stylesheets/.gitkeep b/app/assets/stylesheets/.gitkeep similarity index 100% rename from public/stylesheets/.gitkeep rename to app/assets/stylesheets/.gitkeep diff --git a/public/stylesheets/sass/_mixins.scss b/app/assets/stylesheets/_mixins.css.scss similarity index 100% rename from public/stylesheets/sass/_mixins.scss rename to app/assets/stylesheets/_mixins.css.scss diff --git a/public/stylesheets/sass/application.sass b/app/assets/stylesheets/application.css.sass similarity index 99% rename from public/stylesheets/sass/application.sass rename to app/assets/stylesheets/application.css.sass index 131b247e3..517463089 100644 --- a/public/stylesheets/sass/application.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1,7 +1,7 @@ -// licensed under the Affero General Public License version 3 or later. See -// the COPYRIGHT file. +//= require_self +//= require ui -@import 'mixins' +@import '_mixins.css.scss' /* ====== media ====== */ .media @@ -684,7 +684,7 @@ form p.checkbox_select *:-moz-placeholder @include placeholder_styles -#file-upload +#file-upload input :height 100% :width 100% @@ -777,7 +777,7 @@ form p.checkbox_select :position absolute !important :right 6px :cursor pointer - + input[type='file'] :cursor pointer diff --git a/public/stylesheets/sass/autocomplete.sass b/app/assets/stylesheets/autocomplete.css.sass similarity index 100% rename from public/stylesheets/sass/autocomplete.sass rename to app/assets/stylesheets/autocomplete.css.sass diff --git a/app/assets/stylesheets/blueprint.css b/app/assets/stylesheets/blueprint.css new file mode 100644 index 000000000..3f09fb9c3 --- /dev/null +++ b/app/assets/stylesheets/blueprint.css @@ -0,0 +1,3 @@ +/* +//= require vendor/blueprint/screen +*/ \ No newline at end of file diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css new file mode 100644 index 000000000..c9a936437 --- /dev/null +++ b/app/assets/stylesheets/bootstrap.css @@ -0,0 +1,4 @@ +/* +*= require vendor/bootstrap +*= require vendor/bootstrap-responsive +*/ \ No newline at end of file diff --git a/app/assets/stylesheets/default.css b/app/assets/stylesheets/default.css new file mode 100644 index 000000000..b4c66656d --- /dev/null +++ b/app/assets/stylesheets/default.css @@ -0,0 +1,14 @@ +/* +*= require media-box +*= require loader +*= require lightbox +*= require autocomplete +*= require mentions +*= require tags +*= require hovercard + +*= require vendor/interim-bootstrap +*= require vendor/facebox +*= require vendor/fileuploader +*= require vendor/autoSuggest +*/ \ No newline at end of file diff --git a/public/stylesheets/sass/hovercard.scss b/app/assets/stylesheets/hovercard.css.scss similarity index 98% rename from public/stylesheets/sass/hovercard.scss rename to app/assets/stylesheets/hovercard.css.scss index 82b3c4954..0a03c82b3 100644 --- a/public/stylesheets/sass/hovercard.scss +++ b/app/assets/stylesheets/hovercard.css.scss @@ -1,4 +1,4 @@ -@import "mixins"; +@import "_mixins.css.scss"; #hovercard { @include border-radius(2px); diff --git a/public/stylesheets/sass/lightbox.scss b/app/assets/stylesheets/lightbox.css.scss similarity index 98% rename from public/stylesheets/sass/lightbox.scss rename to app/assets/stylesheets/lightbox.css.scss index a7423bb70..d84680a93 100644 --- a/public/stylesheets/sass/lightbox.scss +++ b/app/assets/stylesheets/lightbox.css.scss @@ -1,7 +1,7 @@ // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. -@import 'mixins'; +@import '_mixins.css.scss'; #lightbox{ z-index: 1003; diff --git a/public/stylesheets/sass/loader.scss b/app/assets/stylesheets/loader.css.scss similarity index 100% rename from public/stylesheets/sass/loader.scss rename to app/assets/stylesheets/loader.css.scss diff --git a/public/stylesheets/sass/login.scss b/app/assets/stylesheets/login.css.scss similarity index 97% rename from public/stylesheets/sass/login.scss rename to app/assets/stylesheets/login.css.scss index b4cd1c859..024b8d12b 100644 --- a/public/stylesheets/sass/login.scss +++ b/app/assets/stylesheets/login.css.scss @@ -1,8 +1,10 @@ +//= require_self + // Copyright (c) 2010-2011, Diaspora Inc. This file is // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. -@import "mixins"; +@import "_mixins.css.scss"; #login { width: 400px; diff --git a/public/stylesheets/sass/media-box.scss b/app/assets/stylesheets/media-box.css.scss similarity index 100% rename from public/stylesheets/sass/media-box.scss rename to app/assets/stylesheets/media-box.css.scss diff --git a/public/stylesheets/sass/mentions.scss b/app/assets/stylesheets/mentions.css.scss similarity index 98% rename from public/stylesheets/sass/mentions.scss rename to app/assets/stylesheets/mentions.css.scss index f7589a2d5..39ff4c3a7 100644 --- a/public/stylesheets/sass/mentions.scss +++ b/app/assets/stylesheets/mentions.css.scss @@ -1,5 +1,5 @@ -@import 'mixins'; +@import '_mixins.css.scss'; .mentions-input-box { background: #fff; diff --git a/public/stylesheets/sass/mobile.scss b/app/assets/stylesheets/mobile.css.scss similarity index 98% rename from public/stylesheets/sass/mobile.scss rename to app/assets/stylesheets/mobile.css.scss index addace4e8..f9d2d538d 100644 --- a/public/stylesheets/sass/mobile.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -1,4 +1,8 @@ -@import "mixins"; +//= require_self +//= require vendor/bootstrap +//= require vendor/bootstrap-responsive + +@import "_mixins.css.scss"; $blue: #3f8fba; diff --git a/public/stylesheets/sass/new-templates.scss b/app/assets/stylesheets/new-templates.css.scss similarity index 99% rename from public/stylesheets/sass/new-templates.scss rename to app/assets/stylesheets/new-templates.css.scss index c8ce38355..d2acb9dea 100644 --- a/public/stylesheets/sass/new-templates.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -1,5 +1,6 @@ -/* variables */ +//= require_self +/* variables */ $light-grey: #999; $pane-width: 420px; @@ -808,4 +809,4 @@ text-rendering: optimizelegibility; .headline p{ @include media-text(); -} \ No newline at end of file +} diff --git a/public/stylesheets/sass/popup.scss b/app/assets/stylesheets/popup.css.scss similarity index 100% rename from public/stylesheets/sass/popup.scss rename to app/assets/stylesheets/popup.css.scss diff --git a/public/stylesheets/sass/rtl.sass b/app/assets/stylesheets/rtl.css.sass similarity index 99% rename from public/stylesheets/sass/rtl.sass rename to app/assets/stylesheets/rtl.css.sass index 867225603..6c48be1c0 100644 --- a/public/stylesheets/sass/rtl.sass +++ b/app/assets/stylesheets/rtl.css.sass @@ -1,3 +1,5 @@ +//= require_self + body :direction rtl :text-align right diff --git a/public/stylesheets/sass/sessions.sass b/app/assets/stylesheets/sessions.css.sass similarity index 100% rename from public/stylesheets/sass/sessions.sass rename to app/assets/stylesheets/sessions.css.sass diff --git a/public/stylesheets/sass/tags.sass b/app/assets/stylesheets/tags.css.sass similarity index 100% rename from public/stylesheets/sass/tags.sass rename to app/assets/stylesheets/tags.css.sass diff --git a/public/stylesheets/sass/ui.sass b/app/assets/stylesheets/ui.css.sass similarity index 99% rename from public/stylesheets/sass/ui.sass rename to app/assets/stylesheets/ui.css.sass index 6d10df3dd..12dafcd36 100644 --- a/public/stylesheets/sass/ui.sass +++ b/app/assets/stylesheets/ui.css.sass @@ -2,7 +2,7 @@ // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. -@import 'mixins' +@import '_mixins.css.scss' $button-border-color: #aaa diff --git a/public/stylesheets/vendor/autoSuggest.css b/app/assets/stylesheets/vendor/autoSuggest.css similarity index 100% rename from public/stylesheets/vendor/autoSuggest.css rename to app/assets/stylesheets/vendor/autoSuggest.css diff --git a/public/stylesheets/vendor/blank.gif b/app/assets/stylesheets/vendor/blank.gif similarity index 100% rename from public/stylesheets/vendor/blank.gif rename to app/assets/stylesheets/vendor/blank.gif diff --git a/public/stylesheets/blueprint/AUTHORS.textile b/app/assets/stylesheets/vendor/blueprint/AUTHORS.textile similarity index 100% rename from public/stylesheets/blueprint/AUTHORS.textile rename to app/assets/stylesheets/vendor/blueprint/AUTHORS.textile diff --git a/public/stylesheets/blueprint/LICENSE b/app/assets/stylesheets/vendor/blueprint/LICENSE similarity index 100% rename from public/stylesheets/blueprint/LICENSE rename to app/assets/stylesheets/vendor/blueprint/LICENSE diff --git a/public/stylesheets/blueprint/ie.css b/app/assets/stylesheets/vendor/blueprint/ie.css similarity index 100% rename from public/stylesheets/blueprint/ie.css rename to app/assets/stylesheets/vendor/blueprint/ie.css diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/cross.png b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/cross.png similarity index 100% rename from public/stylesheets/blueprint/plugins/buttons/icons/cross.png rename to app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/cross.png diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/key.png b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/key.png similarity index 100% rename from public/stylesheets/blueprint/plugins/buttons/icons/key.png rename to app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/key.png diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/tick.png b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/tick.png similarity index 100% rename from public/stylesheets/blueprint/plugins/buttons/icons/tick.png rename to app/assets/stylesheets/vendor/blueprint/plugins/buttons/icons/tick.png diff --git a/public/stylesheets/blueprint/plugins/buttons/readme.txt b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/readme.txt similarity index 100% rename from public/stylesheets/blueprint/plugins/buttons/readme.txt rename to app/assets/stylesheets/vendor/blueprint/plugins/buttons/readme.txt diff --git a/public/stylesheets/blueprint/plugins/buttons/screen.css b/app/assets/stylesheets/vendor/blueprint/plugins/buttons/screen.css similarity index 100% rename from public/stylesheets/blueprint/plugins/buttons/screen.css rename to app/assets/stylesheets/vendor/blueprint/plugins/buttons/screen.css diff --git a/public/stylesheets/blueprint/plugins/fancy-type/readme.txt b/app/assets/stylesheets/vendor/blueprint/plugins/fancy-type/readme.txt similarity index 100% rename from public/stylesheets/blueprint/plugins/fancy-type/readme.txt rename to app/assets/stylesheets/vendor/blueprint/plugins/fancy-type/readme.txt diff --git a/public/stylesheets/blueprint/plugins/fancy-type/screen.css b/app/assets/stylesheets/vendor/blueprint/plugins/fancy-type/screen.css similarity index 100% rename from public/stylesheets/blueprint/plugins/fancy-type/screen.css rename to app/assets/stylesheets/vendor/blueprint/plugins/fancy-type/screen.css diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/doc.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/doc.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/doc.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/doc.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/email.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/email.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/email.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/email.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/external.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/external.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/external.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/external.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/feed.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/feed.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/feed.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/feed.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/im.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/im.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/im.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/im.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/pdf.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/pdf.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/visited.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/visited.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/visited.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/xls.png b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/xls.png similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/icons/xls.png rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/icons/xls.png diff --git a/public/stylesheets/blueprint/plugins/link-icons/readme.txt b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/readme.txt similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/readme.txt rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/readme.txt diff --git a/public/stylesheets/blueprint/plugins/link-icons/screen.css b/app/assets/stylesheets/vendor/blueprint/plugins/link-icons/screen.css similarity index 100% rename from public/stylesheets/blueprint/plugins/link-icons/screen.css rename to app/assets/stylesheets/vendor/blueprint/plugins/link-icons/screen.css diff --git a/public/stylesheets/blueprint/plugins/rtl/readme.txt b/app/assets/stylesheets/vendor/blueprint/plugins/rtl/readme.txt similarity index 100% rename from public/stylesheets/blueprint/plugins/rtl/readme.txt rename to app/assets/stylesheets/vendor/blueprint/plugins/rtl/readme.txt diff --git a/public/stylesheets/blueprint/plugins/rtl/screen.css b/app/assets/stylesheets/vendor/blueprint/plugins/rtl/screen.css similarity index 100% rename from public/stylesheets/blueprint/plugins/rtl/screen.css rename to app/assets/stylesheets/vendor/blueprint/plugins/rtl/screen.css diff --git a/public/stylesheets/blueprint/print.css b/app/assets/stylesheets/vendor/blueprint/print.css similarity index 100% rename from public/stylesheets/blueprint/print.css rename to app/assets/stylesheets/vendor/blueprint/print.css diff --git a/public/stylesheets/blueprint/screen.css b/app/assets/stylesheets/vendor/blueprint/screen.css similarity index 100% rename from public/stylesheets/blueprint/screen.css rename to app/assets/stylesheets/vendor/blueprint/screen.css diff --git a/public/stylesheets/blueprint/src/forms.css b/app/assets/stylesheets/vendor/blueprint/src/forms.css similarity index 100% rename from public/stylesheets/blueprint/src/forms.css rename to app/assets/stylesheets/vendor/blueprint/src/forms.css diff --git a/public/stylesheets/blueprint/src/grid.css b/app/assets/stylesheets/vendor/blueprint/src/grid.css similarity index 100% rename from public/stylesheets/blueprint/src/grid.css rename to app/assets/stylesheets/vendor/blueprint/src/grid.css diff --git a/public/stylesheets/blueprint/src/grid.png b/app/assets/stylesheets/vendor/blueprint/src/grid.png similarity index 100% rename from public/stylesheets/blueprint/src/grid.png rename to app/assets/stylesheets/vendor/blueprint/src/grid.png diff --git a/public/stylesheets/blueprint/src/ie.css b/app/assets/stylesheets/vendor/blueprint/src/ie.css similarity index 100% rename from public/stylesheets/blueprint/src/ie.css rename to app/assets/stylesheets/vendor/blueprint/src/ie.css diff --git a/public/stylesheets/blueprint/src/print.css b/app/assets/stylesheets/vendor/blueprint/src/print.css similarity index 100% rename from public/stylesheets/blueprint/src/print.css rename to app/assets/stylesheets/vendor/blueprint/src/print.css diff --git a/public/stylesheets/blueprint/src/reset.css b/app/assets/stylesheets/vendor/blueprint/src/reset.css similarity index 100% rename from public/stylesheets/blueprint/src/reset.css rename to app/assets/stylesheets/vendor/blueprint/src/reset.css diff --git a/public/stylesheets/blueprint/src/typography.css b/app/assets/stylesheets/vendor/blueprint/src/typography.css similarity index 100% rename from public/stylesheets/blueprint/src/typography.css rename to app/assets/stylesheets/vendor/blueprint/src/typography.css diff --git a/public/stylesheets/bootstrap-responsive.css b/app/assets/stylesheets/vendor/bootstrap-responsive.css similarity index 100% rename from public/stylesheets/bootstrap-responsive.css rename to app/assets/stylesheets/vendor/bootstrap-responsive.css diff --git a/public/stylesheets/bootstrap.css b/app/assets/stylesheets/vendor/bootstrap.css similarity index 100% rename from public/stylesheets/bootstrap.css rename to app/assets/stylesheets/vendor/bootstrap.css diff --git a/public/stylesheets/vendor/facebox.css b/app/assets/stylesheets/vendor/facebox.css similarity index 100% rename from public/stylesheets/vendor/facebox.css rename to app/assets/stylesheets/vendor/facebox.css diff --git a/public/stylesheets/vendor/fileuploader.css b/app/assets/stylesheets/vendor/fileuploader.css similarity index 100% rename from public/stylesheets/vendor/fileuploader.css rename to app/assets/stylesheets/vendor/fileuploader.css diff --git a/public/stylesheets/vendor/html5-boilerplate-mobile.css b/app/assets/stylesheets/vendor/html5-boilerplate-mobile.css similarity index 100% rename from public/stylesheets/vendor/html5-boilerplate-mobile.css rename to app/assets/stylesheets/vendor/html5-boilerplate-mobile.css diff --git a/public/stylesheets/vendor/images/ajax-loader.png b/app/assets/stylesheets/vendor/images/ajax-loader.png similarity index 100% rename from public/stylesheets/vendor/images/ajax-loader.png rename to app/assets/stylesheets/vendor/images/ajax-loader.png diff --git a/public/stylesheets/vendor/images/icon-search-black.png b/app/assets/stylesheets/vendor/images/icon-search-black.png similarity index 100% rename from public/stylesheets/vendor/images/icon-search-black.png rename to app/assets/stylesheets/vendor/images/icon-search-black.png diff --git a/public/stylesheets/vendor/images/icons-18-black.png b/app/assets/stylesheets/vendor/images/icons-18-black.png similarity index 100% rename from public/stylesheets/vendor/images/icons-18-black.png rename to app/assets/stylesheets/vendor/images/icons-18-black.png diff --git a/public/stylesheets/vendor/images/icons-18-white.png b/app/assets/stylesheets/vendor/images/icons-18-white.png similarity index 100% rename from public/stylesheets/vendor/images/icons-18-white.png rename to app/assets/stylesheets/vendor/images/icons-18-white.png diff --git a/public/stylesheets/vendor/images/icons-36-black.png b/app/assets/stylesheets/vendor/images/icons-36-black.png similarity index 100% rename from public/stylesheets/vendor/images/icons-36-black.png rename to app/assets/stylesheets/vendor/images/icons-36-black.png diff --git a/public/stylesheets/vendor/images/icons-36-white.png b/app/assets/stylesheets/vendor/images/icons-36-white.png similarity index 100% rename from public/stylesheets/vendor/images/icons-36-white.png rename to app/assets/stylesheets/vendor/images/icons-36-white.png diff --git a/public/stylesheets/interim-bootstrap.css b/app/assets/stylesheets/vendor/interim-bootstrap.css similarity index 100% rename from public/stylesheets/interim-bootstrap.css rename to app/assets/stylesheets/vendor/interim-bootstrap.css diff --git a/public/stylesheets/vendor/jquery.mentionsInput.css b/app/assets/stylesheets/vendor/jquery.mentionsInput.css similarity index 100% rename from public/stylesheets/vendor/jquery.mentionsInput.css rename to app/assets/stylesheets/vendor/jquery.mentionsInput.css diff --git a/public/stylesheets/vendor/jquery.mobile-1.0b2.min.css b/app/assets/stylesheets/vendor/jquery.mobile-1.0b2.min.css similarity index 100% rename from public/stylesheets/vendor/jquery.mobile-1.0b2.min.css rename to app/assets/stylesheets/vendor/jquery.mobile-1.0b2.min.css diff --git a/public/stylesheets/vendor/jquery.ui.autocomplete.css b/app/assets/stylesheets/vendor/jquery.ui.autocomplete.css similarity index 100% rename from public/stylesheets/vendor/jquery.ui.autocomplete.css rename to app/assets/stylesheets/vendor/jquery.ui.autocomplete.css diff --git a/public/stylesheets/vendor/tipsy.css b/app/assets/stylesheets/vendor/tipsy.css similarity index 100% rename from public/stylesheets/vendor/tipsy.css rename to app/assets/stylesheets/vendor/tipsy.css diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d19a42b57..c61fafea9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -35,11 +35,4 @@ module ApplicationHelper def diaspora_id_host User.diaspora_id_host end - - def jquery_include_tag - "".html_safe + - content_tag(:script) do - "!window.jQuery && document.write(unescape(\"#{escape_javascript(include_javascripts(:jquery))}\")); jQuery.ajaxSetup({'cache': false});".html_safe - end - end end diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index c1cbc2144..5ea667d2f 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -61,9 +61,9 @@ module LayoutHelper def include_base_css_framework(use_bootstrap=false) if use_bootstrap || @aspect == :getting_started || @page == :logged_out - include_stylesheets :bootstrap + stylesheet_link_tag 'bootstrap' else - include_stylesheets :blueprint, :media => 'screen' + stylesheet_link_tag 'blueprint', :media => 'screen' end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 7af102126..e36ebc340 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,8 +19,7 @@ = page_title yield(:page_title) = include_base_css_framework - = include_stylesheets :login, :media => 'screen' - = include_stylesheets :application, :default, :media => 'all' + = stylesheet_link_tag 'login', 'application', 'default' - if rtl? = include_stylesheets :rtl, :media => 'all' @@ -30,7 +29,8 @@ = include_javascripts :ie - = jquery_include_tag + = javascript_include_tag 'jquery', 'jquery_ujs' + - unless @landing_page = include_javascripts :main, :templates = load_javascript_locales diff --git a/config/application.rb b/config/application.rb index 589e15ca2..444999cf1 100644 --- a/config/application.rb +++ b/config/application.rb @@ -63,5 +63,8 @@ module Diaspora config.filter_parameters += [:text] config.filter_parameters += [:bio] + # Enable the asset pipeline + config.assets.enabled = true + end end diff --git a/config/assets.yml b/config/assets.yml index e7086b92b..49a7e0945 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -2,14 +2,12 @@ package_assets: on embed_assets: datauri compress_assets: on gzip_assets: off +package_path: jammit template_function: Handlebars.compile template_extension: 'handlebars' javascripts: - jquery: - - public/javascripts/vendor/jquery-1.7.1.min.js - templates: - public/javascripts/app/templates/*.handlebars - public/javascripts/app/templates/**/*.handlebars @@ -111,43 +109,3 @@ javascripts: - public/javascripts/vendor/jquery.autoSuggest.custom.js ie: - public/javascripts/ie.js - -stylesheets: - bootstrap: - - public/stylesheets/bootstrap-responsive.css - - public/stylesheets/bootstrap.css - - blueprint: - - public/stylesheets/blueprint/screen.css - - login: - - public/stylesheets/login.css - - default: - - public/stylesheets/media-box.css - - public/stylesheets/loader.css - - public/stylesheets/lightbox.css - - public/stylesheets/autocomplete.css - - public/stylesheets/mentions.css - - public/stylesheets/tags.css - - public/stylesheets/hovercard.css - - public/stylesheets/vendor/facebox.css - - public/stylesheets/vendor/fileuploader.css - - public/stylesheets/vendor/autoSuggest.css - - public/stylesheets/interim-bootstrap.css - - application: - - public/stylesheets/application.css - - public/stylesheets/ui.css - - new_templates: - - public/stylesheets/new-templates.css - - rtl: - - public/stylesheets/rtl.css - - mobile: - - public/stylesheets/bootstrap2.css - - public/stylesheets/bootstrap-responsive.css - - public/stylesheets/mobile.css - diff --git a/config/environments/development.rb b/config/environments/development.rb index 19ce2b3dd..19e7118d2 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -16,7 +16,12 @@ Diaspora::Application.configure do config.consider_all_requests_local = true config.action_controller.perform_caching = false - + # Do not compress assets + config.assets.compress = false + + # Expands the lines which load the assets + config.assets.debug = true + # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false config.active_support.deprecation = [:stderr, :log] diff --git a/config/environments/production.rb b/config/environments/production.rb index b96fa6252..f4dc824f9 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -46,10 +46,17 @@ Diaspora::Application.configure do # Disable delivery errors, bad email addresses will be ignored # config.action_mailer.raise_delivery_errors = false + # Compress JavaScript and CSS + config.assets.compress = true + + # Don't fallback to assets pipeline + config.assets.compile = false + + # Generate digests for assets URLs + config.assets.digest = true + config.threadsafe! end -# Sacrifice readability for a 10% performance boost -Haml::Template::options[:ugly] = true GC.enable_stats if GC.respond_to?(:enable_stats) GC::Profiler.enable if defined?(GC::Profiler) && GC::Profiler.respond_to?(:enable) diff --git a/config/environments/test.rb b/config/environments/test.rb index d1ab8b3a7..be4ea36b5 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -30,6 +30,13 @@ Diaspora::Application.configure do config.action_mailer.delivery_method = :test config.active_support.deprecation = :stderr + # Configure static asset server for tests with Cache-Control for performance + config.serve_static_assets = true + config.static_cache_control = "public, max-age=3600" + + # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets + config.assets.allow_debugging = true + # fixes url helper issue in rspec #config.threadsafe! diff --git a/public/javascripts/clear-form.js b/public/javascripts/clear-form.js new file mode 100644 index 000000000..70d13f61d --- /dev/null +++ b/public/javascripts/clear-form.js @@ -0,0 +1,18 @@ +/* Clear form plugin - called using $("elem").clearForm(); */ +$.fn.clearForm = function() { + return this.each(function() { + if ($(this).is('form')) { + return $(':input', this).clearForm(); + } + if ($(this).hasClass('clear_on_submit') || $(this).is(':text') || $(this).is(':password') || $(this).is('textarea')) { + $(this).val(''); + } else if ($(this).is(':checkbox') || $(this).is(':radio')) { + $(this).attr('checked', false); + } else if ($(this).is('select')) { + this.selectedIndex = -1; + } else if ($(this).attr('name') == 'photos[]') { + $(this).val(''); + } + $(this).blur(); + }); +}; diff --git a/public/javascripts/rails.js b/public/javascripts/rails.js deleted file mode 100644 index 06b4e0b53..000000000 --- a/public/javascripts/rails.js +++ /dev/null @@ -1,373 +0,0 @@ -(function($, undefined) { - -/** - * Unobtrusive scripting adapter for jQuery - * - * Requires jQuery 1.6.0 or later. - * https://github.com/rails/jquery-ujs - - * Uploading file using rails.js - * ============================= - * - * By default, browsers do not allow files to be uploaded via AJAX. As a result, if there are any non-blank file fields - * in the remote form, this adapter aborts the AJAX submission and allows the form to submit through standard means. - * - * The `ajax:aborted:file` event allows you to bind your own handler to process the form submission however you wish. - * - * Ex: - * $('form').live('ajax:aborted:file', function(event, elements){ - * // Implement own remote file-transfer handler here for non-blank file inputs passed in `elements`. - * // Returning false in this handler tells rails.js to disallow standard form submission - * return false; - * }); - * - * The `ajax:aborted:file` event is fired when a file-type input is detected with a non-blank value. - * - * Third-party tools can use this hook to detect when an AJAX file upload is attempted, and then use - * techniques like the iframe method to upload the file instead. - * - * Required fields in rails.js - * =========================== - * - * If any blank required inputs (required="required") are detected in the remote form, the whole form submission - * is canceled. Note that this is unlike file inputs, which still allow standard (non-AJAX) form submission. - * - * The `ajax:aborted:required` event allows you to bind your own handler to inform the user of blank required inputs. - * - * !! Note that Opera does not fire the form's submit event if there are blank required inputs, so this event may never - * get fired in Opera. This event is what causes other browsers to exhibit the same submit-aborting behavior. - * - * Ex: - * $('form').live('ajax:aborted:required', function(event, elements){ - * // Returning false in this handler tells rails.js to submit the form anyway. - * // The blank required inputs are passed to this function in `elements`. - * return ! confirm("Would you like to submit the form with missing info?"); - * }); - */ - - // Shorthand to make it a little easier to call public rails functions from within rails.js - var rails; - - $.rails = rails = { - // Link elements bound by jquery-ujs - linkClickSelector: 'a[data-confirm], a[data-method], a[data-remote], a[data-disable-with]', - - // Select elements bound by jquery-ujs - inputChangeSelector: 'select[data-remote], input[data-remote], textarea[data-remote]', - - // Form elements bound by jquery-ujs - formSubmitSelector: 'form', - - // Form input elements bound by jquery-ujs - formInputClickSelector: 'form input[type=submit], form input[type=image], form button[type=submit], form button:not(button[type])', - - // Form input elements disabled during form submission - disableSelector: 'input[data-disable-with], button[data-disable-with], textarea[data-disable-with]', - - // Form input elements re-enabled after form submission - enableSelector: 'input[data-disable-with]:disabled, button[data-disable-with]:disabled, textarea[data-disable-with]:disabled', - - // Form required input elements - requiredInputSelector: 'input[name][required]:not([disabled]),textarea[name][required]:not([disabled])', - - // Form file input elements - fileInputSelector: 'input:file', - - // Link onClick disable selector with possible reenable after remote submission - linkDisableSelector: 'a[data-disable-with]', - - // Make sure that every Ajax request sends the CSRF token - CSRFProtection: function(xhr) { - var token = $('meta[name="csrf-token"]').attr('content'); - if (token) xhr.setRequestHeader('X-CSRF-Token', token); - }, - - // Triggers an event on an element and returns false if the event result is false - fire: function(obj, name, data) { - var event = $.Event(name); - obj.trigger(event, data); - return event.result !== false; - }, - - // Default confirm dialog, may be overridden with custom confirm dialog in $.rails.confirm - confirm: function(message) { - return confirm(message); - }, - - // Default ajax function, may be overridden with custom function in $.rails.ajax - ajax: function(options) { - return $.ajax(options); - }, - - // Submits "remote" forms and links with ajax - handleRemote: function(element) { - var method, url, data, - crossDomain = element.data('cross-domain') || null, - dataType = element.data('type') || ($.ajaxSettings && $.ajaxSettings.dataType), - options; - - if (rails.fire(element, 'ajax:before')) { - - if (element.is('form')) { - method = element.attr('method'); - url = element.attr('action'); - data = element.serializeArray(); - // memoized value from clicked submit button - var button = element.data('ujs:submit-button'); - if (button) { - data.push(button); - element.data('ujs:submit-button', null); - } - } else if (element.is(rails.inputChangeSelector)) { - method = element.data('method'); - url = element.data('url'); - data = element.serialize(); - if (element.data('params')) data = data + "&" + element.data('params'); - } else { - method = element.data('method'); - url = element.attr('href'); - data = element.data('params') || null; - } - - options = { - type: method || 'GET', data: data, dataType: dataType, crossDomain: crossDomain, - // stopping the "ajax:beforeSend" event will cancel the ajax request - beforeSend: function(xhr, settings) { - if (settings.dataType === undefined) { - xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script); - } - return rails.fire(element, 'ajax:beforeSend', [xhr, settings]); - }, - success: function(data, status, xhr) { - element.trigger('ajax:success', [data, status, xhr]); - }, - complete: function(xhr, status) { - element.trigger('ajax:complete', [xhr, status]); - }, - error: function(xhr, status, error) { - element.trigger('ajax:error', [xhr, status, error]); - } - }; - // Only pass url to `ajax` options if not blank - if (url) { options.url = url; } - - return rails.ajax(options); - } else { - return false; - } - }, - - // Handles "data-method" on links such as: - // Delete - handleMethod: function(link) { - var href = link.attr('href'), - method = link.data('method'), - target = link.attr('target'), - csrf_token = $('meta[name=csrf-token]').attr('content'), - csrf_param = $('meta[name=csrf-param]').attr('content'), - form = $('
'), - metadata_input = ''; - - if (csrf_param !== undefined && csrf_token !== undefined) { - metadata_input += ''; - } - - if (target) { form.attr('target', target); } - - form.hide().append(metadata_input).appendTo('body'); - form.submit(); - }, - - /* Disables form elements: - - Caches element value in 'ujs:enable-with' data store - - Replaces element text with value of 'data-disable-with' attribute - - Sets disabled property to true - */ - disableFormElements: function(form) { - form.find(rails.disableSelector).each(function() { - var element = $(this), method = element.is('button') ? 'html' : 'val'; - element.data('ujs:enable-with', element[method]()); - element[method](element.data('disable-with')); - element.prop('disabled', true); - }); - }, - - /* Re-enables disabled form elements: - - Replaces element text with cached value from 'ujs:enable-with' data store (created in `disableFormElements`) - - Sets disabled property to false - */ - enableFormElements: function(form) { - form.find(rails.enableSelector).each(function() { - var element = $(this), method = element.is('button') ? 'html' : 'val'; - if (element.data('ujs:enable-with')) element[method](element.data('ujs:enable-with')); - element.prop('disabled', false); - }); - }, - - /* For 'data-confirm' attribute: - - Fires `confirm` event - - Shows the confirmation dialog - - Fires the `confirm:complete` event - - Returns `true` if no function stops the chain and user chose yes; `false` otherwise. - Attaching a handler to the element's `confirm` event that returns a `falsy` value cancels the confirmation dialog. - Attaching a handler to the element's `confirm:complete` event that returns a `falsy` value makes this function - return false. The `confirm:complete` event is fired whether or not the user answered true or false to the dialog. - */ - allowAction: function(element) { - var message = element.data('confirm'), - answer = false, callback; - if (!message) { return true; } - - if (rails.fire(element, 'confirm')) { - answer = rails.confirm(message); - callback = rails.fire(element, 'confirm:complete', [answer]); - } - return answer && callback; - }, - - // Helper function which checks for blank inputs in a form that match the specified CSS selector - blankInputs: function(form, specifiedSelector, nonBlank) { - var inputs = $(), input, - selector = specifiedSelector || 'input,textarea'; - form.find(selector).each(function() { - input = $(this); - // Collect non-blank inputs if nonBlank option is true, otherwise, collect blank inputs - if (nonBlank ? input.val() : !input.val()) { - inputs = inputs.add(input); - } - }); - return inputs.length ? inputs : false; - }, - - // Helper function which checks for non-blank inputs in a form that match the specified CSS selector - nonBlankInputs: function(form, specifiedSelector) { - return rails.blankInputs(form, specifiedSelector, true); // true specifies nonBlank - }, - - // Helper function, needed to provide consistent behavior in IE - stopEverything: function(e) { - $(e.target).trigger('ujs:everythingStopped'); - e.stopImmediatePropagation(); - return false; - }, - - // find all the submit events directly bound to the form and - // manually invoke them. If anyone returns false then stop the loop - callFormSubmitBindings: function(form, event) { - var events = form.data('events'), continuePropagation = true; - if (events !== undefined && events['submit'] !== undefined) { - $.each(events['submit'], function(i, obj){ - if (typeof obj.handler === 'function') return continuePropagation = obj.handler(event); - }); - } - return continuePropagation; - }, - - // replace element's html with the 'data-disable-with' after storing original html - // and prevent clicking on it - disableElement: function(element) { - element.data('ujs:enable-with', element.html()); // store enabled state - element.html(element.data('disable-with')); // set to disabled state - element.bind('click.railsDisable', function(e) { // prevent further clicking - return rails.stopEverything(e) - }); - }, - - // restore element to its original state which was disabled by 'disableElement' above - enableElement: function(element) { - if (element.data('ujs:enable-with') !== undefined) { - element.html(element.data('ujs:enable-with')); // set to old enabled state - // this should be element.removeData('ujs:enable-with') - // but, there is currently a bug in jquery which makes hyphenated data attributes not get removed - element.data('ujs:enable-with', false); // clean up cache - } - element.unbind('click.railsDisable'); // enable element - } - - }; - - $.ajaxPrefilter(function(options, originalOptions, xhr){ if ( !options.crossDomain ) { rails.CSRFProtection(xhr); }}); - - $(document).delegate(rails.linkDisableSelector, 'ajax:complete', function() { - rails.enableElement($(this)); - }); - - $(document).delegate(rails.linkClickSelector, 'click.rails', function(e) { - var link = $(this), method = link.data('method'), data = link.data('params'); - if (!rails.allowAction(link)) return rails.stopEverything(e); - - if (link.is(rails.linkDisableSelector)) rails.disableElement(link); - - if (link.data('remote') !== undefined) { - if ( (e.metaKey || e.ctrlKey) && (!method || method === 'GET') && !data ) { return true; } - - if (rails.handleRemote(link) === false) { rails.enableElement(link); } - return false; - - } else if (link.data('method')) { - rails.handleMethod(link); - return false; - } - }); - - $(document).delegate(rails.inputChangeSelector, 'change.rails', function(e) { - var link = $(this); - if (!rails.allowAction(link)) return rails.stopEverything(e); - - rails.handleRemote(link); - return false; - }); - - $(document).delegate(rails.formSubmitSelector, 'submit.rails', function(e) { - var form = $(this), - remote = form.data('remote') !== undefined, - blankRequiredInputs = rails.blankInputs(form, rails.requiredInputSelector), - nonBlankFileInputs = rails.nonBlankInputs(form, rails.fileInputSelector); - - if (!rails.allowAction(form)) return rails.stopEverything(e); - - // skip other logic when required values are missing or file upload is present - if (blankRequiredInputs && form.attr("novalidate") == undefined && rails.fire(form, 'ajax:aborted:required', [blankRequiredInputs])) { - return rails.stopEverything(e); - } - - if (remote) { - if (nonBlankFileInputs) { - return rails.fire(form, 'ajax:aborted:file', [nonBlankFileInputs]); - } - - // If browser does not support submit bubbling, then this live-binding will be called before direct - // bindings. Therefore, we should directly call any direct bindings before remotely submitting form. - if (!$.support.submitBubbles && $().jquery < '1.7' && rails.callFormSubmitBindings(form, e) === false) return rails.stopEverything(e); - - rails.handleRemote(form); - return false; - - } else { - // slight timeout so that the submit button gets properly serialized - setTimeout(function(){ rails.disableFormElements(form); }, 13); - } - }); - - $(document).delegate(rails.formInputClickSelector, 'click.rails', function(event) { - var button = $(this); - - if (!rails.allowAction(button)) return rails.stopEverything(event); - - // register the pressed submit button - var name = button.attr('name'), - data = name ? {name:name, value:button.val()} : null; - - button.closest('form').data('ujs:submit-button', data); - }); - - $(document).delegate(rails.formSubmitSelector, 'ajax:beforeSend.rails', function(event) { - if (this == event.target) rails.disableFormElements($(this)); - }); - - $(document).delegate(rails.formSubmitSelector, 'ajax:complete.rails', function(event) { - if (this == event.target) rails.enableFormElements($(this)); - }); - -})( jQuery ); diff --git a/public/javascripts/vendor/jquery-1.7.1.min.js b/public/javascripts/vendor/jquery-1.7.1.min.js deleted file mode 100644 index 198b3ff07..000000000 --- a/public/javascripts/vendor/jquery-1.7.1.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.7.1 jquery.com | jquery.org/license */ -(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"":"")+""),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g0){if(c!=="border")for(;g=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c
a",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="
"+""+"
",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="
t
",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="
",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")}; -f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;le&&i.push({elem:this,matches:d.slice(e)});for(j=0;j0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="

";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/",""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div
","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function() -{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("
").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window); \ No newline at end of file diff --git a/public/stylesheets/bootstrap2.css b/public/stylesheets/bootstrap2.css deleted file mode 100644 index 43ef8547f..000000000 --- a/public/stylesheets/bootstrap2.css +++ /dev/null @@ -1,3309 +0,0 @@ -/*! - * Bootstrap v2.0.0 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { - display: block; -} -audio, canvas, video { - display: inline-block; - *display: inline; - *zoom: 1; -} -audio:not([controls]) { - display: none; -} -html { - font-size: 100%; - -webkit-text-size-adjust: 100%; - -ms-text-size-adjust: 100%; -} -a:focus { - outline: thin dotted; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -a:hover, a:active { - outline: 0; -} -sub, sup { - position: relative; - font-size: 75%; - line-height: 0; - vertical-align: baseline; -} -sup { - top: -0.5em; -} -sub { - bottom: -0.25em; -} -img { - max-width: 100%; - height: auto; - border: 0; - -ms-interpolation-mode: bicubic; -} -button, -input, -select, -textarea { - margin: 0; - font-size: 100%; - vertical-align: middle; -} -button, input { - *overflow: visible; - line-height: normal; -} -button::-moz-focus-inner, input::-moz-focus-inner { - padding: 0; - border: 0; -} -button, -input[type="button"], -input[type="reset"], -input[type="submit"] { - cursor: pointer; - -webkit-appearance: button; -} -input[type="search"] { - -webkit-appearance: textfield; - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} -input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button { - -webkit-appearance: none; -} -textarea { - overflow: auto; - vertical-align: top; -} -body { - margin: 0; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; - color: #555555; - background-color: #ffffff; -} -a { - color: #0088cc; - text-decoration: none; -} -a:hover { - color: #005580; - text-decoration: underline; -} -.row { - margin-left: -20px; - *zoom: 1; -} -.row:before, .row:after { - display: table; - content: ""; -} -.row:after { - clear: both; -} -[class*="span"] { - float: left; - margin-left: 20px; -} -.span1 { - width: 60px; -} -.span2 { - width: 140px; -} -.span3 { - width: 220px; -} -.span4 { - width: 300px; -} -.span5 { - width: 380px; -} -.span6 { - width: 460px; -} -.span7 { - width: 540px; -} -.span8 { - width: 620px; -} -.span9 { - width: 700px; -} -.span10 { - width: 780px; -} -.span11 { - width: 860px; -} -.span12 { - width: 940px; -} -.offset1 { - margin-left: 100px; -} -.offset2 { - margin-left: 180px; -} -.offset3 { - margin-left: 260px; -} -.offset4 { - margin-left: 340px; -} -.offset5 { - margin-left: 420px; -} -.offset6 { - margin-left: 500px; -} -.offset7 { - margin-left: 580px; -} -.offset8 { - margin-left: 660px; -} -.offset9 { - margin-left: 740px; -} -.offset10 { - margin-left: 820px; -} -.offset11 { - margin-left: 900px; -} -.container { - width: 940px; - margin-left: auto; - margin-right: auto; - *zoom: 1; -} -.container:before, .container:after { - display: table; - content: ""; -} -.container:after { - clear: both; -} -.fluid-container { - position: relative; - min-width: 940px; - padding-left: 20px; - padding-right: 20px; - *zoom: 1; -} -.fluid-container:before, .fluid-container:after { - display: table; - content: ""; -} -.fluid-container:after { - clear: both; -} -.fluid-sidebar { - width: 220px; - margin: 0 20px 18px; -} -.sidebar-left { - padding-left: 260px; -} -.sidebar-right { - padding-right: 260px; -} -.sidebar-left .fluid-sidebar { - float: left; - margin-left: -240px; -} -.sidebar-right .fluid-sidebar { - float: right; - margin-right: -240px; -} -.fluid-content { - float: left; - width: 100%; -} -p { - margin: 0 0 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; -} -p small { - font-size: 11px; - color: #999999; -} -.lead { - margin-bottom: 18px; - font-size: 20px; - font-weight: 200; - line-height: 27px; -} -h1, -h2, -h3, -h4, -h5, -h6 { - margin: 0; - font-weight: bold; - color: #333333; - text-rendering: optimizelegibility; -} -h1 small, -h2 small, -h3 small, -h4 small, -h5 small, -h6 small { - font-weight: normal; - color: #999999; -} -h1 { - font-size: 30px; - line-height: 36px; -} -h1 small { - font-size: 18px; -} -h2 { - font-size: 24px; - line-height: 36px; -} -h2 small { - font-size: 18px; -} -h3 { - line-height: 27px; - font-size: 18px; -} -h3 small { - font-size: 14px; -} -h4, h5, h6 { - line-height: 18px; -} -h4 { - font-size: 14px; -} -h4 small { - font-size: 12px; -} -h5 { - font-size: 12px; -} -h6 { - font-size: 11px; - color: #999999; - text-transform: uppercase; -} -.page-header { - padding-bottom: 17px; - margin: 18px 0; - border-bottom: 1px solid #eeeeee; -} -.page-header h1 { - line-height: 1; -} -ul, ol { - padding: 0; - margin: 0 0 9px 25px; -} -ul ul, -ul ol, -ol ol, -ol ul { - margin-bottom: 0; -} -ul { - list-style: disc; -} -ol { - list-style: decimal; -} -li { - line-height: 18px; -} -ul.unstyled { - margin-left: 0; - list-style: none; -} -dl { - margin-bottom: 18px; -} -dt, dd { - line-height: 18px; -} -dt { - font-weight: bold; -} -dd { - margin-left: 9px; -} -hr { - margin: 18px 0; - border: 0; - border-top: 1px solid #e5e5e5; - border-bottom: 1px solid #ffffff; -} -strong { - font-weight: bold; -} -em { - font-style: italic; -} -.muted { - color: #999999; -} -abbr { - font-size: 90%; - text-transform: uppercase; - border-bottom: 1px dotted #ddd; - cursor: help; -} -blockquote { - padding: 0 0 0 15px; - margin: 0 0 18px; - border-left: 5px solid #eeeeee; -} -blockquote p { - margin-bottom: 0; - font-size: 16px; - font-weight: 300; - line-height: 22.5px; -} -blockquote small { - display: block; - line-height: 18px; - color: #999999; -} -blockquote small:before { - content: '\2014 \00A0'; -} -blockquote.pull-right { - float: right; - padding-left: 0; - padding-right: 15px; - border-left: 0; - border-right: 5px solid #eeeeee; -} -blockquote.pull-right p, blockquote.pull-right small { - text-align: right; -} -q:before, -q:after, -blockquote:before, -blockquote:after { - content: ""; -} -address { - display: block; - margin-bottom: 18px; - line-height: 18px; - font-style: normal; -} -small { - font-size: 100%; -} -cite { - font-style: normal; -} -code, pre { - padding: 0 3px 2px; - font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; - color: #333333; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -code { - padding: 3px 4px; - color: #d14; - background-color: #f7f7f9; - border: 1px solid #e1e1e8; -} -pre { - display: block; - padding: 8.5px; - margin: 0 0 9px; - font-size: 12px; - line-height: 18px; - background-color: #f5f5f5; - border: 1px solid #ccc; - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - white-space: pre; - white-space: pre-wrap; - word-break: break-all; -} -pre.prettyprint { - margin-bottom: 18px; -} -pre code { - padding: 0; - background-color: transparent; -} -form { - margin: 0 0 18px; -} -fieldset { - padding: 0; - margin: 0; - border: 0; -} -legend { - display: block; - width: 100%; - padding: 0; - margin-bottom: 27px; - font-size: 19.5px; - line-height: 36px; - color: #333333; - border: 0; - border-bottom: 1px solid #eee; -} -label, -input, -button, -select, -textarea { - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 18px; -} -label { - display: block; - margin-bottom: 5px; - color: #333333; -} -input, -textarea, -select, -.uneditable-input { - display: inline-block; - width: 210px; - height: 18px; - padding: 4px; - margin-bottom: 9px; - font-size: 13px; - line-height: 18px; - color: #555555; - border: 1px solid #ccc; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.uneditable-textarea { - width: auto; - height: auto; -} -label input, label textarea, label select { - display: block; -} -input[type="image"], input[type="checkbox"], input[type="radio"] { - width: auto; - height: auto; - padding: 0; - margin: 3px 0; - *margin-top: 0; - /* IE7 */ - - line-height: normal; - border: 0; - cursor: pointer; - border-radius: 0 \0/; -} -input[type="file"] { - padding: initial; - line-height: initial; - border: initial; - background-color: #ffffff; - background-color: initial; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -input[type="button"], input[type="reset"], input[type="submit"] { - width: auto; - height: auto; -} -select, input[type="file"] { - height: 28px; - /* In IE7, the height of the select element cannot be changed by height, only font-size */ - - *margin-top: 4px; - /* For IE7, add top margin to align select with labels */ - - line-height: 28px; -} -select { - width: 220px; - background-color: #ffffff; -} -select[multiple], select[size] { - height: auto; -} -input[type="image"] { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -textarea { - height: auto; -} -input[type="hidden"] { - display: none; -} -.radio, .checkbox { - padding-left: 18px; -} -.radio input[type="radio"], .checkbox input[type="checkbox"] { - float: left; - margin-left: -18px; -} -.controls > .radio:first-child, .controls > .checkbox:first-child { - padding-top: 5px; -} -.radio.inline, .checkbox.inline { - display: inline-block; - margin-bottom: 0; - vertical-align: middle; -} -.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline { - margin-left: 10px; -} -.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child { - padding-top: 5px; -} -input, textarea { - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); - -webkit-transition: border linear 0.2s, box-shadow linear 0.2s; - -moz-transition: border linear 0.2s, box-shadow linear 0.2s; - -ms-transition: border linear 0.2s, box-shadow linear 0.2s; - -o-transition: border linear 0.2s, box-shadow linear 0.2s; - transition: border linear 0.2s, box-shadow linear 0.2s; -} -input:focus, textarea:focus { - border-color: rgba(82, 168, 236, 0.8); - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); - outline: 0; - outline: thin dotted \9; - /* IE6-8 */ - -} -input[type="file"]:focus, input[type="checkbox"]:focus, select:focus { - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - outline: thin dotted; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.input-mini { - width: 60px; -} -.input-small { - width: 90px; -} -.input-medium { - width: 150px; -} -.input-large { - width: 210px; -} -.input-xlarge { - width: 270px; -} -.input-xxlarge { - width: 530px; -} -input[class*="span"], -select[class*="span"], -textarea[class*="span"], -.uneditable-input { - float: none; - margin-left: 0; -} -input.span1, textarea.span1, .uneditable-input.span1 { - width: 50px; -} -input.span2, textarea.span2, .uneditable-input.span2 { - width: 130px; -} -input.span3, textarea.span3, .uneditable-input.span3 { - width: 210px; -} -input.span4, textarea.span4, .uneditable-input.span4 { - width: 290px; -} -input.span5, textarea.span5, .uneditable-input.span5 { - width: 370px; -} -input.span6, textarea.span6, .uneditable-input.span6 { - width: 450px; -} -input.span7, textarea.span7, .uneditable-input.span7 { - width: 530px; -} -input.span8, textarea.span8, .uneditable-input.span8 { - width: 610px; -} -input.span9, textarea.span9, .uneditable-input.span9 { - width: 690px; -} -input.span10, textarea.span10, .uneditable-input.span10 { - width: 770px; -} -input.span11, textarea.span11, .uneditable-input.span11 { - width: 850px; -} -input.span12, textarea.span12, .uneditable-input.span12 { - width: 930px; -} -select.span1 { - width: 70px; -} -select.span2 { - width: 150px; -} -select.span3 { - width: 230px; -} -select.span4 { - width: 310px; -} -select.span5 { - width: 390px; -} -select.span6 { - width: 470px; -} -select.span7 { - width: 550px; -} -select.span8 { - width: 630px; -} -select.span9 { - width: 710px; -} -select.span10 { - width: 790px; -} -select.span11 { - width: 870px; -} -select.span12 { - width: 950px; -} -input[disabled], -select[disabled], -textarea[disabled], -input[readonly], -select[readonly], -textarea[readonly] { - background-color: #f5f5f5; - border-color: #ddd; - cursor: not-allowed; -} -.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline { - color: #c09853; -} -.control-group.warning input, .control-group.warning select, .control-group.warning textarea { - color: #c09853; - border-color: #c09853; -} -.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus { - border-color: #a47e3c; - -webkit-box-shadow: 0 0 6px #dbc59e; - -moz-box-shadow: 0 0 6px #dbc59e; - box-shadow: 0 0 6px #dbc59e; -} -.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on { - color: #c09853; - background-color: #fcf8e3; - border-color: #c09853; -} -.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline { - color: #b94a48; -} -.control-group.error input, .control-group.error select, .control-group.error textarea { - color: #b94a48; - border-color: #b94a48; -} -.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus { - border-color: #953b39; - -webkit-box-shadow: 0 0 6px #d59392; - -moz-box-shadow: 0 0 6px #d59392; - box-shadow: 0 0 6px #d59392; -} -.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on { - color: #b94a48; - background-color: #f2dede; - border-color: #b94a48; -} -.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline { - color: #468847; -} -.control-group.success input, .control-group.success select, .control-group.success textarea { - color: #468847; - border-color: #468847; -} -.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus { - border-color: #356635; - -webkit-box-shadow: 0 0 6px #7aba7b; - -moz-box-shadow: 0 0 6px #7aba7b; - box-shadow: 0 0 6px #7aba7b; -} -.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on { - color: #468847; - background-color: #dff0d8; - border-color: #468847; -} -input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid { - color: #b94a48; - border-color: #ee5f5b; -} -input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus { - border-color: #e9322d; - -webkit-box-shadow: 0 0 6px #f8b9b7; - -moz-box-shadow: 0 0 6px #f8b9b7; - box-shadow: 0 0 6px #f8b9b7; -} -.form-actions { - padding: 17px 20px 18px; - margin-top: 18px; - margin-bottom: 18px; - background-color: #f5f5f5; - border-top: 1px solid #ddd; -} -.uneditable-input { - display: block; - background-color: #ffffff; - border-color: #eee; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025); - cursor: not-allowed; -} -:-moz-placeholder { - color: #999999; -} -::-webkit-input-placeholder { - color: #999999; -} -.help-block { - margin-top: 5px; - margin-bottom: 0; - color: #999999; -} -.help-inline { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-bottom: 9px; - vertical-align: middle; - padding-left: 5px; -} -.input-prepend, .input-append { - margin-bottom: 5px; - *zoom: 1; -} -.input-prepend:before, -.input-append:before, -.input-prepend:after, -.input-append:after { - display: table; - content: ""; -} -.input-prepend:after, .input-append:after { - clear: both; -} -.input-prepend input, -.input-append input, -.input-prepend .uneditable-input, -.input-append .uneditable-input { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-prepend input:focus, -.input-append input:focus, -.input-prepend .uneditable-input:focus, -.input-append .uneditable-input:focus { - position: relative; - z-index: 2; -} -.input-prepend .uneditable-input, .input-append .uneditable-input { - border-left-color: #ccc; -} -.input-prepend .add-on, .input-append .add-on { - float: left; - display: block; - width: auto; - min-width: 16px; - height: 18px; - margin-right: -1px; - padding: 4px 4px 4px 5px; - font-weight: normal; - line-height: 18px; - color: #999999; - text-align: center; - text-shadow: 0 1px 0 #ffffff; - background-color: #f5f5f5; - border: 1px solid #ccc; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-prepend .active, .input-append .active { - background-color: #a9dba9; - border-color: #46a546; -} -.input-prepend .add-on { - *margin-top: 1px; - /* IE6-7 */ - -} -.input-append input, .input-append .uneditable-input { - float: left; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.input-append .uneditable-input { - border-right-color: #ccc; -} -.input-append .add-on { - margin-right: 0; - margin-left: -1px; - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.input-append input:first-child { - *margin-left: -160px; -} -.input-append input:first-child + .add-on { - *margin-left: -21px; -} -.search-query { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; - -webkit-border-radius: 14px; - -moz-border-radius: 14px; - border-radius: 14px; -} -.form-search input, -.form-inline input, -.form-horizontal input, -.form-search textarea, -.form-inline textarea, -.form-horizontal textarea, -.form-search select, -.form-inline select, -.form-horizontal select, -.form-search .help-inline, -.form-inline .help-inline, -.form-horizontal .help-inline, -.form-search .uneditable-input, -.form-inline .uneditable-input, -.form-horizontal .uneditable-input { - display: inline-block; - margin-bottom: 0; -} -.form-search label, .form-inline label { - display: inline-block; -} -.control-group { - margin-bottom: 9px; -} -.form-horizontal legend + .control-group { - margin-top: 18px; - -webkit-margin-top-collapse: separate; -} -.form-horizontal .control-group { - margin-bottom: 18px; - *zoom: 1; -} -.form-horizontal .control-group:before, .form-horizontal .control-group:after { - display: table; - content: ""; -} -.form-horizontal .control-group:after { - clear: both; -} -.form-horizontal .control-group > label { - float: left; - width: 140px; - padding-top: 5px; - text-align: right; -} -.form-horizontal .controls { - margin-left: 160px; -} -.form-horizontal .form-actions { - padding-left: 160px; -} -table { - max-width: 100%; - border-collapse: collapse; - border-spacing: 0; -} -.table { - width: 100%; - margin-bottom: 18px; -} -.table th, .table td { - padding: 8px; - line-height: 18px; - text-align: left; - border-top: 1px solid #ddd; -} -.table th { - font-weight: bold; - vertical-align: bottom; -} -.table td { - vertical-align: top; -} -.table thead:first-child tr th, .table thead:first-child tr td { - border-top: 0; -} -.table tbody + tbody { - border-top: 2px solid #ddd; -} -.table-condensed th, .table-condensed td { - padding: 4px 5px; -} -.table-bordered { - border: 1px solid #ddd; - border-collapse: separate; - *border-collapse: collapsed; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.table-bordered th + th, -.table-bordered td + td, -.table-bordered th + td, -.table-bordered td + th { - border-left: 1px solid #ddd; -} -.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td { - border-top: 0; -} -.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child { - -webkit-border-radius: 4px 0 0 0; - -moz-border-radius: 4px 0 0 0; - border-radius: 4px 0 0 0; -} -.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child { - -webkit-border-radius: 0 4px 0 0; - -moz-border-radius: 0 4px 0 0; - border-radius: 0 4px 0 0; -} -.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child { - -webkit-border-radius: 0 0 0 4px; - -moz-border-radius: 0 0 0 4px; - border-radius: 0 0 0 4px; -} -.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child { - -webkit-border-radius: 0 0 4px 0; - -moz-border-radius: 0 0 4px 0; - border-radius: 0 0 4px 0; -} -.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th { - background-color: #f9f9f9; -} -table .span1 { - float: none; - width: 44px; - margin-left: 0; -} -table .span2 { - float: none; - width: 124px; - margin-left: 0; -} -table .span3 { - float: none; - width: 204px; - margin-left: 0; -} -table .span4 { - float: none; - width: 284px; - margin-left: 0; -} -table .span5 { - float: none; - width: 364px; - margin-left: 0; -} -table .span6 { - float: none; - width: 444px; - margin-left: 0; -} -table .span7 { - float: none; - width: 524px; - margin-left: 0; -} -table .span8 { - float: none; - width: 604px; - margin-left: 0; -} -table .span9 { - float: none; - width: 684px; - margin-left: 0; -} -table .span10 { - float: none; - width: 764px; - margin-left: 0; -} -table .span11 { - float: none; - width: 844px; - margin-left: 0; -} -table .span12 { - float: none; - width: 924px; - margin-left: 0; -} -.icon { - background-image: url(../img/glyphicons-halflings.png); - background-position: 14px 14px; - background-repeat: no-repeat; - display: inline-block; - vertical-align: text-top; - width: 14px; - height: 14px; - *margin-right: .3em; -} -.icon:last-child { - *margin-left: 0; -} -.icon.white { - background-image: url(../img/glyphicons-halflings-white.png); -} -.icon.glass { - background-position: 0 0; -} -.icon.music { - background-position: -24px 0; -} -.icon.search { - background-position: -48px 0; -} -.icon.envelope { - background-position: -72px 0; -} -.icon.heart { - background-position: -96px 0; -} -.icon.star { - background-position: -120px 0; -} -.icon.star-empty { - background-position: -144px 0; -} -.icon.user { - background-position: -168px 0; -} -.icon.film { - background-position: -192px 0; -} -.icon.th-large { - background-position: -216px 0; -} -.icon.th { - background-position: -240px 0; -} -.icon.th-list { - background-position: -264px 0; -} -.icon.ok { - background-position: -288px 0; -} -.icon.remove { - background-position: -312px 0; -} -.icon.zoom-in { - background-position: -336px 0; -} -.icon.zoom-out { - background-position: -360px 0; -} -.icon.off { - background-position: -384px 0; -} -.icon.signal { - background-position: -408px 0; -} -.icon.cog { - background-position: -432px 0; -} -.icon.trash { - background-position: -456px 0; -} -.icon.home { - background-position: 0 -24px; -} -.icon.file { - background-position: -24px -24px; -} -.icon.time { - background-position: -48px -24px; -} -.icon.road { - background-position: -72px -24px; -} -.icon.download-alt { - background-position: -96px -24px; -} -.icon.download { - background-position: -120px -24px; -} -.icon.upload { - background-position: -144px -24px; -} -.icon.inbox { - background-position: -168px -24px; -} -.icon.play-circle { - background-position: -192px -24px; -} -.icon.repeat { - background-position: -216px -24px; -} -.icon.refresh { - background-position: -240px -24px; -} -.icon.list-alt { - background-position: -264px -24px; -} -.icon.lock { - background-position: -287px -24px; -} -.icon.flag { - background-position: -312px -24px; -} -.icon.headphones { - background-position: -336px -24px; -} -.icon.volume-off { - background-position: -360px -24px; -} -.icon.volume-down { - background-position: -384px -24px; -} -.icon.volume-up { - background-position: -408px -24px; -} -.icon.qrcode { - background-position: -432px -24px; -} -.icon.barcode { - background-position: -456px -24px; -} -.icon.tag { - background-position: 0 -48px; -} -.icon.tags { - background-position: -25px -48px; -} -.icon.book { - background-position: -48px -48px; -} -.icon.bookmark { - background-position: -72px -48px; -} -.icon.print { - background-position: -96px -48px; -} -.icon.camera { - background-position: -120px -48px; -} -.icon.font { - background-position: -144px -48px; -} -.icon.bold { - background-position: -167px -48px; -} -.icon.italic { - background-position: -192px -48px; -} -.icon.text-height { - background-position: -216px -48px; -} -.icon.text-width { - background-position: -240px -48px; -} -.icon.align-left { - background-position: -264px -48px; -} -.icon.align-center { - background-position: -288px -48px; -} -.icon.align-right { - background-position: -312px -48px; -} -.icon.align-justify { - background-position: -336px -48px; -} -.icon.list { - background-position: -360px -48px; -} -.icon.indent-left { - background-position: -384px -48px; -} -.icon.indent-right { - background-position: -408px -48px; -} -.icon.facetime-video { - background-position: -432px -48px; -} -.icon.picture { - background-position: -456px -48px; -} -.icon.pencil { - background-position: 0 -72px; -} -.icon.map-marker { - background-position: -24px -72px; -} -.icon.adjust { - background-position: -48px -72px; -} -.icon.tint { - background-position: -72px -72px; -} -.icon.edit { - background-position: -96px -72px; -} -.icon.share { - background-position: -120px -72px; -} -.icon.check { - background-position: -144px -72px; -} -.icon.move { - background-position: -168px -72px; -} -.icon.step-backward { - background-position: -192px -72px; -} -.icon.fast-backward { - background-position: -216px -72px; -} -.icon.backward { - background-position: -240px -72px; -} -.icon.play { - background-position: -264px -72px; -} -.icon.pause { - background-position: -288px -72px; -} -.icon.stop { - background-position: -312px -72px; -} -.icon.forward { - background-position: -336px -72px; -} -.icon.fast-forward { - background-position: -360px -72px; -} -.icon.step-forward { - background-position: -384px -72px; -} -.icon.eject { - background-position: -408px -72px; -} -.icon.chevron-left { - background-position: -432px -72px; -} -.icon.chevron-right { - background-position: -456px -72px; -} -.icon.plus-sign { - background-position: 0 -96px; -} -.icon.minus-sign { - background-position: -24px -96px; -} -.icon.remove-sign { - background-position: -48px -96px; -} -.icon.ok-sign { - background-position: -72px -96px; -} -.icon.question-sign { - background-position: -96px -96px; -} -.icon.info-sign { - background-position: -120px -96px; -} -.icon.screenshot { - background-position: -144px -96px; -} -.icon.remove-circle { - background-position: -168px -96px; -} -.icon.ok-circle { - background-position: -192px -96px; -} -.icon.ban-circle { - background-position: -216px -96px; -} -.icon.arrow-left { - background-position: -240px -96px; -} -.icon.arrow-right { - background-position: -264px -96px; -} -.icon.arrow-up { - background-position: -289px -96px; -} -.icon.arrow-down { - background-position: -312px -96px; -} -.icon.share-alt { - background-position: -336px -96px; -} -.icon.resize-full { - background-position: -360px -96px; -} -.icon.resize-small { - background-position: -384px -96px; -} -.icon.plus { - background-position: -408px -96px; -} -.icon.minus { - background-position: -433px -96px; -} -.icon.asterisk { - background-position: -456px -96px; -} -.icon.exclamation-sign { - background-position: 0 -120px; -} -.icon.gift { - background-position: -24px -120px; -} -.icon.leaf { - background-position: -48px -120px; -} -.icon.fire { - background-position: -72px -120px; -} -.icon.eye-open { - background-position: -96px -120px; -} -.icon.eye-close { - background-position: -120px -120px; -} -.icon.warning-sign { - background-position: -144px -120px; -} -.icon.plane { - background-position: -168px -120px; -} -.icon.calendar { - background-position: -192px -120px; -} -.icon.random { - background-position: -216px -120px; -} -.icon.comment { - background-position: -240px -120px; -} -.icon.magnet { - background-position: -264px -120px; -} -.icon.chevron-up { - background-position: -288px -120px; -} -.icon.chevron-down { - background-position: -313px -119px; -} -.icon.retweet { - background-position: -336px -120px; -} -.icon.shopping-cart { - background-position: -360px -120px; -} -.icon.folder-close { - background-position: -384px -120px; -} -.icon.folder-open { - background-position: -408px -120px; -} -.icon.resize-vertical { - background-position: -432px -119px; -} -.icon.resize-horizontal { - background-position: -456px -118px; -} -.dropdown { - position: relative; -} -.dropdown-toggle { - *margin-bottom: -3px; -} -.dropdown-toggle:active, .open .dropdown-toggle { - outline: 0; -} -.caret { - display: inline-block; - width: 0; - height: 0; - text-indent: -99999px; - *text-indent: 0; - vertical-align: top; - border-left: 4px solid transparent; - border-right: 4px solid transparent; - border-top: 4px solid #000000; - opacity: 0.3; - filter: alpha(opacity=30); - content: "\2193"; -} -.dropdown .caret { - margin-top: 8px; - margin-left: 2px; -} -.dropdown:hover .caret, .open.dropdown .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.dropdown-menu { - position: absolute; - top: 100%; - left: 0; - z-index: 1000; - float: left; - display: none; - min-width: 160px; - max-width: 220px; - _width: 160px; - padding: 4px 0; - margin: 0; - list-style: none; - background-color: #ffffff; - border-color: #ccc; - border-color: rgba(0, 0, 0, 0.2); - border-style: solid; - border-width: 1px; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2); - -webkit-background-clip: padding-box; - -moz-background-clip: padding; - background-clip: padding-box; - *border-right-width: 2px; - *border-bottom-width: 2px; -} -.dropdown-menu.bottom-up { - top: auto; - bottom: 100%; - margin-bottom: 2px; -} -.dropdown-menu .divider { - height: 1px; - margin: 5px 1px; - overflow: hidden; - background-color: #e5e5e5; - border-bottom: 1px solid #ffffff; - *width: 100%; - *margin: -5px 0 5px; -} -.dropdown-menu a { - display: block; - padding: 3px 15px; - clear: both; - font-weight: normal; - line-height: 18px; - color: #555555; - white-space: nowrap; -} -.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #0088cc; -} -.dropdown.open { - *z-index: 1000; -} -.dropdown.open .dropdown-toggle { - color: #ffffff; - background: #ccc; - background: rgba(0, 0, 0, 0.3); -} -.dropdown.open .dropdown-menu { - display: block; -} -.typeahead { - margin-top: 2px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.well { - min-height: 20px; - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #eee; - border: 1px solid rgba(0, 0, 0, 0.05); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); -} -.well blockquote { - border-color: #ddd; - border-color: rgba(0, 0, 0, 0.15); -} -.fade { - -webkit-transition: opacity 0.15s linear; - -moz-transition: opacity 0.15s linear; - -ms-transition: opacity 0.15s linear; - -o-transition: opacity 0.15s linear; - transition: opacity 0.15s linear; - opacity: 0; -} -.fade.in { - opacity: 1; -} -.collapse { - -webkit-transition: height 0.35s ease; - -moz-transition: height 0.35s ease; - -ms-transition: height 0.35s ease; - -o-transition: height 0.35s ease; - transition: height 0.35s ease; - position: relative; - overflow: hidden; - height: 0; -} -.collapse.in { - height: auto; -} -.close { - float: right; - font-size: 20px; - font-weight: bold; - line-height: 18px; - color: #000000; - text-shadow: 0 1px 0 #ffffff; - opacity: 0.2; - filter: alpha(opacity=20); -} -.close:hover { - color: #000000; - text-decoration: none; - opacity: 0.4; - filter: alpha(opacity=40); - cursor: pointer; -} -.btn.primary, -.btn.primary:hover, -.btn.danger, -.btn.danger:hover, -.btn.success, -.btn.success:hover, -.btn.info, -.btn.info:hover { - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - color: #ffffff; -} -.btn.primary.active, -.btn.danger.active, -.btn.success.active, -.btn.info.active { - color: rgba(255, 255, 255, 0.75); -} -.btn.primary { - background-color: #006dcc; - background-image: -moz-linear-gradient(top, #0088cc, #0044cc); - background-image: -ms-linear-gradient(top, #0088cc, #0044cc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc)); - background-image: -webkit-linear-gradient(top, #0088cc, #0044cc); - background-image: -o-linear-gradient(top, #0088cc, #0044cc); - background-image: linear-gradient(top, #0088cc, #0044cc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0); - border-color: #0044cc #0044cc #002a80; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn.primary:hover, -.btn.primary:active, -.btn.primary.active, -.btn.primary.disabled, -.btn.primary[disabled] { - background-color: #0044cc; -} -.btn.primary:active, .btn.primary.active { - background-color: #003399 \9; -} -.btn.danger { - background-color: #da4f49; - background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f); - background-image: -o-linear-gradient(top, #ee5f5b, #bd362f); - background-image: linear-gradient(top, #ee5f5b, #bd362f); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0); - border-color: #bd362f #bd362f #802420; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn.danger:hover, -.btn.danger:active, -.btn.danger.active, -.btn.danger.disabled, -.btn.danger[disabled] { - background-color: #bd362f; -} -.btn.danger:active, .btn.danger.active { - background-color: #942a25 \9; -} -.btn.success { - background-color: #5bb75b; - background-image: -moz-linear-gradient(top, #62c462, #51a351); - background-image: -ms-linear-gradient(top, #62c462, #51a351); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351)); - background-image: -webkit-linear-gradient(top, #62c462, #51a351); - background-image: -o-linear-gradient(top, #62c462, #51a351); - background-image: linear-gradient(top, #62c462, #51a351); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0); - border-color: #51a351 #51a351 #387038; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn.success:hover, -.btn.success:active, -.btn.success.active, -.btn.success.disabled, -.btn.success[disabled] { - background-color: #51a351; -} -.btn.success:active, .btn.success.active { - background-color: #408140 \9; -} -.btn.info { - background-color: #49afcd; - background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4)); - background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4); - background-image: -o-linear-gradient(top, #5bc0de, #2f96b4); - background-image: linear-gradient(top, #5bc0de, #2f96b4); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0); - border-color: #2f96b4 #2f96b4 #1f6377; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -} -.btn.info:hover, -.btn.info:active, -.btn.info.active, -.btn.info.disabled, -.btn.info[disabled] { - background-color: #2f96b4; -} -.btn.info:active, .btn.info.active { - background-color: #24748c \9; -} -.btn { - display: inline-block; - padding: 4px 10px 4px; - font-size: 13px; - line-height: 18px; - color: #333333; - text-align: center; - text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - background-color: #fafafa; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); - background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6); - background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); - background-repeat: no-repeat; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0); - border: 1px solid #ccc; - border-bottom-color: #bbb; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - cursor: pointer; - *margin-left: .3em; -} -.btn:first-child { - *margin-left: 0; -} -.btn:hover { - color: #333333; - text-decoration: none; - background-color: #e6e6e6; - background-position: 0 -15px; - -webkit-transition: background-position 0.1s linear; - -moz-transition: background-position 0.1s linear; - -ms-transition: background-position 0.1s linear; - -o-transition: background-position 0.1s linear; - transition: background-position 0.1s linear; -} -.btn:focus { - outline: thin dotted; - outline: 5px auto -webkit-focus-ring-color; - outline-offset: -2px; -} -.btn.active, .btn:active { - background-image: none; - -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - background-color: #e6e6e6; - background-color: #d9d9d9 \9; - color: rgba(0, 0, 0, 0.5); - outline: 0; -} -.btn.disabled, .btn[disabled] { - cursor: default; - background-image: none; - background-color: #e6e6e6; - opacity: 0.65; - filter: alpha(opacity=65); - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; -} -.btn.large { - padding: 9px 14px; - font-size: 15px; - line-height: normal; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn.large .icon { - margin-top: 1px; -} -.btn.small { - padding: 5px 9px; - font-size: 11px; - line-height: 16px; -} -.btn.small .icon { - margin-top: -1px; -} -button.btn, input[type="submit"].btn { - *padding-top: 2px; - *padding-bottom: 2px; -} -button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner { - padding: 0; - border: 0; -} -button.btn.large, input[type="submit"].btn.large { - *padding-top: 7px; - *padding-bottom: 7px; -} -button.btn.small, input[type="submit"].btn.small { - *padding-top: 3px; - *padding-bottom: 3px; -} -.btn-group { - position: relative; - *zoom: 1; - *margin-left: .3em; -} -.btn-group:before, .btn-group:after { - display: table; - content: ""; -} -.btn-group:after { - clear: both; -} -.btn-group:first-child { - *margin-left: 0; -} -.btn-group + .btn-group { - margin-left: 5px; -} -.btn-toolbar { - margin-top: 9px; - margin-bottom: 9px; -} -.btn-toolbar .btn-group { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; -} -.btn-group .btn { - position: relative; - float: left; - margin-left: -1px; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.btn-group .btn:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 4px; - -moz-border-radius-topleft: 4px; - border-top-left-radius: 4px; - -webkit-border-bottom-left-radius: 4px; - -moz-border-radius-bottomleft: 4px; - border-bottom-left-radius: 4px; -} -.btn-group .btn:last-child, .btn-group .dropdown-toggle { - -webkit-border-top-right-radius: 4px; - -moz-border-radius-topright: 4px; - border-top-right-radius: 4px; - -webkit-border-bottom-right-radius: 4px; - -moz-border-radius-bottomright: 4px; - border-bottom-right-radius: 4px; -} -.btn-group .btn.large:first-child { - margin-left: 0; - -webkit-border-top-left-radius: 6px; - -moz-border-radius-topleft: 6px; - border-top-left-radius: 6px; - -webkit-border-bottom-left-radius: 6px; - -moz-border-radius-bottomleft: 6px; - border-bottom-left-radius: 6px; -} -.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle { - -webkit-border-top-right-radius: 6px; - -moz-border-radius-topright: 6px; - border-top-right-radius: 6px; - -webkit-border-bottom-right-radius: 6px; - -moz-border-radius-bottomright: 6px; - border-bottom-right-radius: 6px; -} -.btn-group .btn:hover, -.btn-group .btn:focus, -.btn-group .btn:active, -.btn-group .btn.active { - z-index: 2; -} -.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle { - outline: 0; -} -.btn-group .dropdown-toggle { - padding-left: 8px; - padding-right: 8px; - -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - *padding-top: 5px; - *padding-bottom: 5px; -} -.btn-group.open { - *z-index: 1000; -} -.btn-group.open .dropdown-menu { - display: block; - margin-top: 1px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.btn-group.open .dropdown-toggle { - background-image: none; - -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05); -} -.btn .caret { - margin-top: 7px; - margin-left: 0; -} -.btn:hover .caret, .open.btn-group .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.primary .caret, -.danger .caret, -.info .caret, -.success .caret { - border-top-color: #ffffff; - opacity: 0.75; - filter: alpha(opacity=75); -} -.btn.small .caret { - margin-top: 4px; -} -.alert { - padding: 8px 35px 8px 14px; - margin-bottom: 18px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); - background-color: #fcf8e3; - border: 1px solid #fbeed5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.alert, .alert-heading { - color: #c09853; -} -.alert .close { - position: relative; - top: -2px; - right: -21px; - line-height: 18px; -} -.alert-success { - background-color: #dff0d8; - border-color: #d6e9c6; -} -.alert-success, .alert-success .alert-heading { - color: #468847; -} -.alert-danger, .alert-error { - background-color: #f2dede; - border-color: #eed3d7; -} -.alert-danger, -.alert-error, -.alert-danger .alert-heading, -.alert-error .alert-heading { - color: #b94a48; -} -.alert-info { - background-color: #d9edf7; - border-color: #bce8f1; -} -.alert-info, .alert-info .alert-heading { - color: #3a87ad; -} -.alert-block { - padding-top: 14px; - padding-bottom: 14px; -} -.alert-block > p, .alert-block > ul { - margin-bottom: 0; -} -.alert-block p + p { - margin-top: 5px; -} -.nav { - margin-left: 0; - margin-bottom: 18px; - list-style: none; -} -.nav > li > a { - display: block; -} -.nav > li > a:hover { - text-decoration: none; - background-color: #eeeeee; -} -.nav.list { - padding-left: 14px; - padding-right: 14px; - margin-bottom: 0; -} -.nav.list > li > a, .nav.list .nav-header { - display: block; - padding: 3px 15px; - margin-left: -15px; - margin-right: -15px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); -} -.nav.list .nav-header { - font-size: 11px; - font-weight: bold; - line-height: 18px; - color: #999999; - text-transform: uppercase; -} -.nav.list > li + .nav-header { - margin-top: 9px; -} -.nav.list .active > a { - color: #ffffff; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2); - background-color: #0088cc; -} -.nav.list .icon { - margin-right: 2px; -} -.tabs, .pills { - *zoom: 1; -} -.tabs:before, -.pills:before, -.tabs:after, -.pills:after { - display: table; - content: ""; -} -.tabs:after, .pills:after { - clear: both; -} -.tabs > li, .pills > li { - float: left; -} -.tabs > li > a, .pills > li > a { - padding-right: 12px; - padding-left: 12px; - margin-right: 2px; - line-height: 14px; -} -.tabs { - border-bottom: 1px solid #ddd; -} -.tabs > li { - margin-bottom: -1px; -} -.tabs > li > a { - padding-top: 9px; - padding-bottom: 9px; - border: 1px solid transparent; - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.tabs > li > a:hover { - border-color: #eeeeee #eeeeee #dddddd; -} -.tabs > .active > a, .tabs > .active > a:hover { - color: #555555; - background-color: #ffffff; - border: 1px solid #ddd; - border-bottom-color: transparent; - cursor: default; -} -.pills > li > a { - padding-top: 8px; - padding-bottom: 8px; - margin-top: 2px; - margin-bottom: 2px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; -} -.pills .active > a, .pills .active > a:hover { - color: #ffffff; - background-color: #0088cc; -} -.nav.stacked > li { - float: none; -} -.nav.stacked > li > a { - margin-right: 0; -} -.tabs.stacked { - border-bottom: 0; -} -.tabs.stacked > li > a { - border: 1px solid #ddd; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; -} -.tabs.stacked > li:first-child > a { - -webkit-border-radius: 4px 4px 0 0; - -moz-border-radius: 4px 4px 0 0; - border-radius: 4px 4px 0 0; -} -.tabs.stacked > li:last-child > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs.stacked > li > a:hover { - border-color: #ddd; - z-index: 2; -} -.pills.stacked > li > a { - margin-bottom: 3px; -} -.pills.stacked > li:last-child > a { - margin-bottom: 1px; -} -.pills .dropdown-menu, .tabs .dropdown-menu { - margin-top: 1px; - border-width: 1px; -} -.pills .dropdown-menu { - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.tabs .dropdown-toggle .caret, .pills .dropdown-toggle .caret { - border-top-color: #0088cc; - margin-top: 6px; -} -.tabs .dropdown-toggle:hover .caret, .pills .dropdown-toggle:hover .caret { - border-top-color: #005580; -} -.tabs .active .dropdown-toggle .caret, .pills .active .dropdown-toggle .caret { - border-top-color: #333333; -} -.nav > .dropdown.active > a:hover { - color: #000000; - cursor: pointer; -} -.tabs .open .dropdown-toggle, .pills .open .dropdown-toggle, .nav > .open.active > a:hover { - color: #ffffff; - background-color: #999999; - border-color: #999999; -} -.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret { - border-top-color: #ffffff; - opacity: 1; - filter: alpha(opacity=100); -} -.tabs.stacked .open > a:hover { - border-color: #999999; -} -.tabbable { - *zoom: 1; -} -.tabbable:before, .tabbable:after { - display: table; - content: ""; -} -.tabbable:after { - clear: both; -} -.tabs-below .tabs, .tabs-right .tabs, .tabs-left .tabs { - border-bottom: 0; -} -.tab-content > .tab-pane, .pill-content > .pill-pane { - display: none; -} -.tab-content > .active, .pill-content > .active { - display: block; -} -.tabs-below .tabs { - border-top: 1px solid #ddd; -} -.tabs-below .tabs > li { - margin-top: -1px; - margin-bottom: 0; -} -.tabs-below .tabs > li > a { - -webkit-border-radius: 0 0 4px 4px; - -moz-border-radius: 0 0 4px 4px; - border-radius: 0 0 4px 4px; -} -.tabs-below .tabs > li > a:hover { - border-bottom-color: transparent; - border-top-color: #ddd; -} -.tabs-below .tabs .active > a, .tabs-below .tabs .active > a:hover { - border-color: transparent #ddd #ddd #ddd; -} -.tabs-left .tabs > li, .tabs-right .tabs > li { - float: none; -} -.tabs-left .tabs > li > a, .tabs-right .tabs > li > a { - min-width: 74px; - margin-right: 0; - margin-bottom: 3px; -} -.tabs-left .tabs { - float: left; - margin-right: 19px; - border-right: 1px solid #ddd; -} -.tabs-left .tabs > li > a { - margin-right: -1px; - -webkit-border-radius: 4px 0 0 4px; - -moz-border-radius: 4px 0 0 4px; - border-radius: 4px 0 0 4px; -} -.tabs-left .tabs > li > a:hover { - border-color: #eeeeee #dddddd #eeeeee #eeeeee; -} -.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { - border-color: #ddd transparent #ddd #ddd; - *border-right-color: #ffffff; -} -.tabs-right .tabs { - float: right; - margin-left: 19px; - border-left: 1px solid #ddd; -} -.tabs-right .tabs > li > a { - margin-left: -1px; - -webkit-border-radius: 0 4px 4px 0; - -moz-border-radius: 0 4px 4px 0; - border-radius: 0 4px 4px 0; -} -.tabs-right .tabs > li > a:hover { - border-color: #eeeeee #eeeeee #eeeeee #dddddd; -} -.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { - border-color: #ddd #ddd #ddd transparent; - *border-left-color: #ffffff; -} -.navbar { - overflow: visible; -} -.navbar-inner { - background-color: #222222; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1); -} -.btn-navbar { - display: none; - float: right; - padding: 7px 10px; - margin-left: 5px; - margin-right: 5px; - background-color: #2c2c2c; - background-image: -moz-linear-gradient(top, #333333, #222222); - background-image: -ms-linear-gradient(top, #333333, #222222); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222)); - background-image: -webkit-linear-gradient(top, #333333, #222222); - background-image: -o-linear-gradient(top, #333333, #222222); - background-image: linear-gradient(top, #333333, #222222); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0); - border-color: #222222 #222222 #000000; - border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); - filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); -} -.btn-navbar:hover, -.btn-navbar:active, -.btn-navbar.active, -.btn-navbar.disabled, -.btn-navbar[disabled] { - background-color: #222222; -} -.btn-navbar:active, .btn-navbar.active { - background-color: #080808 \9; -} -.btn-navbar .i-bar { - display: block; - width: 18px; - height: 2px; - background-color: #f5f5f5; - -webkit-border-radius: 1px; - -moz-border-radius: 1px; - border-radius: 1px; - -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); - box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25); -} -.btn-navbar .i-bar + .i-bar { - margin-top: 3px; -} -.navbar .brand:hover { - text-decoration: none; -} -.navbar .brand { - float: left; - display: block; - padding: 8px 20px 12px; - margin-left: -20px; - font-size: 20px; - font-weight: 200; - line-height: 1; - color: #ffffff; -} -.navbar .navbar-text { - margin-bottom: 0; - line-height: 40px; - color: #999999; -} -.navbar .navbar-text a:hover { - color: #ffffff; - background-color: transparent; -} -.navbar .btn, .navbar .btn-group { - margin-top: 5px; -} -.navbar .btn-group .btn { - margin-top: 0; -} -.navbar-form { - margin-bottom: 0; -} -.navbar-form input, .navbar-form select { - display: inline-block; - margin-top: 5px; - margin-bottom: 0; -} -.navbar-form .radio, .navbar-form .checkbox { - margin-top: 5px; -} -.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] { - margin-top: 3px; -} -.navbar-search { - position: relative; - float: left; - margin-top: 6px; - margin-bottom: 0; -} -.navbar-search .search-query { - padding: 4px 9px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; - font-weight: normal; - line-height: 1; - color: #ffffff; - color: rgba(255, 255, 255, 0.75); - background: #666; - background: rgba(255, 255, 255, 0.3); - border: 1px solid #111; - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); - -webkit-transition: none; - -moz-transition: none; - -ms-transition: none; - -o-transition: none; - transition: none; -} -.navbar-search .search-query :-moz-placeholder { - color: #eeeeee; -} -.navbar-search .search-query::-webkit-input-placeholder { - color: #eeeeee; -} -.navbar-search .search-query:hover { - color: #ffffff; - background-color: #999999; - background-color: rgba(255, 255, 255, 0.5); -} -.navbar-search .search-query:focus, .navbar-search .search-query.focused { - padding: 5px 10px; - color: #333333; - text-shadow: 0 1px 0 #ffffff; - background-color: #ffffff; - border: 0; - -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - box-shadow: 0 0 3px rgba(0, 0, 0, 0.15); - outline: 0; -} -.navbar-static { - margin-bottom: 18px; -} -.navbar-static .navbar-inner { - padding-left: 20px; - padding-right: 20px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar-fixed-top { - position: fixed; - top: 0; - right: 0; - left: 0; - z-index: 1030; -} -.navbar .nav { - position: relative; - left: 0; - display: block; - float: left; - margin: 0 10px 0 0; -} -.navbar .nav.pull-right { - float: right; -} -.navbar .nav > li { - display: block; - float: left; -} -.navbar .nav > li > a { - float: none; - padding: 10px 10px 11px; - line-height: 19px; - color: #999999; - text-decoration: none; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); -} -.navbar .nav > li > a:hover { - background-color: transparent; - color: #ffffff; - text-decoration: none; -} -.navbar .nav .active > a, .navbar .nav .active > a:hover { - color: #ffffff; - text-decoration: none; - background-color: #222222; - background-color: rgba(0, 0, 0, 0.5); -} -.navbar .vertical-divider { - height: 40px; - width: 1px; - margin: 0 5px; - overflow: hidden; - background-color: #222222; - border-right: 1px solid #333333; -} -.navbar .nav.pull-right { - margin-left: 10px; - margin-right: 0; -} -.navbar .dropdown-menu { - margin-top: 1px; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.navbar .dropdown-menu:before { - content: ''; - display: inline-block; - border-left: 7px solid transparent; - border-right: 7px solid transparent; - border-bottom: 7px solid #ccc; - border-bottom-color: rgba(0, 0, 0, 0.2); - position: absolute; - top: -7px; - left: 9px; -} -.navbar .dropdown-menu:after { - content: ''; - display: inline-block; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - border-bottom: 6px solid #ffffff; - position: absolute; - top: -6px; - left: 10px; -} -.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret { - border-top-color: #ffffff; -} -.navbar .nav .active .caret { - opacity: 1; - filter: alpha(opacity=100); -} -.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle { - background-color: transparent; -} -.navbar .nav .active > .dropdown-toggle:hover { - color: #ffffff; -} -.navbar .nav.pull-right .dropdown-menu { - left: auto; - right: 0; -} -.navbar .nav.pull-right .dropdown-menu:before { - left: auto; - right: 12px; -} -.navbar .nav.pull-right .dropdown-menu:after { - left: auto; - right: 13px; -} -.breadcrumb { - padding: 7px 14px; - margin: 0 0 18px; - background-color: #fbfbfb; - background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5)); - background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5); - background-image: -o-linear-gradient(top, #ffffff, #f5f5f5); - background-image: linear-gradient(top, #ffffff, #f5f5f5); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0); - border: 1px solid #ddd; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; -} -.breadcrumb li { - display: inline; - text-shadow: 0 1px 0 #ffffff; -} -.breadcrumb .divider { - padding: 0 5px; - color: #999999; -} -.breadcrumb .active a { - color: #333333; -} -.pagination { - height: 36px; - margin: 18px 0; -} -.pagination ul { - display: inline-block; - *display: inline; - /* IE7 inline-block hack */ - - *zoom: 1; - margin-left: 0; - margin-bottom: 0; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05); -} -.pagination li { - display: inline; -} -.pagination a { - float: left; - padding: 0 14px; - line-height: 34px; - text-decoration: none; - border: 1px solid #ddd; - border-left-width: 0; -} -.pagination a:hover, .pagination .active a { - background-color: #f5f5f5; -} -.pagination .active a { - color: #999999; -} -.pagination .disabled a, .pagination .disabled a:hover { - color: #999999; - background-color: transparent; - cursor: default; -} -.pagination li:first-child a { - border-left-width: 1px; - -webkit-border-radius: 3px 0 0 3px; - -moz-border-radius: 3px 0 0 3px; - border-radius: 3px 0 0 3px; -} -.pagination li:last-child a { - -webkit-border-radius: 0 3px 3px 0; - -moz-border-radius: 0 3px 3px 0; - border-radius: 0 3px 3px 0; -} -.pagination-centered { - text-align: center; -} -.pagination-right { - text-align: right; -} -.pager { - margin-left: 0; - margin-bottom: 18px; - list-style: none; - text-align: center; - *zoom: 1; -} -.pager:before, .pager:after { - display: table; - content: ""; -} -.pager:after { - clear: both; -} -.pager li { - display: inline; -} -.pager a { - display: inline-block; - padding: 6px 15px; - background-color: #f5f5f5; - -webkit-border-radius: 15px; - -moz-border-radius: 15px; - border-radius: 15px; -} -.pager .next a { - float: right; -} -.pager .previous a { - float: left; -} -.modal-open .dropdown-menu { - z-index: 2050; -} -.modal-open .dropdown.open { - *z-index: 2050; -} -.modal-open .popover { - z-index: 2060; -} -.modal-open .tooltip { - z-index: 2070; -} -.modal-backdrop { - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1040; - background-color: #000000; -} -.modal-backdrop.fade { - opacity: 0; -} -.modal-backdrop, .modal-backdrop.fade.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.modal { - position: fixed; - top: 50%; - left: 50%; - z-index: 1050; - max-height: 500px; - overflow: auto; - width: 560px; - margin: -250px 0 0 -280px; - background-color: #ffffff; - border: 1px solid #999; - border: 1px solid rgba(0, 0, 0, 0.3); - *border: 1px solid #999; - /* IE6-7 */ - - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.modal.fade { - -webkit-transition: opacity .3s linear, top .3s ease-out; - -moz-transition: opacity .3s linear, top .3s ease-out; - -ms-transition: opacity .3s linear, top .3s ease-out; - -o-transition: opacity .3s linear, top .3s ease-out; - transition: opacity .3s linear, top .3s ease-out; - top: -25%; -} -.modal.fade.in { - top: 50%; -} -.modal-header { - padding: 9px 15px; - border-bottom: 1px solid #eee; -} -.modal-header .close { - margin-top: 2px; -} -.modal-body { - padding: 15px; -} -.modal-footer { - padding: 14px 15px 15px; - margin-bottom: 0; - background-color: #f5f5f5; - border-top: 1px solid #ddd; - -webkit-border-radius: 0 0 6px 6px; - -moz-border-radius: 0 0 6px 6px; - border-radius: 0 0 6px 6px; - -webkit-box-shadow: inset 0 1px 0 #ffffff; - -moz-box-shadow: inset 0 1px 0 #ffffff; - box-shadow: inset 0 1px 0 #ffffff; - *zoom: 1; -} -.modal-footer:before, .modal-footer:after { - display: table; - content: ""; -} -.modal-footer:after { - clear: both; -} -.modal-footer .btn { - float: right; - margin-left: 5px; - margin-bottom: 0; -} -.tooltip { - position: absolute; - z-index: 1020; - display: block; - visibility: visible; - padding: 5px; - font-size: 11px; - opacity: 0; - filter: alpha(opacity=0); -} -.tooltip.in { - opacity: 0.8; - filter: alpha(opacity=80); -} -.tooltip.top { - margin-top: -2px; -} -.tooltip.right { - margin-left: 2px; -} -.tooltip.bottom { - margin-top: 2px; -} -.tooltip.left { - margin-left: -2px; -} -.tooltip.top .tooltip-arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.tooltip.left .tooltip-arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.tooltip.bottom .tooltip-arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.tooltip.right .tooltip-arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.tooltip-inner { - max-width: 200px; - padding: 3px 8px; - color: #ffffff; - text-align: center; - text-decoration: none; - background-color: #000000; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.tooltip-arrow { - position: absolute; - width: 0; - height: 0; -} -.popover { - position: absolute; - top: 0; - left: 0; - z-index: 1010; - display: none; - padding: 5px; -} -.popover.top { - margin-top: -5px; -} -.popover.right { - margin-left: 5px; -} -.popover.bottom { - margin-top: 5px; -} -.popover.left { - margin-left: -5px; -} -.popover.top .arrow { - bottom: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-top: 5px solid #000000; -} -.popover.right .arrow { - top: 50%; - left: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-right: 5px solid #000000; -} -.popover.bottom .arrow { - top: 0; - left: 50%; - margin-left: -5px; - border-left: 5px solid transparent; - border-right: 5px solid transparent; - border-bottom: 5px solid #000000; -} -.popover.left .arrow { - top: 50%; - right: 0; - margin-top: -5px; - border-top: 5px solid transparent; - border-bottom: 5px solid transparent; - border-left: 5px solid #000000; -} -.popover .arrow { - position: absolute; - width: 0; - height: 0; -} -.popover .inner { - padding: 3px; - width: 280px; - overflow: hidden; - background: #000000; - background: rgba(0, 0, 0, 0.8); - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; - -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); - box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3); -} -.popover .title { - padding: 9px 15px; - line-height: 1; - background-color: #f5f5f5; - border-bottom: 1px solid #eee; - -webkit-border-radius: 3px 3px 0 0; - -moz-border-radius: 3px 3px 0 0; - border-radius: 3px 3px 0 0; -} -.popover .content { - padding: 14px; - background-color: #ffffff; - -webkit-border-radius: 0 0 3px 3px; - -moz-border-radius: 0 0 3px 3px; - border-radius: 0 0 3px 3px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} -.popover .content p, .popover .content ul, .popover .content ol { - margin-bottom: 0; -} -.thumbnails { - margin-left: -20px; - list-style: none; - *zoom: 1; -} -.thumbnails:before, .thumbnails:after { - display: table; - content: ""; -} -.thumbnails:after { - clear: both; -} -.thumbnails > li { - float: left; - margin: 0 0 18px 20px; -} -.thumbnail { - display: block; - padding: 4px; - line-height: 1; - border: 1px solid #ddd; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075); -} -a.thumbnail:hover { - border-color: #0088cc; - -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); - box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25); -} -.thumbnail > img { - display: block; - max-width: 100%; -} -.thumbnail .caption { - padding: 9px; -} -.label { - padding: 1px 3px 2px; - font-size: 9.75px; - font-weight: bold; - color: #ffffff; - text-transform: uppercase; - background-color: #999999; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; -} -.label.important { - background-color: #b94a48; -} -.label.warning { - background-color: #f89406; -} -.label.success { - background-color: #468847; -} -.label.info { - background-color: #3a87ad; -} -@-webkit-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@-moz-keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -@keyframes progress-bar-stripes { - from { - background-position: 0 0; - } - to { - background-position: 40px 0; - } -} -.progress { - overflow: hidden; - height: 18px; - margin-bottom: 18px; - background-color: #f7f7f7; - background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); - background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); - background-image: linear-gradient(top, #f5f5f5, #f9f9f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0); - -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.progress .bar { - width: 0%; - height: 18px; - color: #ffffff; - font-size: 12px; - text-align: center; - text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); - background-color: #0e90d2; - background-image: -moz-linear-gradient(top, #149bdf, #0480be); - background-image: -ms-linear-gradient(top, #149bdf, #0480be); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); - background-image: -webkit-linear-gradient(top, #149bdf, #0480be); - background-image: -o-linear-gradient(top, #149bdf, #0480be); - background-image: linear-gradient(top, #149bdf, #0480be); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0); - -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - -webkit-transition: width 0.6s ease; - -moz-transition: width 0.6s ease; - -ms-transition: width 0.6s ease; - -o-transition: width 0.6s ease; - transition: width 0.6s ease; -} -.progress.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - -webkit-background-size: 40px 40px; - -moz-background-size: 40px 40px; - -o-background-size: 40px 40px; - background-size: 40px 40px; -} -.progress.active .bar { - -webkit-animation: progress-bar-stripes 2s linear infinite; - -moz-animation: progress-bar-stripes 2s linear infinite; - animation: progress-bar-stripes 2s linear infinite; -} -.progress.danger .bar { - background-color: #dd514c; - background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); - background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); - background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); - background-image: linear-gradient(top, #ee5f5b, #c43c35); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0); -} -.progress.danger.striped .bar { - background-color: #ee5f5b; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.success .bar { - background-color: #5eb95e; - background-image: -moz-linear-gradient(top, #62c462, #57a957); - background-image: -ms-linear-gradient(top, #62c462, #57a957); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); - background-image: -webkit-linear-gradient(top, #62c462, #57a957); - background-image: -o-linear-gradient(top, #62c462, #57a957); - background-image: linear-gradient(top, #62c462, #57a957); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0); -} -.progress.success.striped .bar { - background-color: #62c462; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.progress.info .bar { - background-color: #4bb1cf; - background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); - background-image: -ms-linear-gradient(top, #5bc0de, #339bb9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); - background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); - background-image: -o-linear-gradient(top, #5bc0de, #339bb9); - background-image: linear-gradient(top, #5bc0de, #339bb9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0); -} -.progress.info.striped .bar { - background-color: #5bc0de; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); -} -.accordion { - margin-bottom: 18px; -} -.accordion-group { - margin-bottom: 2px; - border: 1px solid #e5e5e5; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; -} -.accordion-heading { - border-bottom: 0; -} -.accordion-heading .accordion-toggle { - display: block; - padding: 8px 15px; -} -.accordion-inner { - padding: 9px 15px; - border-top: 1px solid #e5e5e5; -} -.carousel { - position: relative; - line-height: 1; -} -.carousel-inner { - overflow: hidden; - width: 100%; - position: relative; -} -.carousel .item { - display: none; - position: relative; - -webkit-transition: 0.6s ease-in-out left; - -moz-transition: 0.6s ease-in-out left; - -ms-transition: 0.6s ease-in-out left; - -o-transition: 0.6s ease-in-out left; - transition: 0.6s ease-in-out left; -} -.carousel .item > img { - display: block; - line-height: 1; -} -.carousel .active, .carousel .next, .carousel .prev { - display: block; -} -.carousel .active { - left: 0; -} -.carousel .next, .carousel .prev { - position: absolute; - top: 0; - width: 100%; -} -.carousel .next { - left: 100%; -} -.carousel .prev { - left: -100%; -} -.carousel .next.left, .carousel .prev.right { - left: 0; -} -.carousel .active.left { - left: -100%; -} -.carousel .active.right { - left: 100%; -} -.carousel-control { - position: absolute; - top: 40%; - left: 15px; - width: 40px; - height: 40px; - margin-top: -20px; - font-size: 60px; - font-weight: 100; - line-height: 30px; - color: #ffffff; - text-align: center; - background: #222222; - border: 3px solid #ffffff; - -webkit-border-radius: 23px; - -moz-border-radius: 23px; - border-radius: 23px; - opacity: 0.5; - filter: alpha(opacity=50); -} -.carousel-control.right { - left: auto; - right: 15px; -} -.carousel-control:hover { - color: #ffffff; - text-decoration: none; - opacity: 0.9; - filter: alpha(opacity=90); -} -.carousel-caption { - position: absolute; - left: 0; - right: 0; - bottom: 0; - padding: 10px 15px 5px; - background: #333333; - background: rgba(0, 0, 0, 0.75); -} -.carousel-caption h4, .carousel-caption p { - color: #ffffff; -} -.hero-unit { - padding: 60px; - margin-bottom: 30px; - background-color: #f5f5f5; - -webkit-border-radius: 6px; - -moz-border-radius: 6px; - border-radius: 6px; -} -.hero-unit h1 { - margin-bottom: 0; - font-size: 60px; - line-height: 1; - letter-spacing: -1px; -} -.hero-unit p { - font-size: 18px; - font-weight: 200; - line-height: 27px; -} -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.hide { - display: none; -} -.show { - display: block; -} -.invisible { - visibility: hidden; -} From 5b2716d2efbf5fb576960cf7392f1c3184dbd7fd Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Wed, 21 Mar 2012 16:15:10 -0700 Subject: [PATCH 02/20] MS DG; move images to assets --- {public => app/assets}/images/404.png | Bin .../assets}/images/add_contact_button.png | Bin {public => app/assets}/images/ajax-loader.gif | Bin .../assets}/images/ajax-loader2.gif | Bin .../assets}/images/ajax-loader_inverted.gif | Bin .../assets}/images/apple-splash.png | Bin {public => app/assets}/images/arrow-left.png | Bin {public => app/assets}/images/arrow-right.png | Bin {public => app/assets}/images/arrow.psd | Bin {public => app/assets}/images/asterisk.png | Bin .../assets}/images/asterisk_white.png | Bin {public => app/assets}/images/ball.png | Bin {public => app/assets}/images/ball_small.png | Bin {public => app/assets}/images/close_label.png | Bin .../assets}/images/connect_services.png | Bin .../assets}/images/cubbies_collage.png | Bin .../assets}/images/cubbies_screenshot2.png | Bin {public => app/assets}/images/deletelabel.png | Bin .../assets}/images/diaspora_collage.png | Bin .../images/diaspora_mobile_screens.png | Bin .../assets}/images/down-tick-inset.png | Bin .../assets}/images/facebox/closelabel.png | Bin .../assets}/images/facebox/loading.gif | Bin .../assets}/images/hatched-bg-dark.png | Bin .../assets}/images/hatched-bg-small.jpg | Bin {public => app/assets}/images/hatched-bg.jpg | Bin .../assets}/images/header-bg-long.jpg | Bin {public => app/assets}/images/header-bg.png | Bin {public => app/assets}/images/header-logo.png | Bin .../assets}/images/header-logo2x.png | Bin .../assets}/images/icons/arrow_down.png | Bin .../assets}/images/icons/arrow_down_small.png | Bin .../assets}/images/icons/arrow_up_small.png | Bin .../assets}/images/icons/back_white.png | Bin .../assets}/images/icons/bookmark.png | Bin .../assets}/images/icons/camera.png | Bin .../assets}/images/icons/check_yes_ok.png | Bin .../images/icons/check_yes_ok_lighter.png | Bin .../images/icons/check_yes_ok_white.png | Bin .../assets}/images/icons/coffee.png | Bin {public => app/assets}/images/icons/cog.png | Bin .../images/icons/comment_mobile_grey.png | Bin .../assets}/images/icons/compose_mobile.png | Bin .../assets}/images/icons/compose_mobile2.png | Bin .../assets}/images/icons/cubbies.png | Bin {public => app/assets}/images/icons/globe.png | Bin {public => app/assets}/images/icons/heart.png | Bin .../images/icons/heart_mobile_grey.png | Bin .../assets}/images/icons/heart_mobile_red.png | Bin .../assets}/images/icons/home_grey.png | Bin .../assets}/images/icons/ignoreuser.png | Bin .../assets}/images/icons/list_white.png | Bin .../assets}/images/icons/mail_big.png | Bin .../assets}/images/icons/mail_grey.png | Bin .../images/icons/monotone_add_plus.png | Bin .../images/icons/monotone_check_yes.png | Bin .../icons/monotone_close_exit_delete.png | Bin .../icons/monotone_email_letter_round.png | Bin .../images/icons/monotone_pen_write.png | Bin .../images/icons/monotone_plus_add_round.png | Bin .../images/icons/monotone_question.png | Bin .../images/icons/monotone_wrench_settings.png | Bin .../images/icons/notifications_grey.png | Bin .../assets}/images/icons/padlock-closed.png | Bin .../assets}/images/icons/padlock-open.png | Bin .../assets}/images/icons/pen_write.png | Bin .../assets}/images/icons/pencil.png | Bin .../images/icons/pencil_mobile_grey.png | Bin .../icons/pencil_mobile_grey_active.png | Bin .../icons/pencil_mobile_grey_mobile.png | Bin {public => app/assets}/images/icons/photo.png | Bin {public => app/assets}/images/icons/plus.png | Bin .../assets}/images/icons/question.png | Bin .../assets}/images/icons/reshare_mobile.png | Bin .../images/icons/reshare_mobile_active.png | Bin .../assets}/images/icons/search_white.png | Bin .../assets}/images/icons/smiley_laughing.png | Bin {public => app/assets}/images/logo_caps.png | Bin {public => app/assets}/images/logo_large.png | Bin {public => app/assets}/images/logo_small.png | Bin .../assets}/images/mobile-spinner.gif | Bin {public => app/assets}/images/mobile.jpg | Bin {public => app/assets}/images/mocks/bp.jpeg | Bin .../assets}/images/mocks/user_pic.jpeg | Bin .../assets}/images/modern_browsers.png | Bin {public => app/assets}/images/pen_white.png | Bin .../assets}/images/powered_by_diaspora.png | Bin .../images/press_logos/mashable_logo.png | Bin .../assets}/images/press_logos/nymag_logo.png | Bin .../images/press_logos/techcrunch_logo.png | Bin .../press_logos/the_new_york_times_logo.png | Bin {public => app/assets}/images/reply.png | Bin {public => app/assets}/images/seed.jpg | Bin .../images/services/facebook_sign_in.png | Bin .../images/services/twitter_sign_in.png | Bin .../images/social_media_logos/email-16x16.png | Bin .../images/social_media_logos/email-24x24.png | Bin .../images/social_media_logos/email-32x32.png | Bin .../images/social_media_logos/email-48x48.png | Bin .../social_media_logos/facebook-16x16.png | Bin .../social_media_logos/facebook-24x24.png | Bin .../social_media_logos/facebook-32x32.png | Bin .../social_media_logos/facebook-48x48.png | Bin .../images/social_media_logos/feed-16x16.png | Bin .../images/social_media_logos/feed-24x24.png | Bin .../images/social_media_logos/feed-32x32.png | Bin .../images/social_media_logos/feed-48x48.png | Bin .../social_media_logos/tumblr-16x16.png | Bin .../social_media_logos/tumblr-24x24.png | Bin .../social_media_logos/tumblr-32x32.png | Bin .../social_media_logos/tumblr-48x48.png | Bin .../social_media_logos/twitter-16x16.png | Bin .../social_media_logos/twitter-24x24.png | Bin .../social_media_logos/twitter-32x32.png | Bin .../social_media_logos/twitter-48x48.png | Bin .../social_media_logos/website-16x16.png | Bin .../social_media_logos/website-24x24.png | Bin .../social_media_logos/website-32x32.png | Bin .../social_media_logos/website-48x48.png | Bin .../assets}/images/static-loader.png | Bin {public => app/assets}/images/tipsy.gif | Bin .../assets}/images/up-tick-inset.png | Bin {public => app/assets}/images/user/angela.jpg | Bin .../assets}/images/user/default.png | Bin {public => app/assets}/images/user/uma.jpg | Bin {public => app/assets}/images/user/wolf.jpg | Bin .../assets}/images/video-overlay.png | Bin {public => app/assets}/images/white.png | Bin {public => app/assets}/images/white@2x.png | Bin .../assets}/images/white_on_grey.png | Bin app/assets/stylesheets/application.css.sass | 14 ++++------ app/assets/stylesheets/autocomplete.css.sass | 2 +- app/assets/stylesheets/login.css.scss | 2 -- app/assets/stylesheets/mobile.css.scss | 26 ++++++++---------- app/assets/stylesheets/new-templates.css.scss | 10 +++---- app/assets/stylesheets/rtl.css.sass | 2 -- app/assets/stylesheets/ui.css.sass | 8 +++--- app/helpers/contacts_helper.rb | 2 +- app/helpers/layout_helper.rb | 3 +- .../mailer/confirmation_instructions.haml | 2 +- .../mailer/reset_password_instructions.haml | 2 +- .../devise/mailer/unlock_instructions.haml | 2 +- app/views/layouts/application.html.haml | 2 +- app/views/layouts/application.mobile.haml | 4 +-- app/views/layouts/post.html.haml | 4 +-- app/views/people/index.html.haml | 4 +-- app/views/shared/_right_sections.html.haml | 14 +++++----- .../status_messages/bookmarklet.html.haml | 4 +-- app/views/tokens/show.html.haml | 6 ++-- public/images/press_logos/Mashable_logo.png | Bin 8294 -> 0 bytes .../press_logos/The_New_York_Times_logo.png | Bin 8698 -> 0 bytes public/javascripts/app/app.js | 1 - .../app/templates/comment.handlebars | 2 +- .../app/templates/header.handlebars | 8 +++--- .../app/templates/likes-info.handlebars | 2 +- .../app/templates/stream-element.handlebars | 6 ++-- 156 files changed, 61 insertions(+), 71 deletions(-) rename {public => app/assets}/images/404.png (100%) rename {public => app/assets}/images/add_contact_button.png (100%) rename {public => app/assets}/images/ajax-loader.gif (100%) rename {public => app/assets}/images/ajax-loader2.gif (100%) rename {public => app/assets}/images/ajax-loader_inverted.gif (100%) rename {public => app/assets}/images/apple-splash.png (100%) rename {public => app/assets}/images/arrow-left.png (100%) rename {public => app/assets}/images/arrow-right.png (100%) rename {public => app/assets}/images/arrow.psd (100%) rename {public => app/assets}/images/asterisk.png (100%) rename {public => app/assets}/images/asterisk_white.png (100%) rename {public => app/assets}/images/ball.png (100%) rename {public => app/assets}/images/ball_small.png (100%) rename {public => app/assets}/images/close_label.png (100%) rename {public => app/assets}/images/connect_services.png (100%) rename {public => app/assets}/images/cubbies_collage.png (100%) rename {public => app/assets}/images/cubbies_screenshot2.png (100%) rename {public => app/assets}/images/deletelabel.png (100%) rename {public => app/assets}/images/diaspora_collage.png (100%) rename {public => app/assets}/images/diaspora_mobile_screens.png (100%) rename {public => app/assets}/images/down-tick-inset.png (100%) rename {public => app/assets}/images/facebox/closelabel.png (100%) rename {public => app/assets}/images/facebox/loading.gif (100%) rename {public => app/assets}/images/hatched-bg-dark.png (100%) rename {public => app/assets}/images/hatched-bg-small.jpg (100%) rename {public => app/assets}/images/hatched-bg.jpg (100%) rename {public => app/assets}/images/header-bg-long.jpg (100%) rename {public => app/assets}/images/header-bg.png (100%) rename {public => app/assets}/images/header-logo.png (100%) rename {public => app/assets}/images/header-logo2x.png (100%) rename {public => app/assets}/images/icons/arrow_down.png (100%) rename {public => app/assets}/images/icons/arrow_down_small.png (100%) rename {public => app/assets}/images/icons/arrow_up_small.png (100%) rename {public => app/assets}/images/icons/back_white.png (100%) rename {public => app/assets}/images/icons/bookmark.png (100%) rename {public => app/assets}/images/icons/camera.png (100%) rename {public => app/assets}/images/icons/check_yes_ok.png (100%) rename {public => app/assets}/images/icons/check_yes_ok_lighter.png (100%) rename {public => app/assets}/images/icons/check_yes_ok_white.png (100%) rename {public => app/assets}/images/icons/coffee.png (100%) rename {public => app/assets}/images/icons/cog.png (100%) rename {public => app/assets}/images/icons/comment_mobile_grey.png (100%) rename {public => app/assets}/images/icons/compose_mobile.png (100%) rename {public => app/assets}/images/icons/compose_mobile2.png (100%) rename {public => app/assets}/images/icons/cubbies.png (100%) rename {public => app/assets}/images/icons/globe.png (100%) rename {public => app/assets}/images/icons/heart.png (100%) rename {public => app/assets}/images/icons/heart_mobile_grey.png (100%) rename {public => app/assets}/images/icons/heart_mobile_red.png (100%) rename {public => app/assets}/images/icons/home_grey.png (100%) rename {public => app/assets}/images/icons/ignoreuser.png (100%) rename {public => app/assets}/images/icons/list_white.png (100%) rename {public => app/assets}/images/icons/mail_big.png (100%) rename {public => app/assets}/images/icons/mail_grey.png (100%) rename {public => app/assets}/images/icons/monotone_add_plus.png (100%) rename {public => app/assets}/images/icons/monotone_check_yes.png (100%) rename {public => app/assets}/images/icons/monotone_close_exit_delete.png (100%) rename {public => app/assets}/images/icons/monotone_email_letter_round.png (100%) rename {public => app/assets}/images/icons/monotone_pen_write.png (100%) rename {public => app/assets}/images/icons/monotone_plus_add_round.png (100%) rename {public => app/assets}/images/icons/monotone_question.png (100%) rename {public => app/assets}/images/icons/monotone_wrench_settings.png (100%) rename {public => app/assets}/images/icons/notifications_grey.png (100%) rename {public => app/assets}/images/icons/padlock-closed.png (100%) rename {public => app/assets}/images/icons/padlock-open.png (100%) rename {public => app/assets}/images/icons/pen_write.png (100%) rename {public => app/assets}/images/icons/pencil.png (100%) rename {public => app/assets}/images/icons/pencil_mobile_grey.png (100%) rename {public => app/assets}/images/icons/pencil_mobile_grey_active.png (100%) rename {public => app/assets}/images/icons/pencil_mobile_grey_mobile.png (100%) rename {public => app/assets}/images/icons/photo.png (100%) rename {public => app/assets}/images/icons/plus.png (100%) rename {public => app/assets}/images/icons/question.png (100%) rename {public => app/assets}/images/icons/reshare_mobile.png (100%) rename {public => app/assets}/images/icons/reshare_mobile_active.png (100%) rename {public => app/assets}/images/icons/search_white.png (100%) rename {public => app/assets}/images/icons/smiley_laughing.png (100%) rename {public => app/assets}/images/logo_caps.png (100%) rename {public => app/assets}/images/logo_large.png (100%) rename {public => app/assets}/images/logo_small.png (100%) rename {public => app/assets}/images/mobile-spinner.gif (100%) rename {public => app/assets}/images/mobile.jpg (100%) rename {public => app/assets}/images/mocks/bp.jpeg (100%) rename {public => app/assets}/images/mocks/user_pic.jpeg (100%) rename {public => app/assets}/images/modern_browsers.png (100%) rename {public => app/assets}/images/pen_white.png (100%) rename {public => app/assets}/images/powered_by_diaspora.png (100%) rename {public => app/assets}/images/press_logos/mashable_logo.png (100%) rename {public => app/assets}/images/press_logos/nymag_logo.png (100%) rename {public => app/assets}/images/press_logos/techcrunch_logo.png (100%) rename {public => app/assets}/images/press_logos/the_new_york_times_logo.png (100%) rename {public => app/assets}/images/reply.png (100%) rename {public => app/assets}/images/seed.jpg (100%) rename {public => app/assets}/images/services/facebook_sign_in.png (100%) rename {public => app/assets}/images/services/twitter_sign_in.png (100%) rename {public => app/assets}/images/social_media_logos/email-16x16.png (100%) rename {public => app/assets}/images/social_media_logos/email-24x24.png (100%) rename {public => app/assets}/images/social_media_logos/email-32x32.png (100%) rename {public => app/assets}/images/social_media_logos/email-48x48.png (100%) rename {public => app/assets}/images/social_media_logos/facebook-16x16.png (100%) rename {public => app/assets}/images/social_media_logos/facebook-24x24.png (100%) rename {public => app/assets}/images/social_media_logos/facebook-32x32.png (100%) rename {public => app/assets}/images/social_media_logos/facebook-48x48.png (100%) rename {public => app/assets}/images/social_media_logos/feed-16x16.png (100%) rename {public => app/assets}/images/social_media_logos/feed-24x24.png (100%) rename {public => app/assets}/images/social_media_logos/feed-32x32.png (100%) rename {public => app/assets}/images/social_media_logos/feed-48x48.png (100%) rename {public => app/assets}/images/social_media_logos/tumblr-16x16.png (100%) rename {public => app/assets}/images/social_media_logos/tumblr-24x24.png (100%) rename {public => app/assets}/images/social_media_logos/tumblr-32x32.png (100%) rename {public => app/assets}/images/social_media_logos/tumblr-48x48.png (100%) rename {public => app/assets}/images/social_media_logos/twitter-16x16.png (100%) rename {public => app/assets}/images/social_media_logos/twitter-24x24.png (100%) rename {public => app/assets}/images/social_media_logos/twitter-32x32.png (100%) rename {public => app/assets}/images/social_media_logos/twitter-48x48.png (100%) rename {public => app/assets}/images/social_media_logos/website-16x16.png (100%) rename {public => app/assets}/images/social_media_logos/website-24x24.png (100%) rename {public => app/assets}/images/social_media_logos/website-32x32.png (100%) rename {public => app/assets}/images/social_media_logos/website-48x48.png (100%) rename {public => app/assets}/images/static-loader.png (100%) rename {public => app/assets}/images/tipsy.gif (100%) rename {public => app/assets}/images/up-tick-inset.png (100%) rename {public => app/assets}/images/user/angela.jpg (100%) rename {public => app/assets}/images/user/default.png (100%) rename {public => app/assets}/images/user/uma.jpg (100%) rename {public => app/assets}/images/user/wolf.jpg (100%) rename {public => app/assets}/images/video-overlay.png (100%) rename {public => app/assets}/images/white.png (100%) rename {public => app/assets}/images/white@2x.png (100%) rename {public => app/assets}/images/white_on_grey.png (100%) delete mode 100644 public/images/press_logos/Mashable_logo.png delete mode 100644 public/images/press_logos/The_New_York_Times_logo.png diff --git a/public/images/404.png b/app/assets/images/404.png similarity index 100% rename from public/images/404.png rename to app/assets/images/404.png diff --git a/public/images/add_contact_button.png b/app/assets/images/add_contact_button.png similarity index 100% rename from public/images/add_contact_button.png rename to app/assets/images/add_contact_button.png diff --git a/public/images/ajax-loader.gif b/app/assets/images/ajax-loader.gif similarity index 100% rename from public/images/ajax-loader.gif rename to app/assets/images/ajax-loader.gif diff --git a/public/images/ajax-loader2.gif b/app/assets/images/ajax-loader2.gif similarity index 100% rename from public/images/ajax-loader2.gif rename to app/assets/images/ajax-loader2.gif diff --git a/public/images/ajax-loader_inverted.gif b/app/assets/images/ajax-loader_inverted.gif similarity index 100% rename from public/images/ajax-loader_inverted.gif rename to app/assets/images/ajax-loader_inverted.gif diff --git a/public/images/apple-splash.png b/app/assets/images/apple-splash.png similarity index 100% rename from public/images/apple-splash.png rename to app/assets/images/apple-splash.png diff --git a/public/images/arrow-left.png b/app/assets/images/arrow-left.png similarity index 100% rename from public/images/arrow-left.png rename to app/assets/images/arrow-left.png diff --git a/public/images/arrow-right.png b/app/assets/images/arrow-right.png similarity index 100% rename from public/images/arrow-right.png rename to app/assets/images/arrow-right.png diff --git a/public/images/arrow.psd b/app/assets/images/arrow.psd similarity index 100% rename from public/images/arrow.psd rename to app/assets/images/arrow.psd diff --git a/public/images/asterisk.png b/app/assets/images/asterisk.png similarity index 100% rename from public/images/asterisk.png rename to app/assets/images/asterisk.png diff --git a/public/images/asterisk_white.png b/app/assets/images/asterisk_white.png similarity index 100% rename from public/images/asterisk_white.png rename to app/assets/images/asterisk_white.png diff --git a/public/images/ball.png b/app/assets/images/ball.png similarity index 100% rename from public/images/ball.png rename to app/assets/images/ball.png diff --git a/public/images/ball_small.png b/app/assets/images/ball_small.png similarity index 100% rename from public/images/ball_small.png rename to app/assets/images/ball_small.png diff --git a/public/images/close_label.png b/app/assets/images/close_label.png similarity index 100% rename from public/images/close_label.png rename to app/assets/images/close_label.png diff --git a/public/images/connect_services.png b/app/assets/images/connect_services.png similarity index 100% rename from public/images/connect_services.png rename to app/assets/images/connect_services.png diff --git a/public/images/cubbies_collage.png b/app/assets/images/cubbies_collage.png similarity index 100% rename from public/images/cubbies_collage.png rename to app/assets/images/cubbies_collage.png diff --git a/public/images/cubbies_screenshot2.png b/app/assets/images/cubbies_screenshot2.png similarity index 100% rename from public/images/cubbies_screenshot2.png rename to app/assets/images/cubbies_screenshot2.png diff --git a/public/images/deletelabel.png b/app/assets/images/deletelabel.png similarity index 100% rename from public/images/deletelabel.png rename to app/assets/images/deletelabel.png diff --git a/public/images/diaspora_collage.png b/app/assets/images/diaspora_collage.png similarity index 100% rename from public/images/diaspora_collage.png rename to app/assets/images/diaspora_collage.png diff --git a/public/images/diaspora_mobile_screens.png b/app/assets/images/diaspora_mobile_screens.png similarity index 100% rename from public/images/diaspora_mobile_screens.png rename to app/assets/images/diaspora_mobile_screens.png diff --git a/public/images/down-tick-inset.png b/app/assets/images/down-tick-inset.png similarity index 100% rename from public/images/down-tick-inset.png rename to app/assets/images/down-tick-inset.png diff --git a/public/images/facebox/closelabel.png b/app/assets/images/facebox/closelabel.png similarity index 100% rename from public/images/facebox/closelabel.png rename to app/assets/images/facebox/closelabel.png diff --git a/public/images/facebox/loading.gif b/app/assets/images/facebox/loading.gif similarity index 100% rename from public/images/facebox/loading.gif rename to app/assets/images/facebox/loading.gif diff --git a/public/images/hatched-bg-dark.png b/app/assets/images/hatched-bg-dark.png similarity index 100% rename from public/images/hatched-bg-dark.png rename to app/assets/images/hatched-bg-dark.png diff --git a/public/images/hatched-bg-small.jpg b/app/assets/images/hatched-bg-small.jpg similarity index 100% rename from public/images/hatched-bg-small.jpg rename to app/assets/images/hatched-bg-small.jpg diff --git a/public/images/hatched-bg.jpg b/app/assets/images/hatched-bg.jpg similarity index 100% rename from public/images/hatched-bg.jpg rename to app/assets/images/hatched-bg.jpg diff --git a/public/images/header-bg-long.jpg b/app/assets/images/header-bg-long.jpg similarity index 100% rename from public/images/header-bg-long.jpg rename to app/assets/images/header-bg-long.jpg diff --git a/public/images/header-bg.png b/app/assets/images/header-bg.png similarity index 100% rename from public/images/header-bg.png rename to app/assets/images/header-bg.png diff --git a/public/images/header-logo.png b/app/assets/images/header-logo.png similarity index 100% rename from public/images/header-logo.png rename to app/assets/images/header-logo.png diff --git a/public/images/header-logo2x.png b/app/assets/images/header-logo2x.png similarity index 100% rename from public/images/header-logo2x.png rename to app/assets/images/header-logo2x.png diff --git a/public/images/icons/arrow_down.png b/app/assets/images/icons/arrow_down.png similarity index 100% rename from public/images/icons/arrow_down.png rename to app/assets/images/icons/arrow_down.png diff --git a/public/images/icons/arrow_down_small.png b/app/assets/images/icons/arrow_down_small.png similarity index 100% rename from public/images/icons/arrow_down_small.png rename to app/assets/images/icons/arrow_down_small.png diff --git a/public/images/icons/arrow_up_small.png b/app/assets/images/icons/arrow_up_small.png similarity index 100% rename from public/images/icons/arrow_up_small.png rename to app/assets/images/icons/arrow_up_small.png diff --git a/public/images/icons/back_white.png b/app/assets/images/icons/back_white.png similarity index 100% rename from public/images/icons/back_white.png rename to app/assets/images/icons/back_white.png diff --git a/public/images/icons/bookmark.png b/app/assets/images/icons/bookmark.png similarity index 100% rename from public/images/icons/bookmark.png rename to app/assets/images/icons/bookmark.png diff --git a/public/images/icons/camera.png b/app/assets/images/icons/camera.png similarity index 100% rename from public/images/icons/camera.png rename to app/assets/images/icons/camera.png diff --git a/public/images/icons/check_yes_ok.png b/app/assets/images/icons/check_yes_ok.png similarity index 100% rename from public/images/icons/check_yes_ok.png rename to app/assets/images/icons/check_yes_ok.png diff --git a/public/images/icons/check_yes_ok_lighter.png b/app/assets/images/icons/check_yes_ok_lighter.png similarity index 100% rename from public/images/icons/check_yes_ok_lighter.png rename to app/assets/images/icons/check_yes_ok_lighter.png diff --git a/public/images/icons/check_yes_ok_white.png b/app/assets/images/icons/check_yes_ok_white.png similarity index 100% rename from public/images/icons/check_yes_ok_white.png rename to app/assets/images/icons/check_yes_ok_white.png diff --git a/public/images/icons/coffee.png b/app/assets/images/icons/coffee.png similarity index 100% rename from public/images/icons/coffee.png rename to app/assets/images/icons/coffee.png diff --git a/public/images/icons/cog.png b/app/assets/images/icons/cog.png similarity index 100% rename from public/images/icons/cog.png rename to app/assets/images/icons/cog.png diff --git a/public/images/icons/comment_mobile_grey.png b/app/assets/images/icons/comment_mobile_grey.png similarity index 100% rename from public/images/icons/comment_mobile_grey.png rename to app/assets/images/icons/comment_mobile_grey.png diff --git a/public/images/icons/compose_mobile.png b/app/assets/images/icons/compose_mobile.png similarity index 100% rename from public/images/icons/compose_mobile.png rename to app/assets/images/icons/compose_mobile.png diff --git a/public/images/icons/compose_mobile2.png b/app/assets/images/icons/compose_mobile2.png similarity index 100% rename from public/images/icons/compose_mobile2.png rename to app/assets/images/icons/compose_mobile2.png diff --git a/public/images/icons/cubbies.png b/app/assets/images/icons/cubbies.png similarity index 100% rename from public/images/icons/cubbies.png rename to app/assets/images/icons/cubbies.png diff --git a/public/images/icons/globe.png b/app/assets/images/icons/globe.png similarity index 100% rename from public/images/icons/globe.png rename to app/assets/images/icons/globe.png diff --git a/public/images/icons/heart.png b/app/assets/images/icons/heart.png similarity index 100% rename from public/images/icons/heart.png rename to app/assets/images/icons/heart.png diff --git a/public/images/icons/heart_mobile_grey.png b/app/assets/images/icons/heart_mobile_grey.png similarity index 100% rename from public/images/icons/heart_mobile_grey.png rename to app/assets/images/icons/heart_mobile_grey.png diff --git a/public/images/icons/heart_mobile_red.png b/app/assets/images/icons/heart_mobile_red.png similarity index 100% rename from public/images/icons/heart_mobile_red.png rename to app/assets/images/icons/heart_mobile_red.png diff --git a/public/images/icons/home_grey.png b/app/assets/images/icons/home_grey.png similarity index 100% rename from public/images/icons/home_grey.png rename to app/assets/images/icons/home_grey.png diff --git a/public/images/icons/ignoreuser.png b/app/assets/images/icons/ignoreuser.png similarity index 100% rename from public/images/icons/ignoreuser.png rename to app/assets/images/icons/ignoreuser.png diff --git a/public/images/icons/list_white.png b/app/assets/images/icons/list_white.png similarity index 100% rename from public/images/icons/list_white.png rename to app/assets/images/icons/list_white.png diff --git a/public/images/icons/mail_big.png b/app/assets/images/icons/mail_big.png similarity index 100% rename from public/images/icons/mail_big.png rename to app/assets/images/icons/mail_big.png diff --git a/public/images/icons/mail_grey.png b/app/assets/images/icons/mail_grey.png similarity index 100% rename from public/images/icons/mail_grey.png rename to app/assets/images/icons/mail_grey.png diff --git a/public/images/icons/monotone_add_plus.png b/app/assets/images/icons/monotone_add_plus.png similarity index 100% rename from public/images/icons/monotone_add_plus.png rename to app/assets/images/icons/monotone_add_plus.png diff --git a/public/images/icons/monotone_check_yes.png b/app/assets/images/icons/monotone_check_yes.png similarity index 100% rename from public/images/icons/monotone_check_yes.png rename to app/assets/images/icons/monotone_check_yes.png diff --git a/public/images/icons/monotone_close_exit_delete.png b/app/assets/images/icons/monotone_close_exit_delete.png similarity index 100% rename from public/images/icons/monotone_close_exit_delete.png rename to app/assets/images/icons/monotone_close_exit_delete.png diff --git a/public/images/icons/monotone_email_letter_round.png b/app/assets/images/icons/monotone_email_letter_round.png similarity index 100% rename from public/images/icons/monotone_email_letter_round.png rename to app/assets/images/icons/monotone_email_letter_round.png diff --git a/public/images/icons/monotone_pen_write.png b/app/assets/images/icons/monotone_pen_write.png similarity index 100% rename from public/images/icons/monotone_pen_write.png rename to app/assets/images/icons/monotone_pen_write.png diff --git a/public/images/icons/monotone_plus_add_round.png b/app/assets/images/icons/monotone_plus_add_round.png similarity index 100% rename from public/images/icons/monotone_plus_add_round.png rename to app/assets/images/icons/monotone_plus_add_round.png diff --git a/public/images/icons/monotone_question.png b/app/assets/images/icons/monotone_question.png similarity index 100% rename from public/images/icons/monotone_question.png rename to app/assets/images/icons/monotone_question.png diff --git a/public/images/icons/monotone_wrench_settings.png b/app/assets/images/icons/monotone_wrench_settings.png similarity index 100% rename from public/images/icons/monotone_wrench_settings.png rename to app/assets/images/icons/monotone_wrench_settings.png diff --git a/public/images/icons/notifications_grey.png b/app/assets/images/icons/notifications_grey.png similarity index 100% rename from public/images/icons/notifications_grey.png rename to app/assets/images/icons/notifications_grey.png diff --git a/public/images/icons/padlock-closed.png b/app/assets/images/icons/padlock-closed.png similarity index 100% rename from public/images/icons/padlock-closed.png rename to app/assets/images/icons/padlock-closed.png diff --git a/public/images/icons/padlock-open.png b/app/assets/images/icons/padlock-open.png similarity index 100% rename from public/images/icons/padlock-open.png rename to app/assets/images/icons/padlock-open.png diff --git a/public/images/icons/pen_write.png b/app/assets/images/icons/pen_write.png similarity index 100% rename from public/images/icons/pen_write.png rename to app/assets/images/icons/pen_write.png diff --git a/public/images/icons/pencil.png b/app/assets/images/icons/pencil.png similarity index 100% rename from public/images/icons/pencil.png rename to app/assets/images/icons/pencil.png diff --git a/public/images/icons/pencil_mobile_grey.png b/app/assets/images/icons/pencil_mobile_grey.png similarity index 100% rename from public/images/icons/pencil_mobile_grey.png rename to app/assets/images/icons/pencil_mobile_grey.png diff --git a/public/images/icons/pencil_mobile_grey_active.png b/app/assets/images/icons/pencil_mobile_grey_active.png similarity index 100% rename from public/images/icons/pencil_mobile_grey_active.png rename to app/assets/images/icons/pencil_mobile_grey_active.png diff --git a/public/images/icons/pencil_mobile_grey_mobile.png b/app/assets/images/icons/pencil_mobile_grey_mobile.png similarity index 100% rename from public/images/icons/pencil_mobile_grey_mobile.png rename to app/assets/images/icons/pencil_mobile_grey_mobile.png diff --git a/public/images/icons/photo.png b/app/assets/images/icons/photo.png similarity index 100% rename from public/images/icons/photo.png rename to app/assets/images/icons/photo.png diff --git a/public/images/icons/plus.png b/app/assets/images/icons/plus.png similarity index 100% rename from public/images/icons/plus.png rename to app/assets/images/icons/plus.png diff --git a/public/images/icons/question.png b/app/assets/images/icons/question.png similarity index 100% rename from public/images/icons/question.png rename to app/assets/images/icons/question.png diff --git a/public/images/icons/reshare_mobile.png b/app/assets/images/icons/reshare_mobile.png similarity index 100% rename from public/images/icons/reshare_mobile.png rename to app/assets/images/icons/reshare_mobile.png diff --git a/public/images/icons/reshare_mobile_active.png b/app/assets/images/icons/reshare_mobile_active.png similarity index 100% rename from public/images/icons/reshare_mobile_active.png rename to app/assets/images/icons/reshare_mobile_active.png diff --git a/public/images/icons/search_white.png b/app/assets/images/icons/search_white.png similarity index 100% rename from public/images/icons/search_white.png rename to app/assets/images/icons/search_white.png diff --git a/public/images/icons/smiley_laughing.png b/app/assets/images/icons/smiley_laughing.png similarity index 100% rename from public/images/icons/smiley_laughing.png rename to app/assets/images/icons/smiley_laughing.png diff --git a/public/images/logo_caps.png b/app/assets/images/logo_caps.png similarity index 100% rename from public/images/logo_caps.png rename to app/assets/images/logo_caps.png diff --git a/public/images/logo_large.png b/app/assets/images/logo_large.png similarity index 100% rename from public/images/logo_large.png rename to app/assets/images/logo_large.png diff --git a/public/images/logo_small.png b/app/assets/images/logo_small.png similarity index 100% rename from public/images/logo_small.png rename to app/assets/images/logo_small.png diff --git a/public/images/mobile-spinner.gif b/app/assets/images/mobile-spinner.gif similarity index 100% rename from public/images/mobile-spinner.gif rename to app/assets/images/mobile-spinner.gif diff --git a/public/images/mobile.jpg b/app/assets/images/mobile.jpg similarity index 100% rename from public/images/mobile.jpg rename to app/assets/images/mobile.jpg diff --git a/public/images/mocks/bp.jpeg b/app/assets/images/mocks/bp.jpeg similarity index 100% rename from public/images/mocks/bp.jpeg rename to app/assets/images/mocks/bp.jpeg diff --git a/public/images/mocks/user_pic.jpeg b/app/assets/images/mocks/user_pic.jpeg similarity index 100% rename from public/images/mocks/user_pic.jpeg rename to app/assets/images/mocks/user_pic.jpeg diff --git a/public/images/modern_browsers.png b/app/assets/images/modern_browsers.png similarity index 100% rename from public/images/modern_browsers.png rename to app/assets/images/modern_browsers.png diff --git a/public/images/pen_white.png b/app/assets/images/pen_white.png similarity index 100% rename from public/images/pen_white.png rename to app/assets/images/pen_white.png diff --git a/public/images/powered_by_diaspora.png b/app/assets/images/powered_by_diaspora.png similarity index 100% rename from public/images/powered_by_diaspora.png rename to app/assets/images/powered_by_diaspora.png diff --git a/public/images/press_logos/mashable_logo.png b/app/assets/images/press_logos/mashable_logo.png similarity index 100% rename from public/images/press_logos/mashable_logo.png rename to app/assets/images/press_logos/mashable_logo.png diff --git a/public/images/press_logos/nymag_logo.png b/app/assets/images/press_logos/nymag_logo.png similarity index 100% rename from public/images/press_logos/nymag_logo.png rename to app/assets/images/press_logos/nymag_logo.png diff --git a/public/images/press_logos/techcrunch_logo.png b/app/assets/images/press_logos/techcrunch_logo.png similarity index 100% rename from public/images/press_logos/techcrunch_logo.png rename to app/assets/images/press_logos/techcrunch_logo.png diff --git a/public/images/press_logos/the_new_york_times_logo.png b/app/assets/images/press_logos/the_new_york_times_logo.png similarity index 100% rename from public/images/press_logos/the_new_york_times_logo.png rename to app/assets/images/press_logos/the_new_york_times_logo.png diff --git a/public/images/reply.png b/app/assets/images/reply.png similarity index 100% rename from public/images/reply.png rename to app/assets/images/reply.png diff --git a/public/images/seed.jpg b/app/assets/images/seed.jpg similarity index 100% rename from public/images/seed.jpg rename to app/assets/images/seed.jpg diff --git a/public/images/services/facebook_sign_in.png b/app/assets/images/services/facebook_sign_in.png similarity index 100% rename from public/images/services/facebook_sign_in.png rename to app/assets/images/services/facebook_sign_in.png diff --git a/public/images/services/twitter_sign_in.png b/app/assets/images/services/twitter_sign_in.png similarity index 100% rename from public/images/services/twitter_sign_in.png rename to app/assets/images/services/twitter_sign_in.png diff --git a/public/images/social_media_logos/email-16x16.png b/app/assets/images/social_media_logos/email-16x16.png similarity index 100% rename from public/images/social_media_logos/email-16x16.png rename to app/assets/images/social_media_logos/email-16x16.png diff --git a/public/images/social_media_logos/email-24x24.png b/app/assets/images/social_media_logos/email-24x24.png similarity index 100% rename from public/images/social_media_logos/email-24x24.png rename to app/assets/images/social_media_logos/email-24x24.png diff --git a/public/images/social_media_logos/email-32x32.png b/app/assets/images/social_media_logos/email-32x32.png similarity index 100% rename from public/images/social_media_logos/email-32x32.png rename to app/assets/images/social_media_logos/email-32x32.png diff --git a/public/images/social_media_logos/email-48x48.png b/app/assets/images/social_media_logos/email-48x48.png similarity index 100% rename from public/images/social_media_logos/email-48x48.png rename to app/assets/images/social_media_logos/email-48x48.png diff --git a/public/images/social_media_logos/facebook-16x16.png b/app/assets/images/social_media_logos/facebook-16x16.png similarity index 100% rename from public/images/social_media_logos/facebook-16x16.png rename to app/assets/images/social_media_logos/facebook-16x16.png diff --git a/public/images/social_media_logos/facebook-24x24.png b/app/assets/images/social_media_logos/facebook-24x24.png similarity index 100% rename from public/images/social_media_logos/facebook-24x24.png rename to app/assets/images/social_media_logos/facebook-24x24.png diff --git a/public/images/social_media_logos/facebook-32x32.png b/app/assets/images/social_media_logos/facebook-32x32.png similarity index 100% rename from public/images/social_media_logos/facebook-32x32.png rename to app/assets/images/social_media_logos/facebook-32x32.png diff --git a/public/images/social_media_logos/facebook-48x48.png b/app/assets/images/social_media_logos/facebook-48x48.png similarity index 100% rename from public/images/social_media_logos/facebook-48x48.png rename to app/assets/images/social_media_logos/facebook-48x48.png diff --git a/public/images/social_media_logos/feed-16x16.png b/app/assets/images/social_media_logos/feed-16x16.png similarity index 100% rename from public/images/social_media_logos/feed-16x16.png rename to app/assets/images/social_media_logos/feed-16x16.png diff --git a/public/images/social_media_logos/feed-24x24.png b/app/assets/images/social_media_logos/feed-24x24.png similarity index 100% rename from public/images/social_media_logos/feed-24x24.png rename to app/assets/images/social_media_logos/feed-24x24.png diff --git a/public/images/social_media_logos/feed-32x32.png b/app/assets/images/social_media_logos/feed-32x32.png similarity index 100% rename from public/images/social_media_logos/feed-32x32.png rename to app/assets/images/social_media_logos/feed-32x32.png diff --git a/public/images/social_media_logos/feed-48x48.png b/app/assets/images/social_media_logos/feed-48x48.png similarity index 100% rename from public/images/social_media_logos/feed-48x48.png rename to app/assets/images/social_media_logos/feed-48x48.png diff --git a/public/images/social_media_logos/tumblr-16x16.png b/app/assets/images/social_media_logos/tumblr-16x16.png similarity index 100% rename from public/images/social_media_logos/tumblr-16x16.png rename to app/assets/images/social_media_logos/tumblr-16x16.png diff --git a/public/images/social_media_logos/tumblr-24x24.png b/app/assets/images/social_media_logos/tumblr-24x24.png similarity index 100% rename from public/images/social_media_logos/tumblr-24x24.png rename to app/assets/images/social_media_logos/tumblr-24x24.png diff --git a/public/images/social_media_logos/tumblr-32x32.png b/app/assets/images/social_media_logos/tumblr-32x32.png similarity index 100% rename from public/images/social_media_logos/tumblr-32x32.png rename to app/assets/images/social_media_logos/tumblr-32x32.png diff --git a/public/images/social_media_logos/tumblr-48x48.png b/app/assets/images/social_media_logos/tumblr-48x48.png similarity index 100% rename from public/images/social_media_logos/tumblr-48x48.png rename to app/assets/images/social_media_logos/tumblr-48x48.png diff --git a/public/images/social_media_logos/twitter-16x16.png b/app/assets/images/social_media_logos/twitter-16x16.png similarity index 100% rename from public/images/social_media_logos/twitter-16x16.png rename to app/assets/images/social_media_logos/twitter-16x16.png diff --git a/public/images/social_media_logos/twitter-24x24.png b/app/assets/images/social_media_logos/twitter-24x24.png similarity index 100% rename from public/images/social_media_logos/twitter-24x24.png rename to app/assets/images/social_media_logos/twitter-24x24.png diff --git a/public/images/social_media_logos/twitter-32x32.png b/app/assets/images/social_media_logos/twitter-32x32.png similarity index 100% rename from public/images/social_media_logos/twitter-32x32.png rename to app/assets/images/social_media_logos/twitter-32x32.png diff --git a/public/images/social_media_logos/twitter-48x48.png b/app/assets/images/social_media_logos/twitter-48x48.png similarity index 100% rename from public/images/social_media_logos/twitter-48x48.png rename to app/assets/images/social_media_logos/twitter-48x48.png diff --git a/public/images/social_media_logos/website-16x16.png b/app/assets/images/social_media_logos/website-16x16.png similarity index 100% rename from public/images/social_media_logos/website-16x16.png rename to app/assets/images/social_media_logos/website-16x16.png diff --git a/public/images/social_media_logos/website-24x24.png b/app/assets/images/social_media_logos/website-24x24.png similarity index 100% rename from public/images/social_media_logos/website-24x24.png rename to app/assets/images/social_media_logos/website-24x24.png diff --git a/public/images/social_media_logos/website-32x32.png b/app/assets/images/social_media_logos/website-32x32.png similarity index 100% rename from public/images/social_media_logos/website-32x32.png rename to app/assets/images/social_media_logos/website-32x32.png diff --git a/public/images/social_media_logos/website-48x48.png b/app/assets/images/social_media_logos/website-48x48.png similarity index 100% rename from public/images/social_media_logos/website-48x48.png rename to app/assets/images/social_media_logos/website-48x48.png diff --git a/public/images/static-loader.png b/app/assets/images/static-loader.png similarity index 100% rename from public/images/static-loader.png rename to app/assets/images/static-loader.png diff --git a/public/images/tipsy.gif b/app/assets/images/tipsy.gif similarity index 100% rename from public/images/tipsy.gif rename to app/assets/images/tipsy.gif diff --git a/public/images/up-tick-inset.png b/app/assets/images/up-tick-inset.png similarity index 100% rename from public/images/up-tick-inset.png rename to app/assets/images/up-tick-inset.png diff --git a/public/images/user/angela.jpg b/app/assets/images/user/angela.jpg similarity index 100% rename from public/images/user/angela.jpg rename to app/assets/images/user/angela.jpg diff --git a/public/images/user/default.png b/app/assets/images/user/default.png similarity index 100% rename from public/images/user/default.png rename to app/assets/images/user/default.png diff --git a/public/images/user/uma.jpg b/app/assets/images/user/uma.jpg similarity index 100% rename from public/images/user/uma.jpg rename to app/assets/images/user/uma.jpg diff --git a/public/images/user/wolf.jpg b/app/assets/images/user/wolf.jpg similarity index 100% rename from public/images/user/wolf.jpg rename to app/assets/images/user/wolf.jpg diff --git a/public/images/video-overlay.png b/app/assets/images/video-overlay.png similarity index 100% rename from public/images/video-overlay.png rename to app/assets/images/video-overlay.png diff --git a/public/images/white.png b/app/assets/images/white.png similarity index 100% rename from public/images/white.png rename to app/assets/images/white.png diff --git a/public/images/white@2x.png b/app/assets/images/white@2x.png similarity index 100% rename from public/images/white@2x.png rename to app/assets/images/white@2x.png diff --git a/public/images/white_on_grey.png b/app/assets/images/white_on_grey.png similarity index 100% rename from public/images/white_on_grey.png rename to app/assets/images/white_on_grey.png diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass index 517463089..06c94a0c8 100644 --- a/app/assets/stylesheets/application.css.sass +++ b/app/assets/stylesheets/application.css.sass @@ -1,6 +1,4 @@ -//= require_self -//= require ui - +@import 'ui.css.sass' @import '_mixins.css.scss' /* ====== media ====== */ @@ -167,7 +165,7 @@ header :background :color rgb(40,35,35) - :image url('/images/header-bg.png') + :image url('/assets/header-bg.png') :z-index 1001 :padding 6px 0 @@ -1515,7 +1513,7 @@ ul#landing_nav #diaspora_description :background - :image url('../images/ball.png') + :image url('/assets/ball.png') :repeat no-repeat :position top center @@ -1849,7 +1847,7 @@ ul#press_logos :background-color transparent .oembed - :background url('/images/ajax-loader2.gif') no-repeat center center + :background url('/assets/ajax-loader2.gif') no-repeat center center :display inline-block :max-width 100% @@ -1858,7 +1856,7 @@ ul#press_logos :cursor pointer .video-overlay - :background url('/images/video-overlay.png') no-repeat center center + :background url('/assets/video-overlay.png') no-repeat center center :position absolute :top 0 :left 0 @@ -2278,7 +2276,7 @@ ul.left_nav > a.aspect_selector :background - :image url(../images/icons/check_yes_ok.png) + :image url("/assets/icons/check_yes_ok.png") :position 3px 50% :repeat no-repeat diff --git a/app/assets/stylesheets/autocomplete.css.sass b/app/assets/stylesheets/autocomplete.css.sass index c6aa09aff..d40518ef0 100644 --- a/app/assets/stylesheets/autocomplete.css.sass +++ b/app/assets/stylesheets/autocomplete.css.sass @@ -41,7 +41,7 @@ :overflow hidden .ac_loading - :background white url('../images/ajax-loader.gif') right center no-repeat + :background white url('/assets/ajax-loader.gif') right center no-repeat .ac_odd :background-color #fafafa diff --git a/app/assets/stylesheets/login.css.scss b/app/assets/stylesheets/login.css.scss index 024b8d12b..d5e8d19bf 100644 --- a/app/assets/stylesheets/login.css.scss +++ b/app/assets/stylesheets/login.css.scss @@ -1,5 +1,3 @@ -//= require_self - // Copyright (c) 2010-2011, Diaspora Inc. This file is // licensed under the Affero General Public License version 3 or later. See // the COPYRIGHT file. diff --git a/app/assets/stylesheets/mobile.css.scss b/app/assets/stylesheets/mobile.css.scss index f9d2d538d..e97a13f51 100644 --- a/app/assets/stylesheets/mobile.css.scss +++ b/app/assets/stylesheets/mobile.css.scss @@ -1,7 +1,5 @@ -//= require_self -//= require vendor/bootstrap -//= require vendor/bootstrap-responsive - +@import 'vendor/bootstrap.css' +@import 'vendor/bootstrap-responsive.css' @import "_mixins.css.scss"; $blue: #3f8fba; @@ -14,7 +12,7 @@ a { body { background: { - image: url('/images/hatched-bg.jpg'); + image: url('/assets/hatched-bg.jpg'); position: fixed; /* scale background image down for iOS retina display */ size: 200px; @@ -278,7 +276,7 @@ body { @include box-shadow(0,1px,2px,#333); background: { - image: url("/images/header-bg-long.jpg"); + image: url("/assets/header-bg-long.jpg"); } width: 100%; @@ -379,7 +377,7 @@ footer { right: 14px; } background: { - image: url("/images/icons/arrow_down_small.png"); + image: url("/assets/icons/arrow_down_small.png"); position: center right; repeat: no-repeat; } @@ -462,28 +460,28 @@ footer { left: 5px; }; &.loading { - background-image: url("/images/mobile-spinner.gif"); + background-image: url("/assets/mobile-spinner.gif"); } } .reshare_action { - background-image: url("/images/icons/reshare_mobile.png"); + background-image: url("/assets/icons/reshare_mobile.png"); &.active { - background-image: url("/images/icons/reshare_mobile_active.png"); + background-image: url("/assets/icons/reshare_mobile_active.png"); } } .like_action { - background-image: url("/images/icons/heart_mobile_grey.png"); + background-image: url("/assets/icons/heart_mobile_grey.png"); &.active { - background-image: url("/images/icons/heart_mobile_red.png"); + background-image: url("/assets/icons/heart_mobile_red.png"); } } .comment_action.image_link { - background-image: url("/images/icons/pencil_mobile_grey_active.png"); + background-image: url("/assets/icons/pencil_mobile_grey_active.png"); &.inactive { - background-image: url("/images/icons/pencil_mobile_grey.png"); + background-image: url("/assets/icons/pencil_mobile_grey.png"); } } diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index d2acb9dea..fe905e1d5 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -1,5 +1,3 @@ -//= require_self - /* variables */ $light-grey: #999; $pane-width: 420px; @@ -89,7 +87,7 @@ $pane-width: 420px; @mixin dark-hatched-bg() { background-color: #444; - background-image: url("../images/hatched-bg-dark.png"); + background-image: url("/assets/hatched-bg-dark.png"); } @mixin photo-shadow() { @@ -109,15 +107,15 @@ $pane-width: 420px; /* bootstrap extentions */ .icon-red { - background-image: url(../img/glyphicons-halflings-red.png); + background-image: url("/img/glyphicons-halflings-red.png"); } .icon-green { - background-image: url(../img/glyphicons-halflings-green.png); + background-image: url("/img/glyphicons-halflings-green.png"); } .icon-blue { - background-image: url(../img/glyphicons-halflings-blue.png); + background-image: url("/img/glyphicons-halflings-blue.png"); } /* styles */ diff --git a/app/assets/stylesheets/rtl.css.sass b/app/assets/stylesheets/rtl.css.sass index 6c48be1c0..867225603 100644 --- a/app/assets/stylesheets/rtl.css.sass +++ b/app/assets/stylesheets/rtl.css.sass @@ -1,5 +1,3 @@ -//= require_self - body :direction rtl :text-align right diff --git a/app/assets/stylesheets/ui.css.sass b/app/assets/stylesheets/ui.css.sass index 12dafcd36..a9a449a9c 100644 --- a/app/assets/stylesheets/ui.css.sass +++ b/app/assets/stylesheets/ui.css.sass @@ -127,25 +127,25 @@ input.button &.selected :background - :image url('/images/icons/check_yes_ok.png') + :image url('/assets/icons/check_yes_ok.png') :position 3px 1px :repeat no-repeat &.selected:hover :background - :image url('/images/icons/check_yes_ok_white.png') + :image url('/assets/icons/check_yes_ok_white.png') /* bump top position up 1px to compensate for the 1px added top border */ :position 3px 0px &.loading :background - :image url('/images/ajax-loader.gif') + :image url('/assets/ajax-loader.gif') :repeat no-repeat :position 4px 2px &.loading:hover :background - :image url('/images/ajax-loader_inverted.gif') + :image url('/assets/ajax-loader_inverted.gif') /* bump top position up 1px to compensate for the 1px added top border */ :position 4px 1px diff --git a/app/helpers/contacts_helper.rb b/app/helpers/contacts_helper.rb index 67c0a01db..8bcc5c774 100644 --- a/app/helpers/contacts_helper.rb +++ b/app/helpers/contacts_helper.rb @@ -1,7 +1,7 @@ module ContactsHelper def contact_aspect_dropdown(contact) if @aspect - link_to(image_tag('/images/icons/monotone_close_exit_delete.png', :height => 20, :width => 20), + link_to(image_tag('icons/monotone_close_exit_delete.png', :height => 20, :width => 20), {:controller => "aspect_memberships", :action => 'destroy', :id => 42, diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb index 5ea667d2f..3eff5c2ba 100644 --- a/app/helpers/layout_helper.rb +++ b/app/helpers/layout_helper.rb @@ -18,9 +18,10 @@ module LayoutHelper end def set_asset_host + path = ENV['ASSET_HOST'].to_s + '/assets/' content_tag(:script) do <<-JS.html_safe - app.baseImageUrl("#{ENV['ASSET_HOST']}") + app.baseImageUrl("#{path}") JS end end diff --git a/app/views/devise/mailer/confirmation_instructions.haml b/app/views/devise/mailer/confirmation_instructions.haml index 14eca4254..07c93719f 100644 --- a/app/views/devise/mailer/confirmation_instructions.haml +++ b/app/views/devise/mailer/confirmation_instructions.haml @@ -5,7 +5,7 @@ = render :partial => 'notifier/notifier_css' %body %header - = image_tag '/images/diaspora_white.png' + = image_tag('diaspora_white.png') #container %p = t('devise.mailer.welcome', :email => @resource.email) diff --git a/app/views/devise/mailer/reset_password_instructions.haml b/app/views/devise/mailer/reset_password_instructions.haml index c876bfc8d..5cb36b2db 100644 --- a/app/views/devise/mailer/reset_password_instructions.haml +++ b/app/views/devise/mailer/reset_password_instructions.haml @@ -5,7 +5,7 @@ = render :partial => 'notifier/notifier_css' %body %header - = image_tag '/images/diaspora_white.png' + = image_tag('diaspora_white.png') #container %p = t('devise.mailer.hello', :email => @resource.email) diff --git a/app/views/devise/mailer/unlock_instructions.haml b/app/views/devise/mailer/unlock_instructions.haml index a5c90b41e..eb2e21e93 100644 --- a/app/views/devise/mailer/unlock_instructions.haml +++ b/app/views/devise/mailer/unlock_instructions.haml @@ -5,7 +5,7 @@ = render :partial => 'notifier/notifier_css' %body %header - = image_tag '/images/diaspora_white.png' + = image_tag('diaspora_white.png') #container %p = t('devise.mailer.hello', :email => @resource.email) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index e36ebc340..057af16be 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -22,7 +22,7 @@ = stylesheet_link_tag 'login', 'application', 'default' - if rtl? - = include_stylesheets :rtl, :media => 'all' + = stylesheet_link_tag :rtl, :media => 'all' = old_browser_js_support = javascript_include_tag 'jquery', 'jquery_ujs' - unless @landing_page - = include_javascripts :main, :templates + = javascript_include_tag :main, :templates = load_javascript_locales = set_asset_host diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 378c25ca2..b116f579f 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -78,7 +78,7 @@ / javascripts at the bottom = jquery_include_tag - = include_javascripts :mobile + = javascript_include_tag :mobile :javascript MBP.hideUrlBar(); diff --git a/app/views/layouts/main_stream.html.haml b/app/views/layouts/main_stream.html.haml index 93476712f..4aa30e9fd 100644 --- a/app/views/layouts/main_stream.html.haml +++ b/app/views/layouts/main_stream.html.haml @@ -4,7 +4,7 @@ - content_for :head do - = include_javascripts :home + = javascript_include_tag :home - if current_user.getting_started? #welcome-to-diaspora diff --git a/app/views/layouts/post.html.haml b/app/views/layouts/post.html.haml index 7346b1596..d7a288d15 100644 --- a/app/views/layouts/post.html.haml +++ b/app/views/layouts/post.html.haml @@ -30,7 +30,7 @@ = old_browser_js_support = jquery_include_tag @@ -38,7 +38,7 @@ = set_current_user_in_javascript - unless @landing_page - = include_javascripts :main, :templates + = javascript_include_tag :main, :templates = load_javascript_locales = set_asset_host diff --git a/app/views/people/contacts.haml b/app/views/people/contacts.haml index 5bfd9ebe5..1c7b302d3 100644 --- a/app/views/people/contacts.haml +++ b/app/views/people/contacts.haml @@ -4,7 +4,7 @@ - content_for :head do - = include_javascripts :people + = javascript_include_tag :people - content_for :page_title do = @person.name diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml index 8e48bb021..3771ee66c 100644 --- a/app/views/people/index.html.haml +++ b/app/views/people/index.html.haml @@ -6,7 +6,7 @@ = t('search') - content_for :head do - = include_javascripts :people + = javascript_include_tag :people = javascript_include_tag 'contact-list' .span-24.last diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 2e97600ab..54ae49a59 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -4,7 +4,7 @@ - content_for :head do - = include_javascripts :people + = javascript_include_tag :people :javascript Mentions.options.prefillMention = #{@person.to_json}; diff --git a/app/views/posts/_photo.html.haml b/app/views/posts/_photo.html.haml index da367f8f9..f9158a3e8 100644 --- a/app/views/posts/_photo.html.haml +++ b/app/views/posts/_photo.html.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. - content_for :head do - = include_javascripts :photos + = javascript_include_tag :photos #author_info = person_image_link(post.author) diff --git a/app/views/profiles/_edit_public.haml b/app/views/profiles/_edit_public.haml index eaed1e31a..89a59ad5e 100644 --- a/app/views/profiles/_edit_public.haml +++ b/app/views/profiles/_edit_public.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. - content_for :head do - = include_javascripts :profile + = javascript_include_tag :profile :javascript $(document).ready(function () { diff --git a/app/views/services/finder.html.haml b/app/views/services/finder.html.haml index 0484e2a38..e2c419dc3 100644 --- a/app/views/services/finder.html.haml +++ b/app/views/services/finder.html.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. - content_for :head do - = include_javascripts :finder + = javascript_include_tag :finder #section_header %h2 diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 68cb3e1f7..91788e0ae 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -7,7 +7,7 @@ | DIASPORA* ALPHA = content_for :head do - = include_javascripts :login + = javascript_include_tag :login :css header, #flash_alert { display:none; } diff --git a/app/views/shared/_mail_signup_form.erb b/app/views/shared/_mail_signup_form.erb index 24603af82..e6ae05cb4 100644 --- a/app/views/shared/_mail_signup_form.erb +++ b/app/views/shared/_mail_signup_form.erb @@ -1,6 +1,6 @@ -<%= include_javascripts :mailchimp %> +<%= javascript_include_tag :mailchimp %>
diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index afb8be007..0976661a3 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -19,7 +19,7 @@ = csrf_meta_tag = jquery_include_tag - = include_javascripts :main, :templates, :home + = javascript_include_tag :main, :templates, :home :javascript Diaspora.I18n.loadLocale(#{get_javascript_strings_for(I18n.locale).to_json}, "#{I18n.locale}"); diff --git a/app/views/tags/show.haml b/app/views/tags/show.haml index b90eb33ef..02f11a6b8 100644 --- a/app/views/tags/show.haml +++ b/app/views/tags/show.haml @@ -10,7 +10,7 @@ = t('.whatup', :pod => @pod_url) - content_for :head do - = include_javascripts :home + = javascript_include_tag :home :javascript $(document).ready(function(){ // Change the text and color of the "follow this tag" button on hover. diff --git a/app/views/users/getting_started.haml b/app/views/users/getting_started.haml index 7347c2cfc..15d9428b1 100644 --- a/app/views/users/getting_started.haml +++ b/app/views/users/getting_started.haml @@ -3,7 +3,7 @@ -# the COPYRIGHT file. - content_for :head do - = include_javascripts :profile + = javascript_include_tag :profile %br diff --git a/config/application.rb b/config/application.rb index 444999cf1..8c3c4ce0d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -63,8 +63,24 @@ module Diaspora config.filter_parameters += [:text] config.filter_parameters += [:bio] - # Enable the asset pipeline - config.assets.enabled = true + # Enable the asset pipeline + config.assets.enabled = true + + # For easier deployment to Heroku + config.assets.initialize_on_precompile = false + + # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) + # Javascripts + config.assets.precompile += [ "finder.js", "home.js", "ie.js", "inbox.js", + "jquery.js", "jquery_ujs.js", "login.js", "mailchimp.js", "main.js", + "mobile.js", "profile.js", "people.js", "photos.js", "templates.js" ] + + # Stylesheets + config.assets.precompile += [ "blueprint.css", "bootstrap.css", "default.css", + "login.css", "mobile.css", "new_templates.css", "rtl.css" ] + + # Version of your assets, change this if you want to expire all your assets + config.assets.version = '1.0' end end diff --git a/features/support/always_use_local_jquery.rb b/features/support/always_use_local_jquery.rb index faa428fe4..50f692df1 100644 --- a/features/support/always_use_local_jquery.rb +++ b/features/support/always_use_local_jquery.rb @@ -1,5 +1,5 @@ module ApplicationHelper def jquery_include_tag - include_javascripts :jquery + javascript_include_tag :jquery end end \ No newline at end of file diff --git a/public/javascripts/vendor/backbone.js b/vendor/assets/javascripts/backbone.js similarity index 100% rename from public/javascripts/vendor/backbone.js rename to vendor/assets/javascripts/backbone.js diff --git a/public/javascripts/vendor/bootstrap/bootstrap-modal.js b/vendor/assets/javascripts/bootstrap/bootstrap-modal.js similarity index 100% rename from public/javascripts/vendor/bootstrap/bootstrap-modal.js rename to vendor/assets/javascripts/bootstrap/bootstrap-modal.js diff --git a/public/javascripts/vendor/bootstrap/bootstrap-popover.js b/vendor/assets/javascripts/bootstrap/bootstrap-popover.js similarity index 100% rename from public/javascripts/vendor/bootstrap/bootstrap-popover.js rename to vendor/assets/javascripts/bootstrap/bootstrap-popover.js diff --git a/public/javascripts/vendor/bootstrap/bootstrap-transition.js b/vendor/assets/javascripts/bootstrap/bootstrap-transition.js similarity index 100% rename from public/javascripts/vendor/bootstrap/bootstrap-transition.js rename to vendor/assets/javascripts/bootstrap/bootstrap-transition.js diff --git a/public/javascripts/vendor/bootstrap/bootstrap-twipsy.js b/vendor/assets/javascripts/bootstrap/bootstrap-twipsy.js similarity index 100% rename from public/javascripts/vendor/bootstrap/bootstrap-twipsy.js rename to vendor/assets/javascripts/bootstrap/bootstrap-twipsy.js diff --git a/public/javascripts/vendor/facebox.js b/vendor/assets/javascripts/facebox.js similarity index 100% rename from public/javascripts/vendor/facebox.js rename to vendor/assets/javascripts/facebox.js diff --git a/public/javascripts/fileuploader-custom.js b/vendor/assets/javascripts/fileuploader-custom.js similarity index 100% rename from public/javascripts/fileuploader-custom.js rename to vendor/assets/javascripts/fileuploader-custom.js diff --git a/public/javascripts/vendor/handlebars-1.0.0.beta.6.js b/vendor/assets/javascripts/handlebars-1.0.0.beta.6.js similarity index 100% rename from public/javascripts/vendor/handlebars-1.0.0.beta.6.js rename to vendor/assets/javascripts/handlebars-1.0.0.beta.6.js diff --git a/public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js b/vendor/assets/javascripts/jquery-ui-1.8.9.custom.min.js similarity index 100% rename from public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js rename to vendor/assets/javascripts/jquery-ui-1.8.9.custom.min.js diff --git a/public/javascripts/vendor/jquery.autoSuggest.custom.js b/vendor/assets/javascripts/jquery.autoSuggest.custom.js similarity index 92% rename from public/javascripts/vendor/jquery.autoSuggest.custom.js rename to vendor/assets/javascripts/jquery.autoSuggest.custom.js index bafd35cbc..4ab1f3ec4 100644 --- a/public/javascripts/vendor/jquery.autoSuggest.custom.js +++ b/vendor/assets/javascripts/jquery.autoSuggest.custom.js @@ -11,7 +11,7 @@ * the fly. It supports keybord navigation (UP + DOWN + RETURN), as well * as multiple AutoSuggest fields on the same page. * - * Inspied by the Autocomplete plugin by: Jšrn Zaefferer + * Inspied by the Autocomplete plugin by: JÅ¡rn Zaefferer * and the Facelist plugin by: Ian Tearle (iantearle.com) * * This AutoSuggest jQuery plug-in is dual licensed under the MIT and GPL licenses: @@ -21,7 +21,7 @@ (function($){ $.fn.autoSuggest = function(data, options) { - var defaults = { + var defaults = { asHtmlID: false, startText: "Enter Name Here", emptyText: "No Results Found", @@ -49,9 +49,9 @@ retrieveComplete: function(data){ return data; }, resultClick: function(data){}, resultsComplete: function(){} - }; - var opts = $.extend(defaults, options); - + }; + var opts = $.extend(defaults, options); + var d_type = "object"; var d_count = 0; if(typeof data == "string") { @@ -74,23 +74,23 @@ var input = $(this); input.attr("autocomplete","off").addClass("as-input").attr("id",x_id).val(opts.startText); var input_focus = false; - + // Setup basic elements and render them to the DOM input.wrap('
    ').wrap('
  • '); var selections_holder = $("#as-selections-"+x); - var org_li = $("#as-original-"+x); + var org_li = $("#as-original-"+x); var results_holder = $('
    ').hide(); var results_ul = $('
      '); var values_input = $(''); var prefill_value = ""; if(typeof opts.preFill == "string"){ - var vals = opts.preFill.split(","); + var vals = opts.preFill.split(","); for(var i=0; i < vals.length; i++){ var v_data = {}; v_data[opts.selectedValuesProp] = vals[i]; if(vals[i] != ""){ - add_selected_item(v_data, "000"+i); - } + add_selected_item(v_data, "000"+i); + } } prefill_value = opts.preFill; } else { @@ -103,8 +103,8 @@ if(new_v == undefined){ new_v = ""; } prefill_value = prefill_value+new_v+","; if(new_v != ""){ - add_selected_item(opts.preFill[i], "000"+i); - } + add_selected_item(opts.preFill[i], "000"+i); + } } } } @@ -119,15 +119,15 @@ selections_holder.click(function(){ input_focus = true; input.focus(); - }).mousedown(function(){ input_focus = false; }).after(results_holder); + }).mousedown(function(){ input_focus = false; }).after(results_holder); var timeout = null; var prev = ""; var totalSelections = 0; var tab_press = false; - + // Handle input field events - input.focus(function(){ + input.focus(function(){ if($(this).val() == opts.startText && values_input.val() == ""){ $(this).val(""); } else if(input_focus){ @@ -145,7 +145,7 @@ } else if(input_focus){ $("li.as-selection-item", selections_holder).addClass("blur").removeClass("selected"); results_holder.hide(); - } + } }).keydown(function(e) { // track last key pressed lastKeyPressCode = e.keyCode; @@ -160,7 +160,7 @@ moveSelection("down"); break; case 8: // delete - if(input.val() == ""){ + if(input.val() == ""){ var last = values_input.val().split(","); last = last[last.length - 2]; selections_holder.children().not(org_li.prev()).removeClass("selected"); @@ -169,7 +169,7 @@ opts.selectionRemoved.call(this, org_li.prev()); } else { opts.selectionClick.call(this, org_li.prev()); - org_li.prev().addClass("selected"); + org_li.prev().addClass("selected"); } } if(input.val().length == 1){ @@ -184,11 +184,11 @@ /*case 9: case 188: // tab or comma tab_press = true; var i_input = input.val().replace(/(,)/g, ""); - if(i_input != "" && values_input.val().search(","+i_input+",") < 0 && i_input.length >= opts.minChars){ + if(i_input != "" && values_input.val().search(","+i_input+",") < 0 && i_input.length >= opts.minChars){ e.preventDefault(); var n_data = {}; n_data[opts.selectedItemProp] = i_input; - n_data[opts.selectedValuesProp] = i_input; + n_data[opts.selectedValuesProp] = i_input; var lis = $("li", selections_holder).length; add_selected_item(n_data, "00"+(lis+1)); input.val(""); @@ -221,7 +221,7 @@ break; } }); - + function keyChange() { // ignore if the following keys are pressed: [del] [shift] [capslock] if( lastKeyPressCode == 46 || (lastKeyPressCode > 8 && lastKeyPressCode < 32) ){ return results_holder.hide(); } @@ -238,11 +238,11 @@ if(opts.beforeRetrieve){ string = opts.beforeRetrieve.call(this, string); } - $.getJSON(req_string+"?"+opts.queryParam+"="+encodeURIComponent(string)+limit+opts.extraParams, function(data){ + $.getJSON(req_string+"?"+opts.queryParam+"="+encodeURIComponent(string)+limit+opts.extraParams, function(data){ d_count = 0; var new_data = opts.retrieveComplete.call(this, data); for (k in new_data) if (new_data.hasOwnProperty(k)) d_count++; - processData(new_data, string); + processData(new_data, string); }); } else { if(opts.beforeRetrieve){ @@ -260,13 +260,13 @@ if (!opts.matchCase){ query = query.toLowerCase(); } var matchCount = 0; results_holder.html(results_ul.html("")).hide(); - for(var i=0;i').click(function(){ @@ -298,19 +298,19 @@ $(this).addClass("active"); }).data("data",{attributes: data[num], num: num_count}); var this_data = $.extend({},data[num]); - if (!opts.matchCase){ + if (!opts.matchCase){ var regx = new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + query + ")(?![^<>]*>)(?![^&;]+;)", "gi"); } else { var regx = new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + query + ")(?![^<>]*>)(?![^&;]+;)", "g"); } - + if(opts.resultsHighlight){ this_data[opts.selectedItemProp] = this_data[opts.selectedItemProp].replace(regx,"$1"); } if(!opts.formatList){ formatted = formatted.html(this_data[opts.selectedItemProp]); } else { - formatted = opts.formatList.call(this, this_data, formatted); + formatted = opts.formatList.call(this, this_data, formatted); } results_ul.append(formatted); delete this_data; @@ -326,7 +326,7 @@ results_holder.show(); opts.resultsComplete.call(this); } - + function add_selected_item(data, num){ values_input.val(values_input.val()+data[opts.selectedValuesProp]+","); var item = $('
    • ').click(function(){ @@ -342,9 +342,9 @@ return false; }); org_li.before(item.html(data[opts.selectedItemProp]).prepend(close)); - opts.selectionAdded.call(this, org_li.prev()); + opts.selectionAdded.call(this, org_li.prev()); } - + function moveSelection(direction){ if($(":visible",results_holder).length > 0){ var lis = $("li", results_holder); @@ -352,20 +352,20 @@ var start = lis.eq(0); } else { var start = lis.filter(":last"); - } + } var active = $("li.active:first", results_holder); if(active.length > 0){ if(direction == "down"){ start = active.next(); } else { start = active.prev(); - } + } } lis.removeClass("active"); start.addClass("active"); } } - + }); } } diff --git a/public/javascripts/jquery.autocomplete-custom.js b/vendor/assets/javascripts/jquery.autocomplete-custom.js similarity index 100% rename from public/javascripts/jquery.autocomplete-custom.js rename to vendor/assets/javascripts/jquery.autocomplete-custom.js diff --git a/public/javascripts/vendor/jquery.autoresize.js b/vendor/assets/javascripts/jquery.autoresize.js similarity index 100% rename from public/javascripts/vendor/jquery.autoresize.js rename to vendor/assets/javascripts/jquery.autoresize.js diff --git a/public/javascripts/vendor/jquery.charcount.js b/vendor/assets/javascripts/jquery.charcount.js similarity index 100% rename from public/javascripts/vendor/jquery.charcount.js rename to vendor/assets/javascripts/jquery.charcount.js diff --git a/public/javascripts/vendor/jquery.elastic.js b/vendor/assets/javascripts/jquery.elastic.js similarity index 100% rename from public/javascripts/vendor/jquery.elastic.js rename to vendor/assets/javascripts/jquery.elastic.js diff --git a/public/javascripts/vendor/jquery.events.input.js b/vendor/assets/javascripts/jquery.events.input.js similarity index 100% rename from public/javascripts/vendor/jquery.events.input.js rename to vendor/assets/javascripts/jquery.events.input.js diff --git a/public/javascripts/vendor/jquery.hotkeys.js b/vendor/assets/javascripts/jquery.hotkeys.js similarity index 100% rename from public/javascripts/vendor/jquery.hotkeys.js rename to vendor/assets/javascripts/jquery.hotkeys.js diff --git a/public/javascripts/vendor/jquery.idle-timer.js b/vendor/assets/javascripts/jquery.idle-timer.js similarity index 100% rename from public/javascripts/vendor/jquery.idle-timer.js rename to vendor/assets/javascripts/jquery.idle-timer.js diff --git a/public/javascripts/jquery.infinitescroll-custom.js b/vendor/assets/javascripts/jquery.infinitescroll-custom.js similarity index 100% rename from public/javascripts/jquery.infinitescroll-custom.js rename to vendor/assets/javascripts/jquery.infinitescroll-custom.js diff --git a/public/javascripts/vendor/jquery.mentionsInput.js b/vendor/assets/javascripts/jquery.mentionsInput.js similarity index 100% rename from public/javascripts/vendor/jquery.mentionsInput.js rename to vendor/assets/javascripts/jquery.mentionsInput.js diff --git a/public/javascripts/vendor/jquery.placeholder.js b/vendor/assets/javascripts/jquery.placeholder.js similarity index 100% rename from public/javascripts/vendor/jquery.placeholder.js rename to vendor/assets/javascripts/jquery.placeholder.js diff --git a/public/javascripts/vendor/jquery.textchange.min.js b/vendor/assets/javascripts/jquery.textchange.min.js similarity index 100% rename from public/javascripts/vendor/jquery.textchange.min.js rename to vendor/assets/javascripts/jquery.textchange.min.js diff --git a/public/javascripts/keycodes.js b/vendor/assets/javascripts/keycodes.js similarity index 100% rename from public/javascripts/keycodes.js rename to vendor/assets/javascripts/keycodes.js diff --git a/public/javascripts/vendor/mailchimp/jquery.form.js b/vendor/assets/javascripts/mailchimp/jquery.form.js similarity index 100% rename from public/javascripts/vendor/mailchimp/jquery.form.js rename to vendor/assets/javascripts/mailchimp/jquery.form.js diff --git a/public/javascripts/vendor/mailchimp/jquery.validate.js b/vendor/assets/javascripts/mailchimp/jquery.validate.js similarity index 100% rename from public/javascripts/vendor/mailchimp/jquery.validate.js rename to vendor/assets/javascripts/mailchimp/jquery.validate.js diff --git a/public/javascripts/vendor/mailchimp/jquery126.min.js b/vendor/assets/javascripts/mailchimp/jquery126.min.js similarity index 100% rename from public/javascripts/vendor/mailchimp/jquery126.min.js rename to vendor/assets/javascripts/mailchimp/jquery126.min.js diff --git a/vendor/assets/javascripts/markdown.js b/vendor/assets/javascripts/markdown.js new file mode 100644 index 000000000..88dd96256 --- /dev/null +++ b/vendor/assets/javascripts/markdown.js @@ -0,0 +1 @@ +//= require_tree ./markdown \ No newline at end of file diff --git a/public/javascripts/vendor/markdown/Markdown.Converter.js b/vendor/assets/javascripts/markdown/Markdown.Converter.js similarity index 100% rename from public/javascripts/vendor/markdown/Markdown.Converter.js rename to vendor/assets/javascripts/markdown/Markdown.Converter.js diff --git a/public/javascripts/vendor/markdown/Markdown.Sanitizer.js b/vendor/assets/javascripts/markdown/Markdown.Sanitizer.js similarity index 100% rename from public/javascripts/vendor/markdown/Markdown.Sanitizer.js rename to vendor/assets/javascripts/markdown/Markdown.Sanitizer.js diff --git a/public/javascripts/vendor/mbp-helper.js b/vendor/assets/javascripts/mbp-helper.js similarity index 100% rename from public/javascripts/vendor/mbp-helper.js rename to vendor/assets/javascripts/mbp-helper.js diff --git a/public/javascripts/rails.validations.js b/vendor/assets/javascripts/rails.validations.js similarity index 100% rename from public/javascripts/rails.validations.js rename to vendor/assets/javascripts/rails.validations.js diff --git a/public/javascripts/vendor/timeago.js b/vendor/assets/javascripts/timeago.js similarity index 100% rename from public/javascripts/vendor/timeago.js rename to vendor/assets/javascripts/timeago.js diff --git a/public/javascripts/vendor/underscore.js b/vendor/assets/javascripts/underscore.js similarity index 100% rename from public/javascripts/vendor/underscore.js rename to vendor/assets/javascripts/underscore.js From e1607baff4ac71316da651bc7fa743e1ac6d0d5d Mon Sep 17 00:00:00 2001 From: Steven Hancock Date: Thu, 22 Mar 2012 23:38:09 -0700 Subject: [PATCH 06/20] jquery_include_tag helper Implement the jquery_include_tag helper, which is used in several views but was not implemented in the code. This helper attempts to load jQuery from the Google CDN (matching the version of the vendored jquery.js in jquery-rails), falling back to the vendored copy if the google CDN fails. The helper also loads jquery_ujs.js from jquery-rails. A jquery_cdn setting is added to application.yml to enable or disable serving jQuery from the Google CDN (for those podmins who would rather not use Google's services). Update app/views/application.html.haml to use the jquery_include_tag helper since it was the only view that was including the vendored copy of jquery directly with jquery_include_tag. --- app/helpers/application_helper.rb | 15 ++++++++++++ app/views/layouts/application.html.haml | 2 +- config/application.yml.example | 3 +++ spec/helpers/application_helper_spec.rb | 31 +++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c61fafea9..e611a2cbd 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -35,4 +35,19 @@ module ApplicationHelper def diaspora_id_host User.diaspora_id_host end + + # Require jQuery from CDN if possible, falling back to vendored copy, and require + # vendored jquery_ujs + def jquery_include_tag + buf = [] + if AppConfig[:jquery_cdn] + version = Jquery::Rails::JQUERY_VERSION + buf << [ javascript_include_tag("//ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js") ] + buf << [ javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag("jquery")}'));") ] + else + buf << [ javascript_include_tag('jquery') ] + end + buf << [ javascript_include_tag('jquery_ujs') ] + buf.join("\n").html_safe + end end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index a3a0c4c7a..01fa8f767 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -29,7 +29,7 @@ = javascript_include_tag :ie - = javascript_include_tag 'jquery', 'jquery_ujs' + = jquery_include_tag - unless @landing_page = javascript_include_tag :main, :templates diff --git a/config/application.yml.example b/config/application.yml.example index 1de63b89a..164768668 100644 --- a/config/application.yml.example +++ b/config/application.yml.example @@ -39,6 +39,9 @@ defaults: &defaults # let your reverse proxy/webserver do it. serve_static_assets: false + # Serve jQuery from Google's CDN + jquery_cdn: true + # # Settings # diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 271fd662b..7a34f9b89 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -48,4 +48,35 @@ describe ApplicationHelper do all_services_connected?.should be_false end end + + describe "#jquery_include_tag" do + describe "with google cdn" do + before do + AppConfig[:jquery_cdn] = true + end + + it 'inclues jquery.js from google cdn' do + jquery_include_tag.should match(/googleapis\.com/) + end + + it 'falls back to asset pipeline on cdn failure' do + jquery_include_tag.should match(/document\.write/) + end + end + + describe "without google cdn" do + before do + AppConfig[:jquery_cdn] = false + end + + it 'includes jquery.js from asset pipeline' do + jquery_include_tag.should match(/jquery\.js/) + jquery_include_tag.should_not match(/googleapis\.com/) + end + end + + it 'inclues jquery_ujs.js' do + jquery_include_tag.should match(/jquery_ujs\.js/) + end + end end From 95d5c9ca681e9990a2caf10448b922339b9d694a Mon Sep 17 00:00:00 2001 From: Steven Hancock Date: Thu, 22 Mar 2012 12:10:08 -0700 Subject: [PATCH 07/20] Fix Jasmine tests - first pass 193 specs | 5 failing The 5 failing specs appear (according to Firebug) to be due to missing fixtures and/or missing routes in the Jasmine environment. Fixing these last 5 failures is a task probably best left to a more experienced Javascript/Jasmine developer. This commit also moves validation.js and clear-form.js into app/assets/javascripts and precompiles validation.js --- Gemfile | 3 +- Gemfile.lock | 27 +++++++- app/assets/javascripts/app/app.js | 2 +- .../javascripts/app/views/photos_view.js | 2 +- .../javascripts/app/views/stream_view.js | 2 +- .../assets}/javascripts/clear-form.js | 0 app/assets/javascripts/inbox.js | 2 +- app/assets/javascripts/jasmine-load-all.js | 12 ++++ app/assets/javascripts/main.js | 7 +- .../assets}/javascripts/validation.js | 0 app/assets/javascripts/view.js | 5 +- .../javascripts/widgets/infinite-scroll.js | 2 +- app/assets/stylesheets/vendor/autoSuggest.css | 2 +- .../vendor/jquery.mobile-1.0b2.min.css | 2 +- app/assets/templates/all.js | 4 -- config/application.rb | 3 +- config/deploy.rb | 3 +- lib/tasks/ci.rake | 2 +- spec/javascripts/support/jasmine.yml | 67 +++---------------- spec/javascripts/support/jasmine_config.rb | 7 -- spec/javascripts/support/jasmine_runner.rb | 9 --- 21 files changed, 68 insertions(+), 95 deletions(-) rename {public => app/assets}/javascripts/clear-form.js (100%) create mode 100644 app/assets/javascripts/jasmine-load-all.js rename {public => app/assets}/javascripts/validation.js (100%) delete mode 100644 app/assets/templates/all.js delete mode 100644 spec/javascripts/support/jasmine_config.rb diff --git a/Gemfile b/Gemfile index 118464a7d..5ec4b6405 100644 --- a/Gemfile +++ b/Gemfile @@ -123,7 +123,8 @@ gem 'em-synchrony', '1.0.0', :platforms => :ruby_19 # jazzy jasmine -gem 'jasmine', '~> 1.1.2' +# Use the latest Jasmine from github for asset pipeline compatibility +gem 'jasmine', :git => 'git://github.com/pivotal/jasmine-gem.git' ### GROUPS #### diff --git a/Gemfile.lock b/Gemfile.lock index 6b1ccc735..55da05532 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,6 +34,27 @@ GIT rack-fiber_pool sinatra +<<<<<<< HEAD +======= +GIT + remote: git://github.com/pivotal/jasmine-gem.git + revision: 34c1529c3f7b78ebd81ac16006f141fc6b7cf013 + specs: + jasmine (1.2.0.rc2) + jasmine-core (>= 1.2.0.rc1) + rack (>= 1.1) + rspec (>= 1.3.1) + selenium-webdriver (>= 0.1.3) + +GIT + remote: git://github.com/socialcast/resque-ensure-connected.git + revision: 8ac0f9e4658495097fb333a93db81d54ba9a5311 + specs: + resque-ensure-connected (0.2.0) + activerecord (>= 2.3.5) + resque (>= 1.10.0) + +>>>>>>> Fix Jasmine tests - first pass GEM remote: http://rubygems.org/ specs: @@ -209,6 +230,7 @@ GEM actionpack (~> 3.0) i18n-inflector (~> 2.6) railties (~> 3.0) +<<<<<<< HEAD jasmine (1.1.2) jasmine-core (>= 1.1.0) rack (>= 1.1) @@ -218,6 +240,9 @@ GEM <<<<<<< HEAD json (1.6.6) ======= +======= + jasmine-core (1.2.0.rc1) +>>>>>>> Fix Jasmine tests - first pass jquery-rails (1.0.19) railties (~> 3.0) thor (~> 0.14) @@ -489,7 +514,7 @@ DEPENDENCIES heroku_san http_accept_language (~> 1.0.2) i18n-inflector-rails (~> 1.0) - jasmine (~> 1.1.2) + jasmine! jquery-rails json jwt diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index 6804ca779..663353243 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -21,7 +21,7 @@ var app = { baseImageUrl: function(baseUrl){ if(baseUrl) { return this._baseImageUrl = baseUrl } - return this._baseImageUrl || "" + return this._baseImageUrl || "assets/" }, initialize: function() { diff --git a/app/assets/javascripts/app/views/photos_view.js b/app/assets/javascripts/app/views/photos_view.js index 2f930f018..74cab7757 100644 --- a/app/assets/javascripts/app/views/photos_view.js +++ b/app/assets/javascripts/app/views/photos_view.js @@ -39,7 +39,7 @@ app.views.Photos = Backbone.View.extend({ appendLoader: function(){ $("#paginate").html($("", { - src : "/images/static-loader.png", + src : "/assets/static-loader.png", "class" : "loader" })); }, diff --git a/app/assets/javascripts/app/views/stream_view.js b/app/assets/javascripts/app/views/stream_view.js index b17ae4c60..f4a510375 100644 --- a/app/assets/javascripts/app/views/stream_view.js +++ b/app/assets/javascripts/app/views/stream_view.js @@ -85,7 +85,7 @@ app.views.Stream = Backbone.View.extend({ appendLoader: function(){ $("#paginate").html($("", { - src : "/images/static-loader.png", + src : "/assets/static-loader.png", "class" : "loader" })); }, diff --git a/public/javascripts/clear-form.js b/app/assets/javascripts/clear-form.js similarity index 100% rename from public/javascripts/clear-form.js rename to app/assets/javascripts/clear-form.js diff --git a/app/assets/javascripts/inbox.js b/app/assets/javascripts/inbox.js index cbed2ac79..2809bea60 100644 --- a/app/assets/javascripts/inbox.js +++ b/app/assets/javascripts/inbox.js @@ -56,7 +56,7 @@ $(document).ready(function(){ debug: false, donetext: "no more.", loadingText: "", - loadingImg: '/images/ajax-loader.gif' + loadingImg: '/assets/ajax-loader.gif' }, function(){ $('.conversation', '.stream').bind('mousedown', function(){ bindIt($(this)); diff --git a/app/assets/javascripts/jasmine-load-all.js b/app/assets/javascripts/jasmine-load-all.js new file mode 100644 index 000000000..f7ca3afb4 --- /dev/null +++ b/app/assets/javascripts/jasmine-load-all.js @@ -0,0 +1,12 @@ +//= require jquery +//= require handlebars-1.0.0.beta.6 +//= require templates +//= require main +//= require home +//= require finder +//= require inbox +//= require login +//= require mobile +//= require profile +//= require people +//= require photos \ No newline at end of file diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index 69013f3d6..1cb7f3ed8 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -2,6 +2,9 @@ * licensed under the Affero General Public License version 3 or later. See * the COPYRIGHT file. */ +//= require jquery_ujs +//= require underscore +//= require backbone //= require rails.validations //= require jquery.hotkeys //= require jquery.autoresize @@ -10,7 +13,6 @@ //= require jquery.placeholder //= require timeago //= require facebox -//= require underscore //= require jquery.events.input //= require jquery.elastic //= require jquery.mentionsInput @@ -19,9 +21,10 @@ //= require jquery.autocomplete-custom //= require keycodes //= require fileuploader-custom -//= require backbone //= require handlebars-1.0.0.beta.6 //= require markdown +//= require clear-form +//= require validation //= require app/app //= require diaspora //= require_tree ./helpers diff --git a/public/javascripts/validation.js b/app/assets/javascripts/validation.js similarity index 100% rename from public/javascripts/validation.js rename to app/assets/javascripts/validation.js diff --git a/app/assets/javascripts/view.js b/app/assets/javascripts/view.js index 9dc4f2e8f..240feb6e5 100644 --- a/app/assets/javascripts/view.js +++ b/app/assets/javascripts/view.js @@ -2,6 +2,7 @@ * licensed under the Affero General Public License version 3 or later. See * the COPYRIGHT file. */ +//= require mailchimp/jquery.form var View = { initialize: function() { /* Buttons */ @@ -63,8 +64,8 @@ var View = { $(document.body).click(this.dropdowns.removeFocus); /* facebox */ - $.facebox.settings.closeImage = '/images/facebox/closelabel.png'; - $.facebox.settings.loadingImage = '/images/facebox/loading.gif'; + $.facebox.settings.closeImage = '/assets/facebox/closelabel.png'; + $.facebox.settings.loadingImage = '/assets/facebox/loading.gif'; $.facebox.settings.opacity = 0.75; $('a[rel*=facebox]').facebox(); diff --git a/app/assets/javascripts/widgets/infinite-scroll.js b/app/assets/javascripts/widgets/infinite-scroll.js index 6c3511642..38b826a91 100644 --- a/app/assets/javascripts/widgets/infinite-scroll.js +++ b/app/assets/javascripts/widgets/infinite-scroll.js @@ -11,7 +11,7 @@ debug: false, donetext: Diaspora.I18n.t("infinite_scroll.no_more"), loadingText: "", - loadingImg: "/images/ajax-loader.gif", + loadingImg: "/assets/ajax-loader.gif", navSelector: "#pagination", nextSelector: ".paginate", itemSelector: ".stream_element", diff --git a/app/assets/stylesheets/vendor/autoSuggest.css b/app/assets/stylesheets/vendor/autoSuggest.css index b82254d35..444db341a 100644 --- a/app/assets/stylesheets/vendor/autoSuggest.css +++ b/app/assets/stylesheets/vendor/autoSuggest.css @@ -16,7 +16,7 @@ ul.as-selections { } ul.as-selections.loading { - background: url("/images/ajax-loader.gif") right center no-repeat; + background: url("/assets/ajax-loader.gif") right center no-repeat; } ul.as-selections li { diff --git a/app/assets/stylesheets/vendor/jquery.mobile-1.0b2.min.css b/app/assets/stylesheets/vendor/jquery.mobile-1.0b2.min.css index 4e9814d62..89be9382d 100644 --- a/app/assets/stylesheets/vendor/jquery.mobile-1.0b2.min.css +++ b/app/assets/stylesheets/vendor/jquery.mobile-1.0b2.min.css @@ -5,4 +5,4 @@ * Copyright 2010, jQuery Project * Dual licensed under the MIT or GPL Version 2 licenses. * http://jquery.org/license - */.ui-bar-a{border:1px solid #2a2a2a;background:#111;color:#fff;font-weight:bold;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#111));background-image:-webkit-linear-gradient(top,#3c3c3c,#111);background-image:-moz-linear-gradient(top,#3c3c3c,#111);background-image:-ms-linear-gradient(top,#3c3c3c,#111);background-image:-o-linear-gradient(top,#3c3c3c,#111);background-image:linear-gradient(top,#3c3c3c,#111)}.ui-bar-a,.ui-bar-a input,.ui-bar-a select,.ui-bar-a textarea,.ui-bar-a button{font-family:Helvetica,Arial,sans-serif}.ui-bar-a .ui-link-inherit{color:#fff}.ui-bar-a .ui-link{color:#7cc4e7;font-weight:bold}.ui-body-a{border:1px solid #2a2a2a;background:#222;color:#fff;text-shadow:0 1px 0 #000;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#222));background-image:-webkit-linear-gradient(top,#666,#222);background-image:-moz-linear-gradient(top,#666,#222);background-image:-ms-linear-gradient(top,#666,#222);background-image:-o-linear-gradient(top,#666,#222);background-image:linear-gradient(top,#666,#222)}.ui-body-a,.ui-body-a input,.ui-body-a select,.ui-body-a textarea,.ui-body-a button{font-family:Helvetica,Arial,sans-serif}.ui-body-a .ui-link-inherit{color:#fff}.ui-body-a .ui-link{color:#2489ce;font-weight:bold}.ui-br{border-bottom:#828282;border-bottom:rgba(130,130,130,.3);border-bottom-width:1px;border-bottom-style:solid}.ui-btn-up-a{border:1px solid #222;background:#333;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));background-image:-webkit-linear-gradient(top,#555,#333);background-image:-moz-linear-gradient(top,#555,#333);background-image:-ms-linear-gradient(top,#555,#333);background-image:-o-linear-gradient(top,#555,#333);background-image:linear-gradient(top,#555,#333)}.ui-btn-up-a a.ui-link-inherit{color:#fff}.ui-btn-hover-a{border:1px solid #000;background:#444;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#444));background-image:-webkit-linear-gradient(top,#666,#444);background-image:-moz-linear-gradient(top,#666,#444);background-image:-ms-linear-gradient(top,#666,#444);background-image:-o-linear-gradient(top,#666,#444);background-image:linear-gradient(top,#666,#444)}.ui-btn-hover-a a.ui-link-inherit{color:#fff}.ui-btn-down-a{border:1px solid #000;background:#3d3d3d;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#333),to(#5a5a5a));background-image:-webkit-linear-gradient(top,#333,#5a5a5a);background-image:-moz-linear-gradient(top,#333,#5a5a5a);background-image:-ms-linear-gradient(top,#333,#5a5a5a);background-image:-o-linear-gradient(top,#333,#5a5a5a);background-image:linear-gradient(top,#333,#5a5a5a)}.ui-btn-down-a a.ui-link-inherit{color:#fff}.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-b{border:1px solid #456f9a;background:#5e87b0;color:#fff;font-weight:bold;text-shadow:0 -1px 1px #254f7a;background-image:-webkit-gradient(linear,left top,left bottom,from(#81a8ce),to(#5e87b0));background-image:-webkit-linear-gradient(top,#81a8ce,#5e87b0);background-image:-moz-linear-gradient(top,#81a8ce,#5e87b0);background-image:-ms-linear-gradient(top,#81a8ce,#5e87b0);background-image:-o-linear-gradient(top,#81a8ce,#5e87b0);background-image:linear-gradient(top,#81a8ce,#5e87b0)}.ui-bar-b,.ui-bar-b input,.ui-bar-b select,.ui-bar-b textarea,.ui-bar-b button{font-family:Helvetica,Arial,sans-serif}.ui-bar-b .ui-link-inherit{color:#fff}.ui-bar-b .ui-link{color:#7cc4e7;font-weight:bold}.ui-body-b{border:1px solid #c6c6c6;background:#ccc;color:#333;text-shadow:0 1px 0 #fff;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#e6e6e6),to(#ccc));background-image:-webkit-linear-gradient(top,#e6e6e6,#ccc);background-image:-moz-linear-gradient(top,#e6e6e6,#ccc);background-image:-ms-linear-gradient(top,#e6e6e6,#ccc);background-image:-o-linear-gradient(top,#e6e6e6,#ccc);background-image:linear-gradient(top,#e6e6e6,#ccc)}.ui-body-b,.ui-body-b input,.ui-body-b select,.ui-body-b textarea,.ui-body-b button{font-family:Helvetica,Arial,sans-serif}.ui-body-b .ui-link-inherit{color:#333}.ui-body-b .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-b{border:1px solid #145072;background:#2567ab;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #145072;background-image:-webkit-gradient(linear,left top,left bottom,from(#5f9cc5),to(#396b9e));background-image:-webkit-linear-gradient(top,#5f9cc5,#396b9e);background-image:-moz-linear-gradient(top,#5f9cc5,#396b9e);background-image:-ms-linear-gradient(top,#5f9cc5,#396b9e);background-image:-o-linear-gradient(top,#5f9cc5,#396b9e);background-image:linear-gradient(top,#5f9cc5,#396b9e)}.ui-btn-up-b a.ui-link-inherit{color:#fff}.ui-btn-hover-b{border:1px solid #00516e;background:#4b88b6;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #014d68;background-image:-webkit-gradient(linear,left top,left bottom,from(#72b0d4),to(#4b88b6));background-image:-webkit-linear-gradient(top,#72b0d4,#4b88b6);background-image:-moz-linear-gradient(top,#72b0d4,#4b88b6);background-image:-ms-linear-gradient(top,#72b0d4,#4b88b6);background-image:-o-linear-gradient(top,#72b0d4,#4b88b6);background-image:linear-gradient(top,#72b0d4,#4b88b6)}.ui-btn-hover-b a.ui-link-inherit{color:#fff}.ui-btn-down-b{border:1px solid #225377;background:#4e89c5;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #225377;background-image:-webkit-gradient(linear,left top,left bottom,from(#396b9e),to(#4e89c5));background-image:-webkit-linear-gradient(top,#396b9e,#4e89c5);background-image:-moz-linear-gradient(top,#396b9e,#4e89c5);background-image:-ms-linear-gradient(top,#396b9e,#4e89c5);background-image:-o-linear-gradient(top,#396b9e,#4e89c5);background-image:linear-gradient(top,#396b9e,#4e89c5)}.ui-btn-down-b a.ui-link-inherit{color:#fff}.ui-btn-up-b,.ui-btn-hover-b,.ui-btn-down-b{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-c{border:1px solid #b3b3b3;background:#e9eaeb;color:#3e3e3e;font-weight:bold;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f0f0f0),to(#e9eaeb));background-image:-webkit-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-moz-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-ms-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-o-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:linear-gradient(top,#f0f0f0,#e9eaeb)}.ui-bar-c,.ui-bar-c input,.ui-bar-c select,.ui-bar-c textarea,.ui-bar-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c{border:1px solid #b3b3b3;color:#333;text-shadow:0 1px 0 #fff;background:#f0f0f0;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));background-image:-webkit-linear-gradient(top,#eee,#ddd);background-image:-moz-linear-gradient(top,#eee,#ddd);background-image:-ms-linear-gradient(top,#eee,#ddd);background-image:-o-linear-gradient(top,#eee,#ddd);background-image:linear-gradient(top,#eee,#ddd)}.ui-body-c,.ui-body-c input,.ui-body-c select,.ui-body-c textarea,.ui-body-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c .ui-link-inherit{color:#333}.ui-body-c .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-c{border:1px solid #ccc;background:#eee;font-weight:bold;color:#444;text-shadow:0 1px 1px #f6f6f6;background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);background-image:-moz-linear-gradient(top,#fdfdfd,#eee);background-image:-ms-linear-gradient(top,#fdfdfd,#eee);background-image:-o-linear-gradient(top,#fdfdfd,#eee);background-image:linear-gradient(top,#fdfdfd,#eee)}.ui-btn-up-c a.ui-link-inherit{color:#2f3e46}.ui-btn-hover-c{border:1px solid #bbb;background:#dadada;font-weight:bold;color:#101010;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#ededed),to(#dadada));background-image:-webkit-linear-gradient(top,#ededed,#dadada);background-image:-moz-linear-gradient(top,#ededed,#dadada);background-image:-ms-linear-gradient(top,#ededed,#dadada);background-image:-o-linear-gradient(top,#ededed,#dadada);background-image:linear-gradient(top,#ededed,#dadada)}.ui-btn-hover-c a.ui-link-inherit{color:#2f3e46}.ui-btn-down-c{border:1px solid #808080;background:#fdfdfd;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fdfdfd));background-image:-webkit-linear-gradient(top,#eee,#fdfdfd);background-image:-moz-linear-gradient(top,#eee,#fdfdfd);background-image:-ms-linear-gradient(top,#eee,#fdfdfd);background-image:-o-linear-gradient(top,#eee,#fdfdfd);background-image:linear-gradient(top,#eee,#fdfdfd)}.ui-btn-down-c a.ui-link-inherit{color:#2f3e46}.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-d{border:1px solid #ccc;background:#bbb;color:#333;text-shadow:0 1px 0 #eee;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddd),to(#bbb));background-image:-webkit-linear-gradient(top,#ddd,#bbb);background-image:-moz-linear-gradient(top,#ddd,#bbb);background-image:-ms-linear-gradient(top,#ddd,#bbb);background-image:-o-linear-gradient(top,#ddd,#bbb);background-image:linear-gradient(top,#ddd,#bbb)}.ui-bar-d,.ui-bar-d input,.ui-bar-d select,.ui-bar-d textarea,.ui-bar-d button{font-family:Helvetica,Arial,sans-serif}.ui-bar-d .ui-link-inherit{color:#333}.ui-bar-d .ui-link{color:#2489ce;font-weight:bold}.ui-body-d{border:1px solid #ccc;color:#333;text-shadow:0 1px 0 #fff;background:#fff}.ui-body-d,.ui-body-d input,.ui-body-d select,.ui-body-d textarea,.ui-body-d button{font-family:Helvetica,Arial,sans-serif}.ui-body-d .ui-link-inherit{color:#333}.ui-body-d .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-d{border:1px solid #ccc;background:#fff;font-weight:bold;color:#444;text-shadow:0 1px 1px #fff}.ui-btn-up-d a.ui-link-inherit{color:#333}.ui-btn-hover-d{border:1px solid #aaa;background:#eee;font-weight:bold;color:#222;cursor:pointer;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);background-image:-moz-linear-gradient(top,#fdfdfd,#eee);background-image:-ms-linear-gradient(top,#fdfdfd,#eee);background-image:-o-linear-gradient(top,#fdfdfd,#eee);background-image:linear-gradient(top,#fdfdfd,#eee)}.ui-btn-hover-d a.ui-link-inherit{color:#222}.ui-btn-down-d{border:1px solid #aaa;background:#fff;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fff));background-image:-webkit-linear-gradient(top,#eee,#fff);background-image:-moz-linear-gradient(top,#eee,#fff);background-image:-ms-linear-gradient(top,#eee,#fff);background-image:-o-linear-gradient(top,#eee,#fff);background-image:linear-gradient(top,#eee,#fff)}.ui-btn-down-d a.ui-link-inherit{color:#111}.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-e{border:1px solid #f7c942;background:#fadb4e;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fadb4e));background-image:-webkit-linear-gradient(top,#fceda7,#fadb4e);background-image:-moz-linear-gradient(top,#fceda7,#fadb4e);background-image:-ms-linear-gradient(top,#fceda7,#fadb4e);background-image:-o-linear-gradient(top,#fceda7,#fadb4e);background-image:linear-gradient(top,#fceda7,#fadb4e)}.ui-bar-e,.ui-bar-e input,.ui-bar-e select,.ui-bar-e textarea,.ui-bar-e button{font-family:Helvetica,Arial,sans-serif}.ui-bar-e .ui-link-inherit{color:#333}.ui-bar-e .ui-link{color:#2489ce;font-weight:bold}.ui-body-e{border:1px solid #f7c942;color:#333;text-shadow:0 1px 0 #fff;background:#faeb9e;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#faeb9e));background-image:-webkit-linear-gradient(top,#fff,#faeb9e);background-image:-moz-linear-gradient(top,#fff,#faeb9e);background-image:-ms-linear-gradient(top,#fff,#faeb9e);background-image:-o-linear-gradient(top,#fff,#faeb9e);background-image:linear-gradient(top,#fff,#faeb9e)}.ui-body-e,.ui-body-e input,.ui-body-e select,.ui-body-e textarea,.ui-body-e button{font-family:Helvetica,Arial,sans-serif}.ui-body-e .ui-link-inherit{color:#333}.ui-body-e .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-e{border:1px solid #f7c942;background:#fadb4e;font-weight:bold;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fadb4e));background-image:-webkit-linear-gradient(top,#fceda7,#fadb4e);background-image:-moz-linear-gradient(top,#fceda7,#fadb4e);background-image:-ms-linear-gradient(top,#fceda7,#fadb4e);background-image:-o-linear-gradient(top,#fceda7,#fadb4e);background-image:linear-gradient(top,#fceda7,#fadb4e)}.ui-btn-up-e a.ui-link-inherit{color:#333}.ui-btn-hover-e{border:1px solid #e79952;background:#fbe26f;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf0b5),to(#fbe26f));background-image:-webkit-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-moz-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-ms-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-o-linear-gradient(top,#fcf0b5,#fbe26f);background-image:linear-gradient(top,#fcf0b5,#fbe26f)}.ui-btn-hover-e a.ui-link-inherit{color:#333}.ui-btn-down-e{border:1px solid #f7c942;background:#fceda7;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fadb4e),to(#fceda7));background-image:-webkit-linear-gradient(top,#fadb4e,#fceda7);background-image:-moz-linear-gradient(top,#fadb4e,#fceda7);background-image:-ms-linear-gradient(top,#fadb4e,#fceda7);background-image:-o-linear-gradient(top,#fadb4e,#fceda7);background-image:linear-gradient(top,#fadb4e,#fceda7)}.ui-btn-down-e a.ui-link-inherit{color:#333}.ui-btn-up-e,.ui-btn-hover-e,.ui-btn-down-e{font-family:Helvetica,Arial,sans-serif;text-decoration:none}a.ui-link-inherit{text-decoration:none!important}.ui-btn-active{border:1px solid #155678;background:#4596ce;font-weight:bold;color:#fff;cursor:pointer;text-shadow:0 -1px 1px #145072;text-decoration:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#85bae4),to(#5393c5));background-image:-webkit-linear-gradient(top,#85bae4,#5393c5);background-image:-moz-linear-gradient(top,#85bae4,#5393c5);background-image:-ms-linear-gradient(top,#85bae4,#5393c5);background-image:-o-linear-gradient(top,#85bae4,#5393c5);background-image:linear-gradient(top,#85bae4,#5393c5);outline:0}.ui-btn-active a.ui-link-inherit{color:#fff}.ui-btn-inner{border-top:1px solid #fff;border-color:rgba(255,255,255,.3)}.ui-corner-tl{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em}.ui-corner-tr{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bl{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-br{-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-top{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bottom{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-right{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-left{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-all{-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.ui-disabled{opacity:.3}.ui-disabled,.ui-disabled a{cursor:default}.ui-icon{background:#666;background:rgba(0,0,0,.4);background-image:url(images/icons-18-white.png);background-repeat:no-repeat;-moz-border-radius:9px;-webkit-border-radius:9px;border-radius:9px}.ui-icon-alt{background:#fff;background:rgba(255,255,255,.3);background-image:url(images/icons-18-black.png);background-repeat:no-repeat}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min--moz-device-pixel-ratio:1.5),only screen and (min-resolution:240dpi){.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-search,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on{background-image:url(images/icons-36-white.png);-moz-background-size:776px 18px;-o-background-size:776px 18px;-webkit-background-size:776px 18px;background-size:776px 18px}.ui-icon-alt{background-image:url(images/icons-36-black.png)}}.ui-icon-plus{background-position:-0 50%}.ui-icon-minus{background-position:-36px 50%}.ui-icon-delete{background-position:-72px 50%}.ui-icon-arrow-r{background-position:-108px 50%}.ui-icon-arrow-l{background-position:-144px 50%}.ui-icon-arrow-u{background-position:-180px 50%}.ui-icon-arrow-d{background-position:-216px 50%}.ui-icon-check{background-position:-252px 50%}.ui-icon-gear{background-position:-288px 50%}.ui-icon-refresh{background-position:-324px 50%}.ui-icon-forward{background-position:-360px 50%}.ui-icon-back{background-position:-396px 50%}.ui-icon-grid{background-position:-432px 50%}.ui-icon-star{background-position:-468px 50%}.ui-icon-alert{background-position:-504px 50%}.ui-icon-info{background-position:-540px 50%}.ui-icon-home{background-position:-576px 50%}.ui-icon-search{background-position:-612px 50%}.ui-icon-checkbox-off{background-position:-684px 50%}.ui-icon-checkbox-on{background-position:-648px 50%}.ui-icon-radio-off{background-position:-756px 50%}.ui-icon-radio-on{background-position:-720px 50%}.ui-checkbox .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.ui-icon-checkbox-off,.ui-icon-radio-off{background-color:transparent}.ui-checkbox-on .ui-icon,.ui-radio-on .ui-icon{background-color:#4596ce}.ui-icon-searchfield{background-image:url(images/icon-search-black.png);background-size:16px 16px}.ui-icon-loading{background-image:url(images/ajax-loader.png);width:40px;height:40px;-moz-border-radius:20px;-webkit-border-radius:20px;border-radius:20px;background-size:35px 35px}.ui-btn-corner-tl{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em}.ui-btn-corner-tr{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bl{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-br{-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-top{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bottom{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-right{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-left{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-all{-moz-border-radius:1em;-webkit-border-radius:1em;border-radius:1em}.ui-corner-tl,.ui-corner-tr,.ui-corner-bl,.ui-corner-br,.ui-corner-top,.ui-corner-bottom,.ui-corner-right,.ui-corner-left,.ui-corner-all,.ui-btn-corner-tl,.ui-btn-corner-tr,.ui-btn-corner-bl,.ui-btn-corner-br,.ui-btn-corner-top,.ui-btn-corner-bottom,.ui-btn-corner-right,.ui-btn-corner-left,.ui-btn-corner-all{-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.ui-overlay{background:#666;opacity:.5;filter:Alpha(Opacity=50);position:absolute;width:100%;height:100%}.ui-overlay-shadow{-moz-box-shadow:0 0 12px rgba(0,0,0,.6);-webkit-box-shadow:0 0 12px rgba(0,0,0,.6);box-shadow:0 0 12px rgba(0,0,0,.6)}.ui-shadow{-moz-box-shadow:0 1px 4px rgba(0,0,0,.3);-webkit-box-shadow:0 1px 4px rgba(0,0,0,.3);box-shadow:0 1px 4px rgba(0,0,0,.3)}.ui-bar-a .ui-shadow,.ui-bar-b .ui-shadow,.ui-bar-c .ui-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.ui-shadow-inset{-moz-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);box-shadow:inset 0 1px 4px rgba(0,0,0,.2)}.ui-icon-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.4);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.4);box-shadow:0 1px 0 rgba(255,255,255,.4)}.ui-focus{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe}.ui-mobile-nosupport-boxshadow *{-moz-box-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}.ui-mobile-nosupport-boxshadow .ui-focus{outline-width:2px}.ui-mobile,.ui-mobile body{height:100%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border:0}.ui-mobile-viewport{margin:0;overflow-x:hidden;-webkit-text-size-adjust:none;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-mobile .ui-page-active{display:block;overflow:visible}.portrait,.portrait .ui-page{min-height:420px}.landscape,.landscape .ui-page{min-height:300px}.ui-loading .ui-mobile-viewport{overflow:hidden!important}.ui-loading .ui-loader{display:block}.ui-loading .ui-page{overflow:hidden}.ui-loader{display:none;position:absolute;opacity:.85;z-index:100;left:50%;width:200px;margin-left:-130px;margin-top:-35px;padding:10px 30px}.ui-loader h1{font-size:15px;text-align:center}.ui-loader .ui-icon{position:static;display:block;opacity:.9;margin:0 auto;width:35px;height:35px;background-color:transparent}.ui-mobile-rendering>*{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{display:block}.ui-page .ui-header,.ui-page .ui-footer{position:relative}.ui-header .ui-btn-left{position:absolute;left:10px;top:.4em}.ui-header .ui-btn-right{position:absolute;right:10px;top:.4em}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 90px .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-page-fullscreen .ui-content{padding:0}.ui-icon{width:18px;height:18px}.ui-fullscreen img{max-width:100%}.ui-nojs{position:absolute;left:-9999px}.spin{-webkit-transform:rotate(360deg);-webkit-animation-name:spin;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear}@-webkit-keyframes spin{from{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(360deg)}}.in,.out{-webkit-animation-timing-function:ease-in-out;-webkit-animation-duration:350ms}.slide.in{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromright}.slide.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft}.slide.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromleft}.slide.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;z-index:10}.slideup.out{-webkit-animation-name:dontmove;z-index:0}.slideup.out.reverse{-webkit-transform:translateY(100%);z-index:10;-webkit-animation-name:slideouttobottom}.slideup.in.reverse{z-index:0;-webkit-animation-name:dontmove}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;z-index:10}.slidedown.out{-webkit-animation-name:dontmove;z-index:0}.slidedown.out.reverse{-webkit-transform:translateY(-100%);z-index:10;-webkit-animation-name:slideouttotop}.slidedown.in.reverse{z-index:0;-webkit-animation-name:dontmove}@-webkit-keyframes slideinfromright{from{-webkit-transform:translateX(100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translateX(-100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(100%)}}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.in{opacity:1;z-index:10;-webkit-animation-name:fadein}.fade.out{z-index:0;-webkit-animation-name:fadeout}.viewport-flip{-webkit-perspective:1000;position:absolute}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden}.flip{-webkit-animation-duration:.65s;-webkit-backface-visibility:hidden;-webkit-transform:translateX(0)}.flip.in{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromleft}.flip.out{-webkit-transform:rotateY(-180deg) scale(.8);-webkit-animation-name:flipouttoleft}.flip.in.reverse{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromright}.flip.out.reverse{-webkit-transform:rotateY(180deg) scale(.8);-webkit-animation-name:flipouttoright}@-webkit-keyframes flipinfromright{from{-webkit-transform:rotateY(-180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipinfromleft{from{-webkit-transform:rotateY(180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(-180deg) scale(.8)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(180deg) scale(.8)}}@-webkit-keyframes dontmove{from{opacity:1}to{opacity:1}}.pop{-webkit-transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);opacity:1;-webkit-animation-name:popin;z-index:10}.pop.out.reverse{-webkit-transform:scale(.2);opacity:0;-webkit-animation-name:popout;z-index:10}.pop.in.reverse{z-index:0;-webkit-animation-name:dontmove}@-webkit-keyframes popin{from{-webkit-transform:scale(.2);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.2);opacity:0}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px}.ui-grid-solo .ui-block-a{width:100%;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:50%}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.333%}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:25%}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:20%}.ui-grid-d .ui-block-a{clear:left}.ui-header,.ui-footer,.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{position:absolute;overflow:hidden;width:100%;border-left-width:0;border-right-width:0}.ui-header-fixed,.ui-footer-fixed{z-index:1000;-webkit-transform:translateZ(0)}.ui-footer-duplicate,.ui-page-fullscreen .ui-fixed-inline{display:none}.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{opacity:.9}.ui-navbar{overflow:hidden}.ui-navbar ul,.ui-navbar-expanded ul{list-style:none;padding:0;margin:0;position:relative;display:block;border:0}.ui-navbar-collapsed ul{float:left;width:75%;margin-right:-2px}.ui-navbar-collapsed .ui-navbar-toggle{float:left;width:25%}.ui-navbar li.ui-navbar-truncate{position:absolute;left:-9999px;top:-9999px}.ui-navbar li .ui-btn,.ui-navbar .ui-navbar-toggle .ui-btn{display:block;font-size:12px;text-align:center;margin:0;border-right-width:0}.ui-navbar li .ui-btn{margin-right:-1px}.ui-navbar li .ui-btn:last-child{margin-right:0}.ui-header .ui-navbar li .ui-btn,.ui-header .ui-navbar .ui-navbar-toggle .ui-btn,.ui-footer .ui-navbar li .ui-btn,.ui-footer .ui-navbar .ui-navbar-toggle .ui-btn{border-top-width:0;border-bottom-width:0}.ui-navbar .ui-btn-inner{padding-left:2px;padding-right:2px}.ui-navbar-noicons li .ui-btn .ui-btn-inner,.ui-navbar-noicons .ui-navbar-toggle .ui-btn-inner{padding-top:.8em;padding-bottom:.9em}.ui-navbar-expanded .ui-btn{margin:0;font-size:14px}.ui-navbar-expanded .ui-btn-inner{padding-left:5px;padding-right:5px}.ui-navbar-expanded .ui-btn-icon-top .ui-btn-inner{padding:45px 5px 15px;text-align:center}.ui-navbar-expanded .ui-btn-icon-top .ui-icon{top:15px}.ui-navbar-expanded .ui-btn-icon-bottom .ui-btn-inner{padding:15px 5px 45px;text-align:center}.ui-navbar-expanded .ui-btn-icon-bottom .ui-icon{bottom:15px}.ui-navbar-expanded li .ui-btn .ui-btn-inner{min-height:2.5em}.ui-navbar-expanded .ui-navbar-noicons .ui-btn .ui-btn-inner{padding-top:1.8em;padding-bottom:1.9em}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 5px;padding:0}.ui-btn:focus,.ui-btn:active{outline:0}.ui-header .ui-btn,.ui-footer .ui-btn,.ui-bar .ui-btn{display:inline-block;font-size:13px;margin:0}.ui-btn-inline{display:inline-block}.ui-btn-inner{padding:.6em 25px;display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;position:relative;zoom:1}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-bar .ui-btn-inner{padding:.4em 8px .5em}.ui-btn-icon-notext{display:inline-block;width:20px;height:20px;padding:2px 1px 2px 3px;text-indent:-9999px}.ui-btn-icon-notext .ui-btn-inner{padding:0}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-999px}.ui-btn-icon-left .ui-btn-inner{padding-left:33px}.ui-header .ui-btn-icon-left .ui-btn-inner,.ui-footer .ui-btn-icon-left .ui-btn-inner,.ui-bar .ui-btn-icon-left .ui-btn-inner{padding-left:27px}.ui-btn-icon-right .ui-btn-inner{padding-right:33px}.ui-header .ui-btn-icon-right .ui-btn-inner,.ui-footer .ui-btn-icon-right .ui-btn-inner,.ui-bar .ui-btn-icon-right .ui-btn-inner{padding-right:27px}.ui-btn-icon-top .ui-btn-inner{padding-top:33px}.ui-header .ui-btn-icon-top .ui-btn-inner,.ui-footer .ui-btn-icon-top .ui-btn-inner,.ui-bar .ui-btn-icon-top .ui-btn-inner{padding-top:27px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:33px}.ui-header .ui-btn-icon-bottom .ui-btn-inner,.ui-footer .ui-btn-icon-bottom .ui-btn-inner,.ui-bar .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:27px}.ui-btn-icon-notext .ui-icon{display:block}.ui-btn-icon-left .ui-icon,.ui-btn-icon-right .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-icon,.ui-btn-icon-bottom .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-header .ui-btn-icon-left .ui-icon,.ui-footer .ui-btn-icon-left .ui-icon,.ui-bar .ui-btn-icon-left .ui-icon{left:4px}.ui-header .ui-btn-icon-right .ui-icon,.ui-footer .ui-btn-icon-right .ui-icon,.ui-bar .ui-btn-icon-right .ui-icon{right:4px}.ui-header .ui-btn-icon-top .ui-icon,.ui-footer .ui-btn-icon-top .ui-icon,.ui-bar .ui-btn-icon-top .ui-icon{top:4px}.ui-header .ui-btn-icon-bottom .ui-icon,.ui-footer .ui-btn-icon-bottom .ui-icon,.ui-bar .ui-btn-icon-bottom .ui-icon{bottom:4px}.ui-btn-icon-top .ui-icon{top:5px}.ui-btn-icon-bottom .ui-icon{bottom:5px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:button;opacity:0;cursor:pointer;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);background:transparent}.ui-collapsible-contain{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -8px;padding:0;border-width:0 0 1px 0;position:relative}.ui-collapsible-heading a{text-align:left;margin:0}.ui-collapsible-heading a .ui-btn-inner{padding-left:40px}.ui-collapsible-heading a span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading a span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading a span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:absolute;left:-9999px}.ui-collapsible-content{display:block;padding:10px 0 10px 8px}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible-contain{margin:-1px 0 0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0 1em}.ui-bar .ui-controlgroup{margin:0 .3em}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em}.ui-controlgroup-controls{display:block;width:95%}.ui-controlgroup li{list-style:none}.ui-controlgroup-vertical .ui-btn,.ui-controlgroup-vertical .ui-checkbox,.ui-controlgroup-vertical .ui-radio{margin:0;border-bottom-width:0}.ui-controlgroup-vertical .ui-controlgroup-last{border-bottom-width:1px}.ui-controlgroup-horizontal{padding:0}.ui-controlgroup-horizontal .ui-btn,.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{display:inline-block;margin:0 -5px 0 0}.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{display:inline}.ui-controlgroup-horizontal .ui-checkbox .ui-btn,.ui-controlgroup-horizontal .ui-radio .ui-btn,.ui-controlgroup-horizontal .ui-checkbox:last-child,.ui-controlgroup-horizontal .ui-radio:last-child{margin-right:0}.ui-controlgroup-horizontal .ui-controlgroup-last{margin-right:0}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}@media all and (min-width:450px){.ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-controlgroup-controls{width:60%;display:inline-block}}.ui-dialog{min-height:480px}.ui-dialog .ui-header,.ui-dialog .ui-content,.ui-dialog .ui-footer{margin:15px;position:relative}.ui-dialog .ui-header,.ui-dialog .ui-footer{z-index:10;width:auto}.ui-dialog .ui-content,.ui-dialog .ui-footer{margin-top:-15px}.ui-checkbox,.ui-radio{position:relative;margin:.2em 0 .5em;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{margin:0;text-align:left;z-index:2}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain{padding:1.5em 0;margin:0;border-bottom-width:1px;overflow:visible}.ui-field-contain:first-child{border-top-width:0}@media all and (min-width:450px){.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{overflow:hidden}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:button;left:0;top:0;width:100%;height:100%;opacity:0;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0)}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:.0001}}.ui-select .ui-btn select.ui-select-nativeonly{opacity:1;text-indent:0}.ui-select .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}label.ui-select{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:block;min-height:1em}.ui-select .ui-btn-text{text-overflow:ellipsis;overflow:hidden}.ui-selectmenu{position:absolute;padding:0;z-index:100!important;width:80%;max-width:350px;padding:6px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-selectmenu-hidden{top:-9999px;left:-9999px}.ui-selectmenu-screen{position:absolute;top:0;left:0;width:100%;height:100%;z-index:99}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header .ui-title{margin:.6em 46px .8em}@media all and (min-width:450px){label.ui-select{display:inline-block;width:20%;margin:0 2% 0 0}.ui-select{width:60%;display:inline-block}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em;line-height:1.4;font-size:16px;display:block;width:95%}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}.ui-input-search{padding:0 30px;width:77%;background-position:8px 50%;background-repeat:no-repeat;position:relative}.ui-input-search input.ui-input-text{border:0;width:98%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-14px}.ui-input-search .ui-input-clear-hidden{display:none}@media all and (min-width:450px){label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}input.ui-input-text,textarea.ui-input-text,.ui-input-search{width:60%;display:inline-block}.ui-input-search{width:50%}.ui-input-search input.ui-input-text{width:98%}}.ui-listview{margin:0;counter-reset:listnumbering}.ui-content .ui-listview{margin:-15px}.ui-content .ui-listview-inset{margin:1em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-divider,.ui-li-static{padding:.5em 15px;font-size:14px;font-weight:bold}.ui-li-divider{counter-reset:listnumbering}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:normal;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li:last-child,.ui-li.ui-field-contain:last-child{border-bottom-width:1px}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 75px .7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:60px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-heading{font-size:16px;font-weight:bold;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:normal;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-thumb,.ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-li-icon{max-height:40px;max-width:40px;left:10px;top:.9em}.ui-li-thumb,.ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:95px}.ui-li-count{position:absolute;font-size:11px;font-weight:bold;padding:.2em .5em;top:50%;margin-top:-.9em;right:38px}.ui-li-divider .ui-li-count,.ui-li-static .ui-li-count{right:10px}.ui-li-has-alt .ui-li-count{right:55px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-11px 0 0 0;border-bottom-width:1px}.ui-li-link-alt .ui-btn-inner{padding:0;position:static}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-listview-filter-inset{margin:-15px -5px -15px -5px;background:transparent}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{display:block}input.ui-slider-input{display:inline-block;width:50px}select.ui-slider-switch{display:none}div.ui-slider{position:relative;display:inline-block;overflow:visible;height:15px;padding:0;margin:0 2% 0 20px;top:4px;width:66%}a.ui-slider-handle{position:absolute;z-index:10;top:50%;width:28px;height:28px;margin-top:-15px;margin-left:-15px}a.ui-slider-handle .ui-btn-inner{padding-left:0;padding-right:0}@media all and (min-width:480px){label.ui-slider{display:inline-block;width:20%;margin:0 2% 0 0}div.ui-slider{width:45%}}div.ui-slider-switch{height:32px;overflow:hidden;margin-left:0}div.ui-slider-inneroffset{margin-left:50%;position:absolute;top:1px;height:100%;width:50%}div.ui-slider-handle-snapping{-webkit-transition:left 100ms linear}div.ui-slider-labelbg{position:absolute;top:0;margin:0;border-width:0}div.ui-slider-switch div.ui-slider-labelbg-a{width:60%;height:100%;left:0}div.ui-slider-switch div.ui-slider-labelbg-b{width:60%;height:100%;right:0}.ui-slider-switch-a div.ui-slider-labelbg-a,.ui-slider-switch-b div.ui-slider-labelbg-b{z-index:-1}.ui-slider-switch-a div.ui-slider-labelbg-b,.ui-slider-switch-b div.ui-slider-labelbg-a{z-index:0}div.ui-slider-switch a.ui-slider-handle{z-index:20;width:101%;height:32px;margin-top:-18px;margin-left:-101%}span.ui-slider-label{width:100%;position:absolute;height:32px;font-size:16px;text-align:center;line-height:2;background:0;border-color:transparent}span.ui-slider-label-a{left:-100%;margin-right:-1px}span.ui-slider-label-b{right:-100%;margin-left:-1px} \ No newline at end of file + */.ui-bar-a{border:1px solid #2a2a2a;background:#111;color:#fff;font-weight:bold;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#111));background-image:-webkit-linear-gradient(top,#3c3c3c,#111);background-image:-moz-linear-gradient(top,#3c3c3c,#111);background-image:-ms-linear-gradient(top,#3c3c3c,#111);background-image:-o-linear-gradient(top,#3c3c3c,#111);background-image:linear-gradient(top,#3c3c3c,#111)}.ui-bar-a,.ui-bar-a input,.ui-bar-a select,.ui-bar-a textarea,.ui-bar-a button{font-family:Helvetica,Arial,sans-serif}.ui-bar-a .ui-link-inherit{color:#fff}.ui-bar-a .ui-link{color:#7cc4e7;font-weight:bold}.ui-body-a{border:1px solid #2a2a2a;background:#222;color:#fff;text-shadow:0 1px 0 #000;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#222));background-image:-webkit-linear-gradient(top,#666,#222);background-image:-moz-linear-gradient(top,#666,#222);background-image:-ms-linear-gradient(top,#666,#222);background-image:-o-linear-gradient(top,#666,#222);background-image:linear-gradient(top,#666,#222)}.ui-body-a,.ui-body-a input,.ui-body-a select,.ui-body-a textarea,.ui-body-a button{font-family:Helvetica,Arial,sans-serif}.ui-body-a .ui-link-inherit{color:#fff}.ui-body-a .ui-link{color:#2489ce;font-weight:bold}.ui-br{border-bottom:#828282;border-bottom:rgba(130,130,130,.3);border-bottom-width:1px;border-bottom-style:solid}.ui-btn-up-a{border:1px solid #222;background:#333;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#555),to(#333));background-image:-webkit-linear-gradient(top,#555,#333);background-image:-moz-linear-gradient(top,#555,#333);background-image:-ms-linear-gradient(top,#555,#333);background-image:-o-linear-gradient(top,#555,#333);background-image:linear-gradient(top,#555,#333)}.ui-btn-up-a a.ui-link-inherit{color:#fff}.ui-btn-hover-a{border:1px solid #000;background:#444;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#666),to(#444));background-image:-webkit-linear-gradient(top,#666,#444);background-image:-moz-linear-gradient(top,#666,#444);background-image:-ms-linear-gradient(top,#666,#444);background-image:-o-linear-gradient(top,#666,#444);background-image:linear-gradient(top,#666,#444)}.ui-btn-hover-a a.ui-link-inherit{color:#fff}.ui-btn-down-a{border:1px solid #000;background:#3d3d3d;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #000;background-image:-webkit-gradient(linear,left top,left bottom,from(#333),to(#5a5a5a));background-image:-webkit-linear-gradient(top,#333,#5a5a5a);background-image:-moz-linear-gradient(top,#333,#5a5a5a);background-image:-ms-linear-gradient(top,#333,#5a5a5a);background-image:-o-linear-gradient(top,#333,#5a5a5a);background-image:linear-gradient(top,#333,#5a5a5a)}.ui-btn-down-a a.ui-link-inherit{color:#fff}.ui-btn-up-a,.ui-btn-hover-a,.ui-btn-down-a{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-b{border:1px solid #456f9a;background:#5e87b0;color:#fff;font-weight:bold;text-shadow:0 -1px 1px #254f7a;background-image:-webkit-gradient(linear,left top,left bottom,from(#81a8ce),to(#5e87b0));background-image:-webkit-linear-gradient(top,#81a8ce,#5e87b0);background-image:-moz-linear-gradient(top,#81a8ce,#5e87b0);background-image:-ms-linear-gradient(top,#81a8ce,#5e87b0);background-image:-o-linear-gradient(top,#81a8ce,#5e87b0);background-image:linear-gradient(top,#81a8ce,#5e87b0)}.ui-bar-b,.ui-bar-b input,.ui-bar-b select,.ui-bar-b textarea,.ui-bar-b button{font-family:Helvetica,Arial,sans-serif}.ui-bar-b .ui-link-inherit{color:#fff}.ui-bar-b .ui-link{color:#7cc4e7;font-weight:bold}.ui-body-b{border:1px solid #c6c6c6;background:#ccc;color:#333;text-shadow:0 1px 0 #fff;font-weight:normal;background-image:-webkit-gradient(linear,left top,left bottom,from(#e6e6e6),to(#ccc));background-image:-webkit-linear-gradient(top,#e6e6e6,#ccc);background-image:-moz-linear-gradient(top,#e6e6e6,#ccc);background-image:-ms-linear-gradient(top,#e6e6e6,#ccc);background-image:-o-linear-gradient(top,#e6e6e6,#ccc);background-image:linear-gradient(top,#e6e6e6,#ccc)}.ui-body-b,.ui-body-b input,.ui-body-b select,.ui-body-b textarea,.ui-body-b button{font-family:Helvetica,Arial,sans-serif}.ui-body-b .ui-link-inherit{color:#333}.ui-body-b .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-b{border:1px solid #145072;background:#2567ab;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #145072;background-image:-webkit-gradient(linear,left top,left bottom,from(#5f9cc5),to(#396b9e));background-image:-webkit-linear-gradient(top,#5f9cc5,#396b9e);background-image:-moz-linear-gradient(top,#5f9cc5,#396b9e);background-image:-ms-linear-gradient(top,#5f9cc5,#396b9e);background-image:-o-linear-gradient(top,#5f9cc5,#396b9e);background-image:linear-gradient(top,#5f9cc5,#396b9e)}.ui-btn-up-b a.ui-link-inherit{color:#fff}.ui-btn-hover-b{border:1px solid #00516e;background:#4b88b6;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #014d68;background-image:-webkit-gradient(linear,left top,left bottom,from(#72b0d4),to(#4b88b6));background-image:-webkit-linear-gradient(top,#72b0d4,#4b88b6);background-image:-moz-linear-gradient(top,#72b0d4,#4b88b6);background-image:-ms-linear-gradient(top,#72b0d4,#4b88b6);background-image:-o-linear-gradient(top,#72b0d4,#4b88b6);background-image:linear-gradient(top,#72b0d4,#4b88b6)}.ui-btn-hover-b a.ui-link-inherit{color:#fff}.ui-btn-down-b{border:1px solid #225377;background:#4e89c5;font-weight:bold;color:#fff;text-shadow:0 -1px 1px #225377;background-image:-webkit-gradient(linear,left top,left bottom,from(#396b9e),to(#4e89c5));background-image:-webkit-linear-gradient(top,#396b9e,#4e89c5);background-image:-moz-linear-gradient(top,#396b9e,#4e89c5);background-image:-ms-linear-gradient(top,#396b9e,#4e89c5);background-image:-o-linear-gradient(top,#396b9e,#4e89c5);background-image:linear-gradient(top,#396b9e,#4e89c5)}.ui-btn-down-b a.ui-link-inherit{color:#fff}.ui-btn-up-b,.ui-btn-hover-b,.ui-btn-down-b{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-c{border:1px solid #b3b3b3;background:#e9eaeb;color:#3e3e3e;font-weight:bold;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#f0f0f0),to(#e9eaeb));background-image:-webkit-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-moz-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-ms-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:-o-linear-gradient(top,#f0f0f0,#e9eaeb);background-image:linear-gradient(top,#f0f0f0,#e9eaeb)}.ui-bar-c,.ui-bar-c input,.ui-bar-c select,.ui-bar-c textarea,.ui-bar-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c{border:1px solid #b3b3b3;color:#333;text-shadow:0 1px 0 #fff;background:#f0f0f0;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#ddd));background-image:-webkit-linear-gradient(top,#eee,#ddd);background-image:-moz-linear-gradient(top,#eee,#ddd);background-image:-ms-linear-gradient(top,#eee,#ddd);background-image:-o-linear-gradient(top,#eee,#ddd);background-image:linear-gradient(top,#eee,#ddd)}.ui-body-c,.ui-body-c input,.ui-body-c select,.ui-body-c textarea,.ui-body-c button{font-family:Helvetica,Arial,sans-serif}.ui-body-c .ui-link-inherit{color:#333}.ui-body-c .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-c{border:1px solid #ccc;background:#eee;font-weight:bold;color:#444;text-shadow:0 1px 1px #f6f6f6;background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);background-image:-moz-linear-gradient(top,#fdfdfd,#eee);background-image:-ms-linear-gradient(top,#fdfdfd,#eee);background-image:-o-linear-gradient(top,#fdfdfd,#eee);background-image:linear-gradient(top,#fdfdfd,#eee)}.ui-btn-up-c a.ui-link-inherit{color:#2f3e46}.ui-btn-hover-c{border:1px solid #bbb;background:#dadada;font-weight:bold;color:#101010;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#ededed),to(#dadada));background-image:-webkit-linear-gradient(top,#ededed,#dadada);background-image:-moz-linear-gradient(top,#ededed,#dadada);background-image:-ms-linear-gradient(top,#ededed,#dadada);background-image:-o-linear-gradient(top,#ededed,#dadada);background-image:linear-gradient(top,#ededed,#dadada)}.ui-btn-hover-c a.ui-link-inherit{color:#2f3e46}.ui-btn-down-c{border:1px solid #808080;background:#fdfdfd;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fdfdfd));background-image:-webkit-linear-gradient(top,#eee,#fdfdfd);background-image:-moz-linear-gradient(top,#eee,#fdfdfd);background-image:-ms-linear-gradient(top,#eee,#fdfdfd);background-image:-o-linear-gradient(top,#eee,#fdfdfd);background-image:linear-gradient(top,#eee,#fdfdfd)}.ui-btn-down-c a.ui-link-inherit{color:#2f3e46}.ui-btn-up-c,.ui-btn-hover-c,.ui-btn-down-c{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-d{border:1px solid #ccc;background:#bbb;color:#333;text-shadow:0 1px 0 #eee;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddd),to(#bbb));background-image:-webkit-linear-gradient(top,#ddd,#bbb);background-image:-moz-linear-gradient(top,#ddd,#bbb);background-image:-ms-linear-gradient(top,#ddd,#bbb);background-image:-o-linear-gradient(top,#ddd,#bbb);background-image:linear-gradient(top,#ddd,#bbb)}.ui-bar-d,.ui-bar-d input,.ui-bar-d select,.ui-bar-d textarea,.ui-bar-d button{font-family:Helvetica,Arial,sans-serif}.ui-bar-d .ui-link-inherit{color:#333}.ui-bar-d .ui-link{color:#2489ce;font-weight:bold}.ui-body-d{border:1px solid #ccc;color:#333;text-shadow:0 1px 0 #fff;background:#fff}.ui-body-d,.ui-body-d input,.ui-body-d select,.ui-body-d textarea,.ui-body-d button{font-family:Helvetica,Arial,sans-serif}.ui-body-d .ui-link-inherit{color:#333}.ui-body-d .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-d{border:1px solid #ccc;background:#fff;font-weight:bold;color:#444;text-shadow:0 1px 1px #fff}.ui-btn-up-d a.ui-link-inherit{color:#333}.ui-btn-hover-d{border:1px solid #aaa;background:#eee;font-weight:bold;color:#222;cursor:pointer;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fdfdfd),to(#eee));background-image:-webkit-linear-gradient(top,#fdfdfd,#eee);background-image:-moz-linear-gradient(top,#fdfdfd,#eee);background-image:-ms-linear-gradient(top,#fdfdfd,#eee);background-image:-o-linear-gradient(top,#fdfdfd,#eee);background-image:linear-gradient(top,#fdfdfd,#eee)}.ui-btn-hover-d a.ui-link-inherit{color:#222}.ui-btn-down-d{border:1px solid #aaa;background:#fff;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#eee),to(#fff));background-image:-webkit-linear-gradient(top,#eee,#fff);background-image:-moz-linear-gradient(top,#eee,#fff);background-image:-ms-linear-gradient(top,#eee,#fff);background-image:-o-linear-gradient(top,#eee,#fff);background-image:linear-gradient(top,#eee,#fff)}.ui-btn-down-d a.ui-link-inherit{color:#111}.ui-btn-up-d,.ui-btn-hover-d,.ui-btn-down-d{font-family:Helvetica,Arial,sans-serif;text-decoration:none}.ui-bar-e{border:1px solid #f7c942;background:#fadb4e;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fadb4e));background-image:-webkit-linear-gradient(top,#fceda7,#fadb4e);background-image:-moz-linear-gradient(top,#fceda7,#fadb4e);background-image:-ms-linear-gradient(top,#fceda7,#fadb4e);background-image:-o-linear-gradient(top,#fceda7,#fadb4e);background-image:linear-gradient(top,#fceda7,#fadb4e)}.ui-bar-e,.ui-bar-e input,.ui-bar-e select,.ui-bar-e textarea,.ui-bar-e button{font-family:Helvetica,Arial,sans-serif}.ui-bar-e .ui-link-inherit{color:#333}.ui-bar-e .ui-link{color:#2489ce;font-weight:bold}.ui-body-e{border:1px solid #f7c942;color:#333;text-shadow:0 1px 0 #fff;background:#faeb9e;background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#faeb9e));background-image:-webkit-linear-gradient(top,#fff,#faeb9e);background-image:-moz-linear-gradient(top,#fff,#faeb9e);background-image:-ms-linear-gradient(top,#fff,#faeb9e);background-image:-o-linear-gradient(top,#fff,#faeb9e);background-image:linear-gradient(top,#fff,#faeb9e)}.ui-body-e,.ui-body-e input,.ui-body-e select,.ui-body-e textarea,.ui-body-e button{font-family:Helvetica,Arial,sans-serif}.ui-body-e .ui-link-inherit{color:#333}.ui-body-e .ui-link{color:#2489ce;font-weight:bold}.ui-btn-up-e{border:1px solid #f7c942;background:#fadb4e;font-weight:bold;color:#333;text-shadow:0 1px 0 #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fceda7),to(#fadb4e));background-image:-webkit-linear-gradient(top,#fceda7,#fadb4e);background-image:-moz-linear-gradient(top,#fceda7,#fadb4e);background-image:-ms-linear-gradient(top,#fceda7,#fadb4e);background-image:-o-linear-gradient(top,#fceda7,#fadb4e);background-image:linear-gradient(top,#fceda7,#fadb4e)}.ui-btn-up-e a.ui-link-inherit{color:#333}.ui-btn-hover-e{border:1px solid #e79952;background:#fbe26f;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf0b5),to(#fbe26f));background-image:-webkit-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-moz-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-ms-linear-gradient(top,#fcf0b5,#fbe26f);background-image:-o-linear-gradient(top,#fcf0b5,#fbe26f);background-image:linear-gradient(top,#fcf0b5,#fbe26f)}.ui-btn-hover-e a.ui-link-inherit{color:#333}.ui-btn-down-e{border:1px solid #f7c942;background:#fceda7;font-weight:bold;color:#111;text-shadow:0 1px 1px #fff;background-image:-webkit-gradient(linear,left top,left bottom,from(#fadb4e),to(#fceda7));background-image:-webkit-linear-gradient(top,#fadb4e,#fceda7);background-image:-moz-linear-gradient(top,#fadb4e,#fceda7);background-image:-ms-linear-gradient(top,#fadb4e,#fceda7);background-image:-o-linear-gradient(top,#fadb4e,#fceda7);background-image:linear-gradient(top,#fadb4e,#fceda7)}.ui-btn-down-e a.ui-link-inherit{color:#333}.ui-btn-up-e,.ui-btn-hover-e,.ui-btn-down-e{font-family:Helvetica,Arial,sans-serif;text-decoration:none}a.ui-link-inherit{text-decoration:none!important}.ui-btn-active{border:1px solid #155678;background:#4596ce;font-weight:bold;color:#fff;cursor:pointer;text-shadow:0 -1px 1px #145072;text-decoration:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#85bae4),to(#5393c5));background-image:-webkit-linear-gradient(top,#85bae4,#5393c5);background-image:-moz-linear-gradient(top,#85bae4,#5393c5);background-image:-ms-linear-gradient(top,#85bae4,#5393c5);background-image:-o-linear-gradient(top,#85bae4,#5393c5);background-image:linear-gradient(top,#85bae4,#5393c5);outline:0}.ui-btn-active a.ui-link-inherit{color:#fff}.ui-btn-inner{border-top:1px solid #fff;border-color:rgba(255,255,255,.3)}.ui-corner-tl{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em}.ui-corner-tr{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bl{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-br{-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-top{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em}.ui-corner-bottom{-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-right{-moz-border-radius-topright:.6em;-webkit-border-top-right-radius:.6em;border-top-right-radius:.6em;-moz-border-radius-bottomright:.6em;-webkit-border-bottom-right-radius:.6em;border-bottom-right-radius:.6em}.ui-corner-left{-moz-border-radius-topleft:.6em;-webkit-border-top-left-radius:.6em;border-top-left-radius:.6em;-moz-border-radius-bottomleft:.6em;-webkit-border-bottom-left-radius:.6em;border-bottom-left-radius:.6em}.ui-corner-all{-moz-border-radius:.6em;-webkit-border-radius:.6em;border-radius:.6em}.ui-disabled{opacity:.3}.ui-disabled,.ui-disabled a{cursor:default}.ui-icon{background:#666;background:rgba(0,0,0,.4);background-image:url(images/icons-18-white.png);background-repeat:no-repeat;-moz-border-radius:9px;-webkit-border-radius:9px;border-radius:9px}.ui-icon-alt{background:#fff;background:rgba(255,255,255,.3);background-image:url(images/icons-18-black.png);background-repeat:no-repeat}@media only screen and (-webkit-min-device-pixel-ratio:1.5),only screen and (min--moz-device-pixel-ratio:1.5),only screen and (min-resolution:240dpi){.ui-icon-plus,.ui-icon-minus,.ui-icon-delete,.ui-icon-arrow-r,.ui-icon-arrow-l,.ui-icon-arrow-u,.ui-icon-arrow-d,.ui-icon-check,.ui-icon-gear,.ui-icon-refresh,.ui-icon-forward,.ui-icon-back,.ui-icon-grid,.ui-icon-star,.ui-icon-alert,.ui-icon-info,.ui-icon-home,.ui-icon-search,.ui-icon-checkbox-off,.ui-icon-checkbox-on,.ui-icon-radio-off,.ui-icon-radio-on{background-image:url(images/icons-36-white.png);-moz-background-size:776px 18px;-o-background-size:776px 18px;-webkit-background-size:776px 18px;background-size:776px 18px}.ui-icon-alt{background-image:url(images/icons-36-black.png)}}.ui-icon-plus{background-position:-0 50%}.ui-icon-minus{background-position:-36px 50%}.ui-icon-delete{background-position:-72px 50%}.ui-icon-arrow-r{background-position:-108px 50%}.ui-icon-arrow-l{background-position:-144px 50%}.ui-icon-arrow-u{background-position:-180px 50%}.ui-icon-arrow-d{background-position:-216px 50%}.ui-icon-check{background-position:-252px 50%}.ui-icon-gear{background-position:-288px 50%}.ui-icon-refresh{background-position:-324px 50%}.ui-icon-forward{background-position:-360px 50%}.ui-icon-back{background-position:-396px 50%}.ui-icon-grid{background-position:-432px 50%}.ui-icon-star{background-position:-468px 50%}.ui-icon-alert{background-position:-504px 50%}.ui-icon-info{background-position:-540px 50%}.ui-icon-home{background-position:-576px 50%}.ui-icon-search{background-position:-612px 50%}.ui-icon-checkbox-off{background-position:-684px 50%}.ui-icon-checkbox-on{background-position:-648px 50%}.ui-icon-radio-off{background-position:-756px 50%}.ui-icon-radio-on{background-position:-720px 50%}.ui-checkbox .ui-icon{-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}.ui-icon-checkbox-off,.ui-icon-radio-off{background-color:transparent}.ui-checkbox-on .ui-icon,.ui-radio-on .ui-icon{background-color:#4596ce}.ui-icon-searchfield{background-image:url(images/icon-search-black.png);background-size:16px 16px}.ui-icon-loading{background-image:url(assets/ajax-loader.png);width:40px;height:40px;-moz-border-radius:20px;-webkit-border-radius:20px;border-radius:20px;background-size:35px 35px}.ui-btn-corner-tl{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em}.ui-btn-corner-tr{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bl{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-br{-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-top{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em}.ui-btn-corner-bottom{-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-right{-moz-border-radius-topright:1em;-webkit-border-top-right-radius:1em;border-top-right-radius:1em;-moz-border-radius-bottomright:1em;-webkit-border-bottom-right-radius:1em;border-bottom-right-radius:1em}.ui-btn-corner-left{-moz-border-radius-topleft:1em;-webkit-border-top-left-radius:1em;border-top-left-radius:1em;-moz-border-radius-bottomleft:1em;-webkit-border-bottom-left-radius:1em;border-bottom-left-radius:1em}.ui-btn-corner-all{-moz-border-radius:1em;-webkit-border-radius:1em;border-radius:1em}.ui-corner-tl,.ui-corner-tr,.ui-corner-bl,.ui-corner-br,.ui-corner-top,.ui-corner-bottom,.ui-corner-right,.ui-corner-left,.ui-corner-all,.ui-btn-corner-tl,.ui-btn-corner-tr,.ui-btn-corner-bl,.ui-btn-corner-br,.ui-btn-corner-top,.ui-btn-corner-bottom,.ui-btn-corner-right,.ui-btn-corner-left,.ui-btn-corner-all{-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.ui-overlay{background:#666;opacity:.5;filter:Alpha(Opacity=50);position:absolute;width:100%;height:100%}.ui-overlay-shadow{-moz-box-shadow:0 0 12px rgba(0,0,0,.6);-webkit-box-shadow:0 0 12px rgba(0,0,0,.6);box-shadow:0 0 12px rgba(0,0,0,.6)}.ui-shadow{-moz-box-shadow:0 1px 4px rgba(0,0,0,.3);-webkit-box-shadow:0 1px 4px rgba(0,0,0,.3);box-shadow:0 1px 4px rgba(0,0,0,.3)}.ui-bar-a .ui-shadow,.ui-bar-b .ui-shadow,.ui-bar-c .ui-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.3);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.3);box-shadow:0 1px 0 rgba(255,255,255,.3)}.ui-shadow-inset{-moz-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 4px rgba(0,0,0,.2);box-shadow:inset 0 1px 4px rgba(0,0,0,.2)}.ui-icon-shadow{-moz-box-shadow:0 1px 0 rgba(255,255,255,.4);-webkit-box-shadow:0 1px 0 rgba(255,255,255,.4);box-shadow:0 1px 0 rgba(255,255,255,.4)}.ui-focus{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe}.ui-mobile-nosupport-boxshadow *{-moz-box-shadow:none!important;-webkit-box-shadow:none!important;box-shadow:none!important}.ui-mobile-nosupport-boxshadow .ui-focus{outline-width:2px}.ui-mobile,.ui-mobile body{height:100%}.ui-mobile fieldset,.ui-page{padding:0;margin:0}.ui-mobile a img,.ui-mobile fieldset{border:0}.ui-mobile-viewport{margin:0;overflow-x:hidden;-webkit-text-size-adjust:none;-ms-text-size-adjust:none;-webkit-tap-highlight-color:rgba(0,0,0,0)}.ui-mobile [data-role=page],.ui-mobile [data-role=dialog],.ui-page{top:0;left:0;width:100%;min-height:100%;position:absolute;display:none;border:0}.ui-mobile .ui-page-active{display:block;overflow:visible}.portrait,.portrait .ui-page{min-height:420px}.landscape,.landscape .ui-page{min-height:300px}.ui-loading .ui-mobile-viewport{overflow:hidden!important}.ui-loading .ui-loader{display:block}.ui-loading .ui-page{overflow:hidden}.ui-loader{display:none;position:absolute;opacity:.85;z-index:100;left:50%;width:200px;margin-left:-130px;margin-top:-35px;padding:10px 30px}.ui-loader h1{font-size:15px;text-align:center}.ui-loader .ui-icon{position:static;display:block;opacity:.9;margin:0 auto;width:35px;height:35px;background-color:transparent}.ui-mobile-rendering>*{visibility:hidden}.ui-bar,.ui-body{position:relative;padding:.4em 15px;overflow:hidden;display:block;clear:both}.ui-bar{font-size:16px;margin:0}.ui-bar h1,.ui-bar h2,.ui-bar h3,.ui-bar h4,.ui-bar h5,.ui-bar h6{margin:0;padding:0;font-size:16px;display:inline-block}.ui-header,.ui-footer{display:block}.ui-page .ui-header,.ui-page .ui-footer{position:relative}.ui-header .ui-btn-left{position:absolute;left:10px;top:.4em}.ui-header .ui-btn-right{position:absolute;right:10px;top:.4em}.ui-header .ui-title,.ui-footer .ui-title{min-height:1.1em;text-align:center;font-size:16px;display:block;margin:.6em 90px .8em;padding:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;outline:0!important}.ui-content{border-width:0;overflow:visible;overflow-x:hidden;padding:15px}.ui-page-fullscreen .ui-content{padding:0}.ui-icon{width:18px;height:18px}.ui-fullscreen img{max-width:100%}.ui-nojs{position:absolute;left:-9999px}.spin{-webkit-transform:rotate(360deg);-webkit-animation-name:spin;-webkit-animation-duration:1s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear}@-webkit-keyframes spin{from{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(360deg)}}.in,.out{-webkit-animation-timing-function:ease-in-out;-webkit-animation-duration:350ms}.slide.in{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromright}.slide.out{-webkit-transform:translateX(-100%);-webkit-animation-name:slideouttoleft}.slide.in.reverse{-webkit-transform:translateX(0);-webkit-animation-name:slideinfromleft}.slide.out.reverse{-webkit-transform:translateX(100%);-webkit-animation-name:slideouttoright}.slideup.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfrombottom;z-index:10}.slideup.out{-webkit-animation-name:dontmove;z-index:0}.slideup.out.reverse{-webkit-transform:translateY(100%);z-index:10;-webkit-animation-name:slideouttobottom}.slideup.in.reverse{z-index:0;-webkit-animation-name:dontmove}.slidedown.in{-webkit-transform:translateY(0);-webkit-animation-name:slideinfromtop;z-index:10}.slidedown.out{-webkit-animation-name:dontmove;z-index:0}.slidedown.out.reverse{-webkit-transform:translateY(-100%);z-index:10;-webkit-animation-name:slideouttotop}.slidedown.in.reverse{z-index:0;-webkit-animation-name:dontmove}@-webkit-keyframes slideinfromright{from{-webkit-transform:translateX(100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideinfromleft{from{-webkit-transform:translateX(-100%)}to{-webkit-transform:translateX(0)}}@-webkit-keyframes slideouttoleft{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(-100%)}}@-webkit-keyframes slideouttoright{from{-webkit-transform:translateX(0)}to{-webkit-transform:translateX(100%)}}@-webkit-keyframes slideinfromtop{from{-webkit-transform:translateY(-100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideinfrombottom{from{-webkit-transform:translateY(100%)}to{-webkit-transform:translateY(0)}}@-webkit-keyframes slideouttobottom{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(100%)}}@-webkit-keyframes slideouttotop{from{-webkit-transform:translateY(0)}to{-webkit-transform:translateY(-100%)}}@-webkit-keyframes fadein{from{opacity:0}to{opacity:1}}@-webkit-keyframes fadeout{from{opacity:1}to{opacity:0}}.fade.in{opacity:1;z-index:10;-webkit-animation-name:fadein}.fade.out{z-index:0;-webkit-animation-name:fadeout}.viewport-flip{-webkit-perspective:1000;position:absolute}.ui-mobile-viewport-transitioning,.ui-mobile-viewport-transitioning .ui-page{width:100%;height:100%;overflow:hidden}.flip{-webkit-animation-duration:.65s;-webkit-backface-visibility:hidden;-webkit-transform:translateX(0)}.flip.in{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromleft}.flip.out{-webkit-transform:rotateY(-180deg) scale(.8);-webkit-animation-name:flipouttoleft}.flip.in.reverse{-webkit-transform:rotateY(0) scale(1);-webkit-animation-name:flipinfromright}.flip.out.reverse{-webkit-transform:rotateY(180deg) scale(.8);-webkit-animation-name:flipouttoright}@-webkit-keyframes flipinfromright{from{-webkit-transform:rotateY(-180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipinfromleft{from{-webkit-transform:rotateY(180deg) scale(.8)}to{-webkit-transform:rotateY(0) scale(1)}}@-webkit-keyframes flipouttoleft{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(-180deg) scale(.8)}}@-webkit-keyframes flipouttoright{from{-webkit-transform:rotateY(0) scale(1)}to{-webkit-transform:rotateY(180deg) scale(.8)}}@-webkit-keyframes dontmove{from{opacity:1}to{opacity:1}}.pop{-webkit-transform-origin:50% 50%}.pop.in{-webkit-transform:scale(1);opacity:1;-webkit-animation-name:popin;z-index:10}.pop.out.reverse{-webkit-transform:scale(.2);opacity:0;-webkit-animation-name:popout;z-index:10}.pop.in.reverse{z-index:0;-webkit-animation-name:dontmove}@-webkit-keyframes popin{from{-webkit-transform:scale(.2);opacity:0}to{-webkit-transform:scale(1);opacity:1}}@-webkit-keyframes popout{from{-webkit-transform:scale(1);opacity:1}to{-webkit-transform:scale(.2);opacity:0}}.ui-grid-a,.ui-grid-b,.ui-grid-c,.ui-grid-d{overflow:hidden}.ui-block-a,.ui-block-b,.ui-block-c,.ui-block-d,.ui-block-e{margin:0;padding:0;border:0;float:left;min-height:1px}.ui-grid-solo .ui-block-a{width:100%;float:none}.ui-grid-a .ui-block-a,.ui-grid-a .ui-block-b{width:50%}.ui-grid-a .ui-block-a{clear:left}.ui-grid-b .ui-block-a,.ui-grid-b .ui-block-b,.ui-grid-b .ui-block-c{width:33.333%}.ui-grid-b .ui-block-a{clear:left}.ui-grid-c .ui-block-a,.ui-grid-c .ui-block-b,.ui-grid-c .ui-block-c,.ui-grid-c .ui-block-d{width:25%}.ui-grid-c .ui-block-a{clear:left}.ui-grid-d .ui-block-a,.ui-grid-d .ui-block-b,.ui-grid-d .ui-block-c,.ui-grid-d .ui-block-d,.ui-grid-d .ui-block-e{width:20%}.ui-grid-d .ui-block-a{clear:left}.ui-header,.ui-footer,.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{position:absolute;overflow:hidden;width:100%;border-left-width:0;border-right-width:0}.ui-header-fixed,.ui-footer-fixed{z-index:1000;-webkit-transform:translateZ(0)}.ui-footer-duplicate,.ui-page-fullscreen .ui-fixed-inline{display:none}.ui-page-fullscreen .ui-header,.ui-page-fullscreen .ui-footer{opacity:.9}.ui-navbar{overflow:hidden}.ui-navbar ul,.ui-navbar-expanded ul{list-style:none;padding:0;margin:0;position:relative;display:block;border:0}.ui-navbar-collapsed ul{float:left;width:75%;margin-right:-2px}.ui-navbar-collapsed .ui-navbar-toggle{float:left;width:25%}.ui-navbar li.ui-navbar-truncate{position:absolute;left:-9999px;top:-9999px}.ui-navbar li .ui-btn,.ui-navbar .ui-navbar-toggle .ui-btn{display:block;font-size:12px;text-align:center;margin:0;border-right-width:0}.ui-navbar li .ui-btn{margin-right:-1px}.ui-navbar li .ui-btn:last-child{margin-right:0}.ui-header .ui-navbar li .ui-btn,.ui-header .ui-navbar .ui-navbar-toggle .ui-btn,.ui-footer .ui-navbar li .ui-btn,.ui-footer .ui-navbar .ui-navbar-toggle .ui-btn{border-top-width:0;border-bottom-width:0}.ui-navbar .ui-btn-inner{padding-left:2px;padding-right:2px}.ui-navbar-noicons li .ui-btn .ui-btn-inner,.ui-navbar-noicons .ui-navbar-toggle .ui-btn-inner{padding-top:.8em;padding-bottom:.9em}.ui-navbar-expanded .ui-btn{margin:0;font-size:14px}.ui-navbar-expanded .ui-btn-inner{padding-left:5px;padding-right:5px}.ui-navbar-expanded .ui-btn-icon-top .ui-btn-inner{padding:45px 5px 15px;text-align:center}.ui-navbar-expanded .ui-btn-icon-top .ui-icon{top:15px}.ui-navbar-expanded .ui-btn-icon-bottom .ui-btn-inner{padding:15px 5px 45px;text-align:center}.ui-navbar-expanded .ui-btn-icon-bottom .ui-icon{bottom:15px}.ui-navbar-expanded li .ui-btn .ui-btn-inner{min-height:2.5em}.ui-navbar-expanded .ui-navbar-noicons .ui-btn .ui-btn-inner{padding-top:1.8em;padding-bottom:1.9em}.ui-btn{display:block;text-align:center;cursor:pointer;position:relative;margin:.5em 5px;padding:0}.ui-btn:focus,.ui-btn:active{outline:0}.ui-header .ui-btn,.ui-footer .ui-btn,.ui-bar .ui-btn{display:inline-block;font-size:13px;margin:0}.ui-btn-inline{display:inline-block}.ui-btn-inner{padding:.6em 25px;display:block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;position:relative;zoom:1}.ui-header .ui-btn-inner,.ui-footer .ui-btn-inner,.ui-bar .ui-btn-inner{padding:.4em 8px .5em}.ui-btn-icon-notext{display:inline-block;width:20px;height:20px;padding:2px 1px 2px 3px;text-indent:-9999px}.ui-btn-icon-notext .ui-btn-inner{padding:0}.ui-btn-icon-notext .ui-btn-text{position:absolute;left:-999px}.ui-btn-icon-left .ui-btn-inner{padding-left:33px}.ui-header .ui-btn-icon-left .ui-btn-inner,.ui-footer .ui-btn-icon-left .ui-btn-inner,.ui-bar .ui-btn-icon-left .ui-btn-inner{padding-left:27px}.ui-btn-icon-right .ui-btn-inner{padding-right:33px}.ui-header .ui-btn-icon-right .ui-btn-inner,.ui-footer .ui-btn-icon-right .ui-btn-inner,.ui-bar .ui-btn-icon-right .ui-btn-inner{padding-right:27px}.ui-btn-icon-top .ui-btn-inner{padding-top:33px}.ui-header .ui-btn-icon-top .ui-btn-inner,.ui-footer .ui-btn-icon-top .ui-btn-inner,.ui-bar .ui-btn-icon-top .ui-btn-inner{padding-top:27px}.ui-btn-icon-bottom .ui-btn-inner{padding-bottom:33px}.ui-header .ui-btn-icon-bottom .ui-btn-inner,.ui-footer .ui-btn-icon-bottom .ui-btn-inner,.ui-bar .ui-btn-icon-bottom .ui-btn-inner{padding-bottom:27px}.ui-btn-icon-notext .ui-icon{display:block}.ui-btn-icon-left .ui-icon,.ui-btn-icon-right .ui-icon{position:absolute;top:50%;margin-top:-9px}.ui-btn-icon-top .ui-icon,.ui-btn-icon-bottom .ui-icon{position:absolute;left:50%;margin-left:-9px}.ui-btn-icon-left .ui-icon{left:10px}.ui-btn-icon-right .ui-icon{right:10px}.ui-header .ui-btn-icon-left .ui-icon,.ui-footer .ui-btn-icon-left .ui-icon,.ui-bar .ui-btn-icon-left .ui-icon{left:4px}.ui-header .ui-btn-icon-right .ui-icon,.ui-footer .ui-btn-icon-right .ui-icon,.ui-bar .ui-btn-icon-right .ui-icon{right:4px}.ui-header .ui-btn-icon-top .ui-icon,.ui-footer .ui-btn-icon-top .ui-icon,.ui-bar .ui-btn-icon-top .ui-icon{top:4px}.ui-header .ui-btn-icon-bottom .ui-icon,.ui-footer .ui-btn-icon-bottom .ui-icon,.ui-bar .ui-btn-icon-bottom .ui-icon{bottom:4px}.ui-btn-icon-top .ui-icon{top:5px}.ui-btn-icon-bottom .ui-icon{bottom:5px}.ui-btn-hidden{position:absolute;top:0;left:0;width:100%;height:100%;-webkit-appearance:button;opacity:0;cursor:pointer;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0);background:transparent}.ui-collapsible-contain{margin:.5em 0}.ui-collapsible-heading{font-size:16px;display:block;margin:0 -8px;padding:0;border-width:0 0 1px 0;position:relative}.ui-collapsible-heading a{text-align:left;margin:0}.ui-collapsible-heading a .ui-btn-inner{padding-left:40px}.ui-collapsible-heading a span.ui-btn{position:absolute;left:6px;top:50%;margin:-12px 0 0 0;width:20px;height:20px;padding:1px 0 1px 2px;text-indent:-9999px}.ui-collapsible-heading a span.ui-btn .ui-btn-inner{padding:10px 0}.ui-collapsible-heading a span.ui-btn .ui-icon{left:0;margin-top:-10px}.ui-collapsible-heading-status{position:absolute;left:-9999px}.ui-collapsible-content{display:block;padding:10px 0 10px 8px}.ui-collapsible-content-collapsed{display:none}.ui-collapsible-set{margin:.5em 0}.ui-collapsible-set .ui-collapsible-contain{margin:-1px 0 0}.ui-controlgroup,fieldset.ui-controlgroup{padding:0;margin:.5em 0 1em}.ui-bar .ui-controlgroup{margin:0 .3em}.ui-controlgroup-label{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em}.ui-controlgroup-controls{display:block;width:95%}.ui-controlgroup li{list-style:none}.ui-controlgroup-vertical .ui-btn,.ui-controlgroup-vertical .ui-checkbox,.ui-controlgroup-vertical .ui-radio{margin:0;border-bottom-width:0}.ui-controlgroup-vertical .ui-controlgroup-last{border-bottom-width:1px}.ui-controlgroup-horizontal{padding:0}.ui-controlgroup-horizontal .ui-btn,.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{display:inline-block;margin:0 -5px 0 0}.ui-controlgroup-horizontal .ui-checkbox,.ui-controlgroup-horizontal .ui-radio{display:inline}.ui-controlgroup-horizontal .ui-checkbox .ui-btn,.ui-controlgroup-horizontal .ui-radio .ui-btn,.ui-controlgroup-horizontal .ui-checkbox:last-child,.ui-controlgroup-horizontal .ui-radio:last-child{margin-right:0}.ui-controlgroup-horizontal .ui-controlgroup-last{margin-right:0}.ui-controlgroup .ui-checkbox label,.ui-controlgroup .ui-radio label{font-size:16px}@media all and (min-width:450px){.ui-controlgroup-label{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}.ui-controlgroup-controls{width:60%;display:inline-block}}.ui-dialog{min-height:480px}.ui-dialog .ui-header,.ui-dialog .ui-content,.ui-dialog .ui-footer{margin:15px;position:relative}.ui-dialog .ui-header,.ui-dialog .ui-footer{z-index:10;width:auto}.ui-dialog .ui-content,.ui-dialog .ui-footer{margin-top:-15px}.ui-checkbox,.ui-radio{position:relative;margin:.2em 0 .5em;z-index:1}.ui-checkbox .ui-btn,.ui-radio .ui-btn{margin:0;text-align:left;z-index:2}.ui-checkbox .ui-btn-inner,.ui-radio .ui-btn-inner{white-space:normal}.ui-checkbox .ui-btn-icon-left .ui-btn-inner,.ui-radio .ui-btn-icon-left .ui-btn-inner{padding-left:45px}.ui-checkbox .ui-btn-icon-right .ui-btn-inner,.ui-radio .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-checkbox .ui-icon,.ui-radio .ui-icon{top:1.1em}.ui-checkbox .ui-btn-icon-left .ui-icon,.ui-radio .ui-btn-icon-left .ui-icon{left:15px}.ui-checkbox .ui-btn-icon-right .ui-icon,.ui-radio .ui-btn-icon-right .ui-icon{right:15px}.ui-checkbox input,.ui-radio input{position:absolute;left:20px;top:50%;width:10px;height:10px;margin:-5px 0 0 0;outline:0!important;z-index:1}.ui-field-contain{padding:1.5em 0;margin:0;border-bottom-width:1px;overflow:visible}.ui-field-contain:first-child{border-top-width:0}@media all and (min-width:450px){.ui-field-contain{border-width:0;padding:0;margin:1em 0}}.ui-select{display:block;position:relative}.ui-select select{position:absolute;left:-9999px;top:-9999px}.ui-select .ui-btn{overflow:hidden}.ui-select .ui-btn select{cursor:pointer;-webkit-appearance:button;left:0;top:0;width:100%;height:100%;opacity:0;-ms-filter:"alpha(opacity=0)";filter:alpha(opacity=0)}@-moz-document url-prefix(){.ui-select .ui-btn select{opacity:.0001}}.ui-select .ui-btn select.ui-select-nativeonly{opacity:1;text-indent:0}.ui-select .ui-btn-icon-right .ui-btn-inner{padding-right:45px}.ui-select .ui-btn-icon-right .ui-icon{right:15px}label.ui-select{font-size:16px;line-height:1.4;font-weight:normal;margin:0 0 .3em;display:block}.ui-select .ui-btn-text,.ui-selectmenu .ui-btn-text{display:block;min-height:1em}.ui-select .ui-btn-text{text-overflow:ellipsis;overflow:hidden}.ui-selectmenu{position:absolute;padding:0;z-index:100!important;width:80%;max-width:350px;padding:6px}.ui-selectmenu .ui-listview{margin:0}.ui-selectmenu .ui-btn.ui-li-divider{cursor:default}.ui-selectmenu-hidden{top:-9999px;left:-9999px}.ui-selectmenu-screen{position:absolute;top:0;left:0;width:100%;height:100%;z-index:99}.ui-screen-hidden,.ui-selectmenu-list .ui-li .ui-icon{display:none}.ui-selectmenu-list .ui-li .ui-icon{display:block}.ui-li.ui-selectmenu-placeholder{display:none}.ui-selectmenu .ui-header .ui-title{margin:.6em 46px .8em}@media all and (min-width:450px){label.ui-select{display:inline-block;width:20%;margin:0 2% 0 0}.ui-select{width:60%;display:inline-block}}.ui-selectmenu .ui-header h1:after{content:'.';visibility:hidden}label.ui-input-text{font-size:16px;line-height:1.4;display:block;font-weight:normal;margin:0 0 .3em}input.ui-input-text,textarea.ui-input-text{background-image:none;padding:.4em;line-height:1.4;font-size:16px;display:block;width:95%}input.ui-input-text{-webkit-appearance:none}textarea.ui-input-text{height:50px;-webkit-transition:height 200ms linear;-moz-transition:height 200ms linear;-o-transition:height 200ms linear;transition:height 200ms linear}.ui-input-search{padding:0 30px;width:77%;background-position:8px 50%;background-repeat:no-repeat;position:relative}.ui-input-search input.ui-input-text{border:0;width:98%;padding:.4em 0;margin:0;display:block;background:transparent none;outline:0!important}.ui-input-search .ui-input-clear{position:absolute;right:0;top:50%;margin-top:-14px}.ui-input-search .ui-input-clear-hidden{display:none}@media all and (min-width:450px){label.ui-input-text{vertical-align:top;display:inline-block;width:20%;margin:0 2% 0 0}input.ui-input-text,textarea.ui-input-text,.ui-input-search{width:60%;display:inline-block}.ui-input-search{width:50%}.ui-input-search input.ui-input-text{width:98%}}.ui-listview{margin:0;counter-reset:listnumbering}.ui-content .ui-listview{margin:-15px}.ui-content .ui-listview-inset{margin:1em 0}.ui-listview,.ui-li{list-style:none;padding:0}.ui-li,.ui-li.ui-field-contain{display:block;margin:0;position:relative;overflow:visible;text-align:left;border-width:0;border-top-width:1px}.ui-li .ui-btn-text a.ui-link-inherit{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-divider,.ui-li-static{padding:.5em 15px;font-size:14px;font-weight:bold}.ui-li-divider{counter-reset:listnumbering}ol.ui-listview .ui-link-inherit:before,ol.ui-listview .ui-li-static:before,.ui-li-dec{font-size:.8em;display:inline-block;padding-right:.3em;font-weight:normal;counter-increment:listnumbering;content:counter(listnumbering) ". "}ol.ui-listview .ui-li-jsnumbering:before{content:""!important}.ui-listview-inset .ui-li{border-right-width:1px;border-left-width:1px}.ui-li:last-child,.ui-li.ui-field-contain:last-child{border-bottom-width:1px}.ui-li>.ui-btn-inner{display:block;position:relative;padding:0}.ui-li .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li{padding:.7em 75px .7em 15px;display:block}.ui-li-has-thumb .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-thumb{min-height:60px;padding-left:100px}.ui-li-has-icon .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-icon{min-height:20px;padding-left:40px}.ui-li-heading{font-size:16px;font-weight:bold;display:block;margin:.6em 0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-desc{font-size:12px;font-weight:normal;display:block;margin:-.5em 0 .6em;text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.ui-li-thumb,.ui-li-icon{position:absolute;left:1px;top:0;max-height:80px;max-width:80px}.ui-li-icon{max-height:40px;max-width:40px;left:10px;top:.9em}.ui-li-thumb,.ui-li-icon,.ui-li-content{float:left;margin-right:10px}.ui-li-aside{float:right;width:50%;text-align:right;margin:.3em 0}@media all and (min-width:480px){.ui-li-aside{width:45%}}.ui-li-divider{cursor:default}.ui-li-has-alt .ui-btn-inner a.ui-link-inherit,.ui-li-static.ui-li-has-alt{padding-right:95px}.ui-li-count{position:absolute;font-size:11px;font-weight:bold;padding:.2em .5em;top:50%;margin-top:-.9em;right:38px}.ui-li-divider .ui-li-count,.ui-li-static .ui-li-count{right:10px}.ui-li-has-alt .ui-li-count{right:55px}.ui-li-link-alt{position:absolute;width:40px;height:100%;border-width:0;border-left-width:1px;top:0;right:0;margin:0;padding:0}.ui-li-link-alt .ui-btn{overflow:hidden;position:absolute;right:8px;top:50%;margin:-11px 0 0 0;border-bottom-width:1px}.ui-li-link-alt .ui-btn-inner{padding:0;position:static}.ui-li-link-alt .ui-btn .ui-icon{right:50%;margin-right:-9px}.ui-listview-filter{border-width:0;overflow:hidden;margin:-15px -15px 15px -15px}.ui-listview-filter .ui-input-search{margin:5px;width:auto;display:block}.ui-listview-filter-inset{margin:-15px -5px -15px -5px;background:transparent}.ui-li.ui-screen-hidden{display:none}@media only screen and (min-device-width:768px) and (max-device-width:1024px){.ui-li .ui-btn-text{overflow:visible}}label.ui-slider{display:block}input.ui-slider-input{display:inline-block;width:50px}select.ui-slider-switch{display:none}div.ui-slider{position:relative;display:inline-block;overflow:visible;height:15px;padding:0;margin:0 2% 0 20px;top:4px;width:66%}a.ui-slider-handle{position:absolute;z-index:10;top:50%;width:28px;height:28px;margin-top:-15px;margin-left:-15px}a.ui-slider-handle .ui-btn-inner{padding-left:0;padding-right:0}@media all and (min-width:480px){label.ui-slider{display:inline-block;width:20%;margin:0 2% 0 0}div.ui-slider{width:45%}}div.ui-slider-switch{height:32px;overflow:hidden;margin-left:0}div.ui-slider-inneroffset{margin-left:50%;position:absolute;top:1px;height:100%;width:50%}div.ui-slider-handle-snapping{-webkit-transition:left 100ms linear}div.ui-slider-labelbg{position:absolute;top:0;margin:0;border-width:0}div.ui-slider-switch div.ui-slider-labelbg-a{width:60%;height:100%;left:0}div.ui-slider-switch div.ui-slider-labelbg-b{width:60%;height:100%;right:0}.ui-slider-switch-a div.ui-slider-labelbg-a,.ui-slider-switch-b div.ui-slider-labelbg-b{z-index:-1}.ui-slider-switch-a div.ui-slider-labelbg-b,.ui-slider-switch-b div.ui-slider-labelbg-a{z-index:0}div.ui-slider-switch a.ui-slider-handle{z-index:20;width:101%;height:32px;margin-top:-18px;margin-left:-101%}span.ui-slider-label{width:100%;position:absolute;height:32px;font-size:16px;text-align:center;line-height:2;background:0;border-color:transparent}span.ui-slider-label-a{left:-100%;margin-right:-1px}span.ui-slider-label-b{right:-100%;margin-left:-1px} \ No newline at end of file diff --git a/app/assets/templates/all.js b/app/assets/templates/all.js deleted file mode 100644 index 6b5f34068..000000000 --- a/app/assets/templates/all.js +++ /dev/null @@ -1,4 +0,0 @@ -// Workaround to keep "app/templates" out of the template names -// All templates will remain in the JST namespace just as they were -// when we were using Jammit -//= require_tree . \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index 8c3c4ce0d..46afbee01 100644 --- a/config/application.rb +++ b/config/application.rb @@ -73,7 +73,8 @@ module Diaspora # Javascripts config.assets.precompile += [ "finder.js", "home.js", "ie.js", "inbox.js", "jquery.js", "jquery_ujs.js", "login.js", "mailchimp.js", "main.js", - "mobile.js", "profile.js", "people.js", "photos.js", "templates.js" ] + "mobile.js", "profile.js", "people.js", "photos.js", "templates.js", + "validation.js" ] # Stylesheets config.assets.precompile += [ "blueprint.css", "bootstrap.css", "default.css", diff --git a/config/deploy.rb b/config/deploy.rb index d841c3a08..85ca3525c 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -41,8 +41,7 @@ namespace :deploy do end task :bundle_static_assets do - run "cd #{current_path} && bundle exec sass --update public/stylesheets/sass:public/stylesheets" - run "cd #{current_path} && bundle exec jammit" + run "cd #{current_path} && bundle exec rake assets:precompile" end task :restart do diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 034e19c49..40234d819 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -12,7 +12,7 @@ namespace :ci do system("bundle exec #{cmd}") raise "#{cmd} failed!" unless $?.exitstatus == 0 end - ['jammit', "rake jasmine:ci", "rake cucumber"].each do |cmd| + ["rake jasmine:ci", "rake cucumber"].each do |cmd| puts "Running bundle exec #{cmd}..." system("export DISPLAY=:99.0 && GROUP=oauth bundle exec #{cmd}") raise "#{cmd} failed!" unless $?.exitstatus == 0 diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 81f68950c..daad2052b 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -11,63 +11,8 @@ # - dist/**/*.js # src_files: - # load up our outputted templates, bound to window.JST - - public/javascripts/vendor/handlebars-1.0.0.beta.6.js - - public/assets/templates.js - - - public/javascripts/vendor/underscore.js - - public/javascripts/vendor/jquery-1.7.1.min.js - - public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js - - public/javascripts/vendor/bootstrap/bootstrap-twipsy.js - - public/javascripts/vendor/bootstrap/bootstrap-popover.js - - public/javascripts/vendor/jquery.tipsy.js - - public/javascripts/vendor/jquery.infinitescroll.min.js - - public/javascripts/vendor/jquery.autoresize.js - - public/javascripts/vendor/jquery.expander.js - - public/javascripts/vendor/jquery.charcount.js - - public/javascripts/vendor/jquery.mentionsInput.js - - public/javascripts/vendor/jquery.idle-timer.js - - public/javascripts/vendor/timeago.js - - public/javascripts/vendor/facebox.js - - public/javascripts/vendor/markdown/* - - public/javascripts/vendor/punycode.js - - public/javascripts/vendor/jquery.placeholder.js - - public/javascripts/vendor/backbone.js - - public/javascripts/fileuploader-custom.js - - public/javascripts/jquery.autocomplete-custom.js - - public/javascripts/diaspora.js - - public/javascripts/keycodes.js - - - public/javascripts/pages/* - - public/javascripts/helpers/* - - public/javascripts/widgets/* - - - public/javascripts/app/app.js - - public/javascripts/app/helpers/* - - public/javascripts/app/router.js - - public/javascripts/app/views.js - - public/javascripts/app/forms.js - - public/javascripts/app/models/post.js - - public/javascripts/app/models/* - - public/javascripts/app/collections/* - - public/javascripts/app/views/stream_object_view.js - - public/javascripts/app/views/content_view.js - - public/javascripts/app/views/*.js - - public/javascripts/app/views/**/*.js - - public/javascripts/app/pages/**/*.js - - public/javascripts/app/forms/**/*.js - - - public/javascripts/mobile.js - - public/javascripts/contact-list.js - - public/javascripts/view.js - - public/javascripts/mentions.js - - public/javascripts/publisher.js - - public/javascripts/stream.js - - public/javascripts/validation.js - - public/javascripts/rails.js - - public/javascripts/aspects-dropdown.js - - public/javascripts/content-updater.js - - public/javascripts/tag-followings.js + # Precompile all scripts together for the test environment + - assets/jasmine-load-all.js # stylesheets # @@ -81,7 +26,13 @@ src_files: # - stylesheets/*.css # stylesheets: - - stylesheets/**/*.css + - assets/blueprint.css + - assets/bootstrap.css + - assets/default.css + - assets/login.css + #- assets/mobile.css + - assets/new_templates.css + #- assets/rtl.css # helpers # diff --git a/spec/javascripts/support/jasmine_config.rb b/spec/javascripts/support/jasmine_config.rb deleted file mode 100644 index 04afc4206..000000000 --- a/spec/javascripts/support/jasmine_config.rb +++ /dev/null @@ -1,7 +0,0 @@ -require 'jammit' -module Jasmine - class Config - Jammit.reload! - Jammit.package! - end -end \ No newline at end of file diff --git a/spec/javascripts/support/jasmine_runner.rb b/spec/javascripts/support/jasmine_runner.rb index dffb486c8..2add1b9f9 100644 --- a/spec/javascripts/support/jasmine_runner.rb +++ b/spec/javascripts/support/jasmine_runner.rb @@ -6,15 +6,6 @@ require 'rubygems' require 'json' require 'jasmine' require 'rspec' -jasmine_config_overrides = File.expand_path(File.join(File.dirname(__FILE__), 'jasmine_config.rb')) - -begin - require jasmine_config_overrides if File.exists?(jasmine_config_overrides) -rescue Exception => e - #we do this because when we are locally developing JS, our local jammit - # helps us re-run jasmine tests by jammiting every time. - #on ci, this causes problems, but we only need to jammit once -end jasmine_config = Jasmine::Config.new spec_builder = Jasmine::SpecBuilder.new(jasmine_config) From 3e4bdc426054f71de12d3f60fa7e2153f6eda856 Mon Sep 17 00:00:00 2001 From: Steven Hancock Date: Fri, 23 Mar 2012 00:44:02 -0700 Subject: [PATCH 08/20] Fix image tags in public/default.html to use asset pipeline --- public/default.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/default.html b/public/default.html index 70fbcd1fa..bda56f338 100644 --- a/public/default.html +++ b/public/default.html @@ -91,7 +91,7 @@