Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ie stylesheet/javascripts path #81

Merged
merged 1 commit into from
Aug 8, 2014
Merged

fix ie stylesheet/javascripts path #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

- Bug fix: Audio player timestamps were flickering on play.
([#74](https://github.com/codevise/pageflow/pull/74))
- Bug fix: IE9 display errors.
([#77](https://github.com/codevise/pageflow/pull/77), [#80](https://github.com/codevise/pageflow/pull/80))
- Bug fix: Link IE stylesheets/javascripts correctly.
([#81](https://github.com/codevise/pageflow/pull/81))

##### Rails Engine

Expand Down
9 changes: 2 additions & 7 deletions app/assets/stylesheets/pageflow/ie9.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,13 @@
background-image: url('.');
}

.page .shadow {
/* Gradient is done with filter property. */
background-image: url('.') !important;
}

/* Make sure controls are centered, since translateX(-50%) does not work. */

.vjs-control-bar {
margin-left: -217px !important;
-ms-transform: translate(-50%, 0);
}

.js .add_info_box {
margin: 0 0 63px -214px;
-ms-transform: translate(-50%, 0);
max-width: 434px;
}
2 changes: 0 additions & 2 deletions app/assets/stylesheets/pageflow/player_controls.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
margin-bottom: 63px;
position: absolute;
left: 50%;
@include transform(translate(-50%, 0));
@include transform(translate3d(-50%, 0,0));
z-index: 2;
font-size: 0.8em;
Expand All @@ -83,7 +82,6 @@
border: 3px solid #505050;
left: 50%;
z-index: 2;
@include transform(translate(-50%, 0));
@include transform(translate3d(-50%, 0, 0));
display: block;
}
Expand Down
8 changes: 4 additions & 4 deletions app/views/layouts/pageflow/_ie_include_tags.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!--[if lt IE 9]>
<%= stylesheet_link_tag "lt_ie9", :media => 'all' %>
<%= javascript_include_tag "lt_ie9" %>
<%= stylesheet_link_tag "pageflow/lt_ie9", :media => 'all' %>
<%= javascript_include_tag "pageflow/lt_ie9" %>
<![endif]-->
<!--[if IE 9]>
<%= stylesheet_link_tag "ie9", :media => 'all' %>
<%= javascript_include_tag "ie9" %>
<%= stylesheet_link_tag "pageflow/ie9", :media => 'all' %>
<%= javascript_include_tag "pageflow/ie9" %>
<![endif]-->