Skip to content

Commit 2023803

Browse files
committed
Add compatibility with flex and animations for web browsers
1 parent 51dc329 commit 2023803

File tree

5 files changed

+147
-70
lines changed

5 files changed

+147
-70
lines changed

css/index.css

Lines changed: 84 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,25 @@ html.sr .load-hidden {
167167
z-index: 100;
168168
}
169169
.navigation .nav {
170+
display: -webkit-box;
171+
/* OLD - iOS 6-, Safari 3.1-6, BB7 */
172+
display: -ms-flexbox;
173+
/* TWEENER - IE 10 */
174+
display: -webkit-flex;
175+
/* NEW - Safari 6.1+. iOS 7.1+, BB10 */
170176
display: flex;
171177
justify-content: flex-end;
172178
align-items: center;
173179
width: 100%;
174180
padding: 0px 5%;
175181
}
176182
.navigation .nav .hamburger {
183+
display: -webkit-box;
184+
/* OLD - iOS 6-, Safari 3.1-6, BB7 */
185+
display: -ms-flexbox;
186+
/* TWEENER - IE 10 */
187+
display: -webkit-flex;
188+
/* NEW - Safari 6.1+. iOS 7.1+, BB10 */
177189
display: flex;
178190
flex-direction: column;
179191
align-items: flex-end;
@@ -206,6 +218,12 @@ html.sr .load-hidden {
206218
width: 40px;
207219
}
208220
.navigation .sideNav nav {
221+
display: -webkit-box;
222+
/* OLD - iOS 6-, Safari 3.1-6, BB7 */
223+
display: -ms-flexbox;
224+
/* TWEENER - IE 10 */
225+
display: -webkit-flex;
226+
/* NEW - Safari 6.1+. iOS 7.1+, BB10 */
209227
display: flex;
210228
justify-content: center;
211229
align-items: center;
@@ -309,123 +327,155 @@ header .jumboTxt p {
309327
}
310328
.fishAnimation .jellyfish {
311329
top: 0;
312-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 30s linear infinite alternate;
330+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 30s 0s linear infinite reverse;
331+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 30s 0s linear infinite reverse;
313332
}
314333
@media (max-width: 501px) {
315334
.fishAnimation .jellyfish {
316-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s linear infinite alternate;
335+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite reverse;
336+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite reverse;
317337
}
318338
}
319339
.fishAnimation .normFish2 {
320340
top: 40%;
321-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 4s infinite normal;
341+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
342+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
322343
}
323344
.fishAnimation .dolphin {
324345
top: 80%;
325346
width: 250px;
326-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 5s infinite reverse;
347+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 5s linear infinite reverse;
348+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 5s linear infinite reverse;
327349
}
328350
@media (max-width: 501px) {
329351
.fishAnimation .dolphin {
330-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 5s infinite reverse;
352+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 5s linear infinite reverse;
353+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 5s linear infinite reverse;
331354
}
332355
}
333356
.fishAnimation .puffer {
334357
top: 0;
335358
width: 100px;
359+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 7s linear infinite normal;
336360
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 7s linear infinite normal;
337361
transform: scaleX(-1);
338362
}
339363
@media (max-width: 501px) {
340364
.fishAnimation .puffer {
365+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 7s linear infinite normal;
341366
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 7s linear infinite normal;
342367
}
343368
}
344369
.fishAnimation .school {
345370
top: 20%;
346371
width: 250px;
347-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s infinite normal;
372+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
373+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
348374
}
349375
.fishAnimation .spiny {
350376
top: 50%;
351-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 3s infinite reverse;
377+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 2s linear infinite reverse;
378+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 2s linear infinite reverse;
352379
}
353380
.fishAnimation .sword {
354381
top: 85%;
355382
width: 300px;
383+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 2s linear infinite reverse;
356384
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 2s linear infinite reverse;
357385
transform: rotate(-15deg);
358386
}
359387
@media (max-width: 501px) {
360388
.fishAnimation .sword {
389+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 2s linear infinite reverse;
361390
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 2s linear infinite reverse;
362391
}
363392
}
364393
.fishAnimation .normFish3 {
365394
top: 0;
395+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 5s linear infinite normal;
366396
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 5s linear infinite normal;
367397
}
368398
@media (max-width: 501px) {
369399
.fishAnimation .normFish3 {
400+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 5s linear infinite normal;
370401
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 5s linear infinite normal;
371402
}
372403
}
373404
.fishAnimation .seahorse {
374405
width: 90px;
375406
top: 70%;
407+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 5s linear infinite reverse;
376408
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 5s linear infinite reverse;
377409
}
378410
@media (max-width: 501px) {
379411
.fishAnimation .seahorse {
380412
top: 80%;
413+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 5s linear infinite reverse;
381414
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 5s linear infinite reverse;
382415
}
383416
}
384417
.fishAnimation .shark {
385418
top: 0;
386-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s linear infinite normal;
419+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
420+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
387421
width: 330px;
388422
transform: scale(1.3);
389423
}
390424
@media (max-width: 501px) {
391425
.fishAnimation .shark {
392426
top: -5%;
393427
height: 410px;
428+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 9s 2s linear infinite normal;
394429
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 9s 2s linear infinite normal;
395430
}
396431
}
397432
.fishAnimation .normFish {
398433
top: 20%;
399-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s linear infinite normal;
434+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
435+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite normal;
400436
}
401437
.fishAnimation .bass {
402438
top: 0;
403-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s linear infinite reverse;
439+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite reverse;
440+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite reverse;
404441
}
405442
@media (max-width: 501px) {
406443
.fishAnimation .bass {
407-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s linear infinite reverse;
444+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 0s linear infinite reverse;
445+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 0s linear infinite reverse;
408446
}
409447
}
410448
.fishAnimation .norm {
411449
top: 10%;
450+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 2s linear infinite normal;
412451
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 2s linear infinite normal;
413452
}
414453
@media (max-width: 501px) {
415454
.fishAnimation .norm {
455+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 2s linear infinite normal;
416456
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 2s linear infinite normal;
417457
}
418458
}
419459
.fishAnimation .whale {
420460
top: 80%;
421-
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s linear infinite reverse;
461+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite reverse;
462+
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 15s 0s linear infinite reverse;
422463
transform: scale(3) scaleX(-1);
423464
}
424465
@media (max-width: 501px) {
425466
.fishAnimation .whale {
467+
-webkit-animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 4s linear infinite reverse;
426468
animation: SwimUpDown 1.5s infinite alternate, MoveOnScreen 7s 4s linear infinite reverse;
427469
}
428470
}
471+
@-webkit-keyframes SwimUpDown {
472+
0% {
473+
margin-top: 0;
474+
}
475+
100% {
476+
margin-top: 25px;
477+
}
478+
}
429479
@keyframes SwimUpDown {
430480
0% {
431481
margin-top: 0;
@@ -434,6 +484,16 @@ header .jumboTxt p {
434484
margin-top: 25px;
435485
}
436486
}
487+
@-webkit-keyframes MoveOnScreen {
488+
0% {
489+
opacity: 1;
490+
margin-left: -70%;
491+
}
492+
100% {
493+
margin-left: 120%;
494+
opacity: 1;
495+
}
496+
}
437497
@keyframes MoveOnScreen {
438498
0% {
439499
opacity: 1;
@@ -480,6 +540,12 @@ header .jumboTxt p {
480540
.home #projects .stage {
481541
list-style: none;
482542
padding: 0;
543+
display: -webkit-box;
544+
/* OLD - iOS 6-, Safari 3.1-6, BB7 */
545+
display: -ms-flexbox;
546+
/* TWEENER - IE 10 */
547+
display: -webkit-flex;
548+
/* NEW - Safari 6.1+. iOS 7.1+, BB10 */
483549
display: flex;
484550
justify-content: space-around;
485551
flex-wrap: wrap;
@@ -520,6 +586,12 @@ header .jumboTxt p {
520586
background-size: cover;
521587
background-repeat: no-repeat;
522588
box-shadow: inset 0px 0px 40px rgba(255, 255, 255, 0);
589+
display: -webkit-box;
590+
/* OLD - iOS 6-, Safari 3.1-6, BB7 */
591+
display: -ms-flexbox;
592+
/* TWEENER - IE 10 */
593+
display: -webkit-flex;
594+
/* NEW - Safari 6.1+. iOS 7.1+, BB10 */
523595
display: flex;
524596
justify-content: center;
525597
align-items: center;

0 commit comments

Comments
 (0)