Skip to content

Commit

Permalink
Merge pull request chrismytton#5 from dbloete/master
Browse files Browse the repository at this point in the history 
Fixed asset paths for use in production environment
  • Loading branch information
@chrismytton
chrismytton committed Aug 11, 2011
2 parents 7c635ba + 7454b6f commit 32c0491
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 34 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.1.3 / 2011-08-11

* Fixed asset paths for use in production environment

# 0.1.0 / 2011-05-24

* Added support for `require fancybox`, which is just an alias for
Expand Down
2 changes: 1 addition & 1 deletion fancybox-rails.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.summary = "Use FancyBox with Rails 3.1"
s.description = "This gem provides jQuery FancyBox for your Rails 3.1 application."
s.files = Dir["{lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.md"]
s.version = "0.1.2"
s.version = "0.1.3"

s.add_dependency "railties", ">= 3.1.0.rc"
s.add_development_dependency "bundler", "~> 1.0.0"
Expand Down
66 changes: 33 additions & 33 deletions ...or/assets/stylesheets/jquery.fancybox.css → ...ssets/stylesheets/jquery.fancybox.css.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
left: 0;
width: 40px;
height: 480px;
background-image: url('fancybox.png');
background-image: url(<%= asset_path 'fancybox.png' %>);
}

#fancybox-overlay {
Expand Down Expand Up @@ -99,7 +99,7 @@
right: -15px;
width: 30px;
height: 30px;
background: transparent url('fancybox.png') -40px 0px;
background: transparent url(<%= asset_path 'fancybox.png' %>) -40px 0px;
cursor: pointer;
z-index: 1103;
display: none;
Expand Down Expand Up @@ -137,7 +137,7 @@
width: 35%;
cursor: pointer;
outline: none;
background: transparent url('blank.gif');
background: transparent url(<%= asset_path 'blank.gif' %>);
z-index: 1102;
display: none;
}
Expand All @@ -163,12 +163,12 @@
}

#fancybox-left-ico {
background-image: url('fancybox.png');
background-image: url(<%= asset_path 'fancybox.png' %>);
background-position: -40px -30px;
}

#fancybox-right-ico {
background-image: url('fancybox.png');
background-image: url(<%= asset_path 'fancybox.png' %>);
background-position: -40px -60px;
}

Expand Down Expand Up @@ -199,57 +199,57 @@
top: -20px;
left: 0;
width: 100%;
background-image: url('fancybox-x.png');
background-image: url(<%= asset_path 'fancybox-x.png' %>);
}

#fancybox-bg-ne {
top: -20px;
right: -20px;
background-image: url('fancybox.png');
background-image: url(<%= asset_path 'fancybox.png' %>);
background-position: -40px -162px;
}

#fancybox-bg-e {
top: 0;
right: -20px;
height: 100%;
background-image: url('fancybox-y.png');
background-image: url(<%= asset_path 'fancybox-y.png' %>);
background-position: -20px 0px;
}

#fancybox-bg-se {
bottom: -20px;
right: -20px;
background-image: url('fancybox.png');
background-image: url(<%= asset_path 'fancybox.png' %>);
background-position: -40px -182px;
}

#fancybox-bg-s {
bottom: -20px;
left: 0;
width: 100%;
background-image: url('fancybox-x.png');
background-image: url(<%= asset_path 'fancybox-x.png' %>);
background-position: 0px -20px;
}

#fancybox-bg-sw {
bottom: -20px;
left: -20px;
background-image: url('fancybox.png');
background-image: url(<%= asset_path 'fancybox.png' %>);
background-position: -40px -142px;
}

#fancybox-bg-w {
top: 0;
left: -20px;
height: 100%;
background-image: url('fancybox-y.png');
background-image: url(<%= asset_path 'fancybox-y.png' %>);
}

#fancybox-bg-nw {
top: -20px;
left: -20px;
background-image: url('fancybox.png');
background-image: url(<%= asset_path 'fancybox.png' %>);
background-position: -40px -122px;
}

Expand Down Expand Up @@ -282,7 +282,7 @@

#fancybox-title-over {
padding: 10px;
background-image: url('fancy_title_over.png');
background-image: url(<%= asset_path 'fancy_title_over.png' %>);
display: block;
}

Expand All @@ -306,33 +306,33 @@

#fancybox-title-float-left {
padding: 0 0 0 15px;
background: url('fancybox.png') -40px -90px no-repeat;
background: url(<%= asset_path 'fancybox.png' %>) -40px -90px no-repeat;
}

#fancybox-title-float-main {
color: #FFF;
line-height: 29px;
font-weight: bold;
padding: 0 0 3px 0;
background: url('fancybox-x.png') 0px -40px;
background: url(<%= asset_path 'fancybox-x.png' %>) 0px -40px;
}

#fancybox-title-float-right {
padding: 0 0 0 15px;
background: url('fancybox.png') -55px -90px no-repeat;
background: url(<%= asset_path 'fancybox.png' %>) -55px -90px no-repeat;
}

/* IE6 */

.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_close.png', sizingMethod='scale'); }
.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_close.png' %>", sizingMethod='scale'); }

.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_nav_left.png', sizingMethod='scale'); }
.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_nav_right.png', sizingMethod='scale'); }
.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_nav_left.png' %>", sizingMethod='scale'); }
.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_nav_right.png' %>", sizingMethod='scale'); }

.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_title_left.png', sizingMethod='scale'); }
.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_title_main.png', sizingMethod='scale'); }
.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_title_right.png', sizingMethod='scale'); }
.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_title_over.png' %>", sizingMethod='scale'); zoom: 1; }
.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_title_left.png' %>", sizingMethod='scale'); }
.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_title_main.png' %>", sizingMethod='scale'); }
.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_title_right.png' %>", sizingMethod='scale'); }

.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
height: expression(this.parentNode.clientHeight + "px");
Expand All @@ -343,17 +343,17 @@
top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
}

#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_loading.png', sizingMethod='scale'); }
#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_loading.png' %>", sizingMethod='scale'); }

/* IE6, IE7, IE8 */

.fancybox-ie .fancybox-bg { background: transparent !important; }

.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_n.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_ne.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_e.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_se.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_s.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_sw.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_w.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='assets/fancy_shadow_nw.png', sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_n.png' %>", sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_ne.png' %>", sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_e.png' %>", sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_se.png' %>", sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_s.png' %>", sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_sw.png' %>", sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_w.png' %>", sizingMethod='scale'); }
.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="<%= asset_path 'fancy_shadow_nw.png' %>", sizingMethod='scale'); }

0 comments on commit 32c0491

Please sign in to comment.