Skip to content
This repository has been archived by the owner on Apr 6, 2018. It is now read-only.

upgrade deck.js to most recent stable version #29

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 spec/tasks/generate_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
end

it "should copy deck.js's support files" do
File.exist?("#{project_dir}/deck.js/support/jquery.1.6.4.min.js").should be_true
File.exist?("#{project_dir}/deck.js/support/jquery-1.7.2.min.js").should be_true
File.exist?("#{project_dir}/deck.js/support/modernizr.custom.js").should be_true
end

Expand All @@ -68,4 +68,4 @@
end

end
end
end
4 changes: 2 additions & 2 deletions spec/tasks/slides_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
it "should have the deck.js files" do
scripts = @doc.css('script').collect { |tag| tag['src'] }
scripts.should include('deck.js/support/modernizr.custom.js')
scripts.should include('deck.js/support/jquery.1.6.4.min.js')
scripts.should include('deck.js/support/jquery-1.7.2.min.js')
scripts.should include('deck.js/core/deck.core.js')
end

Expand Down Expand Up @@ -213,4 +213,4 @@
@doc.css('link[@href="css/keydown.css"]').length.should == 1
end
end
end
end
2 changes: 1 addition & 1 deletion templates/deck.js/index.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
%span.deck-status-total

/ jQuery & deck.js
= script "deck.js/support/jquery.1.6.4.min.js"
= script "deck.js/support/jquery-1.7.2.min.js"
= script "deck.js/core/deck.core.js"

/ deck.js extension JS files
Expand Down
91 changes: 52 additions & 39 deletions templates/generate/deck.js/core/deck.core.css
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
html {
html, body {
height: 100%;
padding: 0;
margin: 0;
}

body.deck-container {
overflow-y: auto;
position: static;
}

.deck-container {
position: relative;
height: 100%;
width: 70%;
min-height: 100%;
margin: 0 auto;
padding: 0 48px;
font-size: 16px;
Expand All @@ -22,6 +28,7 @@ html {
}
.touch .deck-container {
-webkit-text-size-adjust: none;
-moz-text-size-adjust: none;
}
.deck-container div, .deck-container span, .deck-container object, .deck-container iframe,
.deck-container h1, .deck-container h2, .deck-container h3, .deck-container h4, .deck-container h5, .deck-container h6, .deck-container p, .deck-container blockquote, .deck-container pre,
Expand Down Expand Up @@ -139,10 +146,10 @@ html {
.deck-container input[type="checkbox"] {
vertical-align: bottom;
}
.deck-container .ie7 input[type="checkbox"] {
.ie7 .deck-container input[type="checkbox"] {
vertical-align: baseline;
}
.deck-container .ie6 input {
.ie6 .deck-container input {
vertical-align: text-bottom;
}
.deck-container label, .deck-container input[type="button"], .deck-container input[type="submit"], .deck-container input[type="image"], .deck-container button {
Expand Down Expand Up @@ -179,84 +186,97 @@ html {
.deck-container a:link {
-webkit-tap-highlight-color: #fff;
}
.deck-container h1 {
.deck-container.deck-loading {
display: none;
}

.slide {
width: auto;
min-height: 100%;
position: relative;
}
.slide h1 {
font-size: 4.5em;
}
.slide h1, .slide .vcenter {
font-weight: bold;
/*text-align: center;*/
text-align: center;
padding-top: 1em;
max-height: 100%;
}
.csstransforms .deck-container h1 {
.csstransforms .slide h1, .csstransforms .slide .vcenter {
padding: 0 48px;
position: absolute;
left: 0;
right: 0;
top: 50%;
-webkit-transform: translate3d(0, -50%, 0);
-webkit-transform: translate(0, -50%);
-moz-transform: translate(0, -50%);
-ms-transform: translate(0, -50%);
-o-transform: translate(0, -50%);
transform: translate3d(0, -50%, 0);
transform: translate(0, -50%);
}
.deck-container h2 {
.slide .vcenter h1 {
position: relative;
top: auto;
padding: 0;
-webkit-transform: none;
-moz-transform: none;
-ms-transform: none;
-o-transform: none;
transform: none;
}
.slide h2 {
font-size: 2.25em;
font-weight: bold;
padding-top: .5em;
margin: 0 0 .66666em 0;
border-bottom: 3px solid #888;
}
.deck-container h3 {
.slide h3 {
font-size: 1.4375em;
font-weight: bold;
margin-bottom: .30435em;
}
.deck-container h4 {
.slide h4 {
font-size: 1.25em;
font-weight: bold;
margin-bottom: .25em;
}
.deck-container h5 {
.slide h5 {
font-size: 1.125em;
font-weight: bold;
margin-bottom: .2222em;
}
.deck-container h6 {
.slide h6 {
font-size: 1em;
font-weight: bold;
}
.deck-container img, .deck-container iframe, .deck-container video {
.slide img, .slide iframe, .slide video {
display: block;
max-width: 100%;
}
.deck-container video, .deck-container iframe, .deck-container img {
.slide video, .slide iframe, .slide img {
display: block;
margin: 0 auto;
}
.deck-container p, .deck-container blockquote, .deck-container iframe, .deck-container img, .deck-container ul, .deck-container ol, .deck-container pre, .deck-container video {
.slide p, .slide blockquote, .slide iframe, .slide img, .slide ul, .slide ol, .slide pre, .slide video {
margin-bottom: 1em;
}
.deck-container pre {
.slide pre {
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
padding: 1em;
border: 1px solid #888;
}
.deck-container em {
.slide em {
font-style: italic;
}
.deck-container li {
.slide li {
padding: .25em 0;
vertical-align: middle;
}
.deck-container.deck-loading {
display: none;
}

.slide {
width: auto;
min-height: 100%;
position: relative;
}

.deck-before, .deck-previous, .deck-next, .deck-after {
position: absolute;
Expand Down Expand Up @@ -285,16 +305,9 @@ html {
visibility: visible;
}

body.deck-container {
overflow: visible;
}

@media all and (orientation:portrait) {}
@media all and (orientation:landscape) {}
@media screen and (max-device-width: 480px) {
/* html { -webkit-text-size-adjust:none; -ms-text-size-adjust:none; } */
}

@media print {
* {
background: transparent !important;
Expand Down Expand Up @@ -364,10 +377,10 @@ body.deck-container {
-o-transform: none !important;
-ms-transform: none !important;
transform: none !important;
opacity:1 !important;
opacity: 1 !important;
}

h1 {
h1, .vcenter {
-webkit-transform: none !important;
-moz-transform: none !important;
-o-transform: none !important;
Expand Down
Loading