Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: zufrieden/stopwatch
base: 803fb65786
...
head fork: zufrieden/stopwatch
compare: 462d2324f5
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
BIN  app/assets/images/pres_sw_logo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
2  app/assets/javascripts/presentation.js
@@ -39,7 +39,7 @@ startTimer();
var colorAnimation = function() {
$('#brandable').animate({backgroundColor: 'red'}, 1000, function() {
setTimeout(function() {
- $('#brandable').animate({backgroundColor: 'yellow'}, 1000, function() {
+ $('#brandable').animate({backgroundColor: 'orange'}, 1000, function() {
setTimeout(function() {
$('#brandable').animate({backgroundColor: 'blue'}, 1000, function() {
setTimeout(function() {
View
30 app/assets/stylesheets/presentation.css
@@ -82,7 +82,7 @@ a {
text-decoration: none;
padding: 0 0.1em;
background: rgba(255,255,255,0.5);
- text-shadow: -1px -1px 2px rgba(100,100,100,0.9);
+ /*text-shadow: -1px -1px 2px rgba(100,100,100,0.9);*/
border-radius: 0.2em;
-webkit-transition: 0.5s;
@@ -623,13 +623,23 @@ body { pointer-events: none; }
background-color: #008b00;
}
#brandable h1{
- margin-top: 2.8em;
+ margin-top: 0em;
font-size: 70px;
+ margin-bottom: 0.2em;
}
#brandable h2{
text-align: center;
padding: 0.3em 2em;
}
+#brandable .logo_sw{
+ margin-left: 200px;
+ margin-top: 90px;
+ margin-bottom: 20px;
+ width: 86px;
+ height: 109px;
+ background-position: 0px 0px;
+ background-repeat: no-repeat;
+}
#tweeterwall{
@@ -641,13 +651,25 @@ body { pointer-events: none; }
margin-top: 1em;
}
-#contact_us h1{
+#timer_contact_us h1{
line-height: 1.2em;
}
-#contact_us h2{
+#timer_contact_us h2{
}
+#timer_contact_us .stopwatch{
+ margin: 1em 0;
+ font-size: 50px;
+ letter-spacing: -0.16em;
+}
+
+.contact_us{
+ margin-top: 0.3em;
+}
+.contact_us a{
+ color:#f00;
+}
/* IMPRESS NOT SUPPORTED STYLES */
.fallback-message {
View
41 app/views/home/presentation.html.erb
@@ -40,7 +40,7 @@
<div id="logo" class="step slide" data-x="0" data-y="0">
<h1>stopwat<span><strong>.</strong></span>ch</h1>
- <h2>A timer for your conference</h2>
+ <h2>A timer for this sunday pitches</h2>
</div>
<div id="timer" class="step slide" data-x="0" data-y="500" data-z="0">
@@ -64,13 +64,13 @@
</div>
<div id="how_better" class="step slide title_slide" data-x="0" data-y="1500" data-z="0">
- <h1>How <strong>good</strong><br/> is our timer ?</h1>
+ <h1>How <strong>good</strong><br/> is your timer ?</h1>
</div>
<div id="over_devices_sync" class="step slide title_slide" data-x="1000" data-y="2500" data-z="0" data-rotate="90">
- <h1>Over devices synchronization</h1>
- <h2>Timer on the projector</h2>
- <h2>Follow on your iPhone</h2>
+ <h1>Synchronized on every device</h1>
+ <h2>Show on the projector</h2>
+ <h2>Start from your iPhone</h2>
<h2>Track on a tablet</h2>
<h2>...</h2>
</div>
@@ -120,7 +120,8 @@
</div>
<div id="brandable" class="step slide dotslide" data-x="0" data-y="2500" data-z="0">
- <h1>Brandable</h1>
+ <div style="background-image:url('assets/pres_sw_logo.png');" class="logo_sw"></div>
+ <h1>brandable</h1>
<h2>your logo, your colors and your stop music</h2>
</div>
@@ -131,15 +132,33 @@
</div>
<div id="tweeterwall" class="step slide title_slide" data-x="-1500" data-y="1500" data-z="0" style="background-image:url('assets/twitter.png');">
- <h1>Twitter intergation</h1>
+ <h1>Twitter integration</h1>
<h2>Display your twitter wall using your #hashtag</h2>
</div>
- <div id="contact_us" class="step slide content_slide" data-x="0" data-y="1000" data-z="0">
- <h1>Do you realy need more time to be convinced ?</h1>
- <p>We will deliver the full working solution by the end of the week-end</p>
- <p>Contact us <a href="http://www.twitter.com/swissstopwatch">@swissstopwatch</a></p>
+ <div id="timer_contact_us" class="step slide content_slide" data-x="0" data-y="1000" data-z="0">
+ <h1>Do you realy need more time<br/> to be convinced ?</h1>
+
+ <div class="stopwatch">
+ <time class="dash hours_dash">
+ <span class="digit">0</span>
+ <span class="digit">0</span>
+ <span class="dash_title">.</span>
+ </time>
+ <time class="dash minutes_dash">
+ <span class="digit">0</span>
+ <span class="digit">0</span>
+ <span class="dash_title">.</span>
+ </time>
+ <time class="dash seconds_dash">
+ <span class="digit">0</span>
+ <span class="digit">0</span>
+ </time>
+ </div>
+
+ <p>We will deliver the full working solution<br/> by the end of this week-end</p>
+ <p class="contact_us">Contact us <a href="http://www.twitter.com/swissstopwatch">@swissstopwatch</a></p>
</div>

No commit comments for this range

Something went wrong with that request. Please try again.