Skip to content

Commit 34dafb6

Browse files
committed
Finish scene 2
1 parent 838aaa9 commit 34dafb6

File tree

3 files changed

+85
-8
lines changed

3 files changed

+85
-8
lines changed

index.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<script src="javascripts/skrollr.menu.min.js"></script>
1313
<script src="http://cdnjs.cloudflare.com/ajax/libs/less.js/1.4.1/less.min.js"></script>
1414
</head>
15-
<body id="top">
15+
<body>
1616
<nav>
1717
<div>
1818
<a href="#top" id="mini-logo" data-menu-top="0">
@@ -47,6 +47,13 @@ <h1 class="huge">What is Switcha<span class="blue">BLE</span>?</h1>
4747
<div class="clock-minute"></div>
4848
<div class="clock-hour"></div>
4949
</div>
50+
<p id="switchable-is">
51+
<!-- Switcha<span class="blue">BLE</span> is a<span id="n">n</span>-->
52+
<span id="alarm-clock">alarm clock</span>
53+
<span id="app">app</span>
54+
<span id="device">device</span>
55+
<span id="design-project">design project</span>
56+
</p>
5057
</section>
5158

5259
<script src="javascripts/skrollr.stylesheets.min.js"></script>

stylesheets/main.less

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
body {
1515
padding-top: @nav-height;
16-
font: 400 ~"12px/1.4" 'Gudea';
16+
font: 400 ~"12px/1.4" 'Open Sans';
1717
@media (min-width: @screen-sm) { font-size: 16px; }
1818
@media (min-width: @screen-md) { font-size: 18px; }
1919
@media (min-width: @screen-sm) { font-size: 20px; }
@@ -216,7 +216,7 @@ header {
216216

217217
#scene2 {
218218
top: 0%;
219-
background-color: @blue;
219+
background-color: #444;
220220
#clock {
221221
position: absolute;
222222
top: 50%;
@@ -231,4 +231,19 @@ header {
231231
background-color: white;
232232
}
233233
}
234+
#switchable-is {
235+
// width: 14em;
236+
// margin-left: -7em;
237+
// left: 50%;
238+
width: 100%;
239+
text-align: center;
240+
font-size: 3em;
241+
color: @gray;
242+
position: absolute;
243+
top: 60%;
244+
span {
245+
color: white;
246+
display: none;
247+
}
248+
}
234249
}

stylesheets/skrollr.css

Lines changed: 60 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
nav { -skrollr-animation-name: nav; }
2+
nav a[href='#about'] { -skrollr-animation-name: nav-about; }
3+
nav a[href='#team'] { -skrollr-animation-name: nav-team; }
4+
nav a[href='#photos'] { -skrollr-animation-name: nav-photos; }
5+
nav a[href='#docs'] { -skrollr-animation-name: nav-docs; }
26
#mini-logo { -skrollr-animation-name: mini-logo; }
37
header { -skrollr-animation-name: header; }
48
#lightbulb { -skrollr-animation-name: lightbulb; }
@@ -10,6 +14,12 @@ header { -skrollr-animation-name: header; }
1014
#clock { -skrollr-animation-name: clock; }
1115
#clock .clock-hour { -skrollr-animation-name: clock-hour; }
1216
#clock .clock-minute { -skrollr-animation-name: clock-minute; }
17+
#switchable-is { -skrollr-animation-name: switchable-is; }
18+
#alarm-clock { -skrollr-animation-name: alarm-clock; }
19+
#app { -skrollr-animation-name: app; }
20+
#device { -skrollr-animation-name: device; }
21+
#design-project { -skrollr-animation-name: design-project; }
22+
1323

1424
@-skrollr-keyframes nav {
1525
0 {
@@ -20,6 +30,21 @@ header { -skrollr-animation-name: header; }
2030
}
2131
}
2232

33+
@-skrollr-keyframes nav-about {
34+
0 {
35+
color[begin]: rgb(170, 170, 170);
36+
//border-bottom-width[begin]: 0px;
37+
}
38+
1000 {
39+
color[begin]: rgb(101, 151, 207);
40+
//border-bottom-width[begin]: 1px;
41+
}
42+
5500 {
43+
color[begin]: rgb(170, 170, 170);
44+
//border-bottom-width[end]: 0px;
45+
}
46+
}
47+
2348
@-skrollr-keyframes mini-logo {
2449
0 {
2550
width: 0em;
@@ -138,10 +163,40 @@ header { -skrollr-animation-name: header; }
138163
}
139164

140165
@-skrollr-keyframes clock-minute {
141-
2600 {
142-
transform: rotate(90deg);
143-
}
144-
5500 {
145-
transform: rotate(1170deg);
166+
2600 { transform: rotate(90deg); }
167+
5500 { transform: rotate(1170deg); }
168+
}
169+
170+
@-skrollr-keyframes switchable-is {
171+
2500 { top[cubic]: 60%; }
172+
5500 { top[cubic]: 80%; }
173+
174+
}
175+
176+
@-skrollr-keyframes alarm-clock {
177+
0 { display: inline; }
178+
3500 { display: none; }
179+
}
180+
181+
@-skrollr-keyframes app {
182+
2500 { display: none; }
183+
3500 { display: inline; }
184+
4000 { display: none; }
185+
}
186+
187+
@-skrollr-keyframes device {
188+
2500 { display: none; }
189+
4000 { display: inline; }
190+
4500 { display: none; }
191+
}
192+
193+
@-skrollr-keyframes design-project {
194+
2500 { display: none; }
195+
4500 {
196+
display: inline;
197+
color: white;
198+
}
199+
5000 {
200+
color: !#87b9ef;
146201
}
147202
}

0 commit comments

Comments
 (0)