Merge remote-tracking branch 'hkoivuneva/master'
diff --git a/img/cd-icon-arrow.svg b/img/cd-icon-arrow.svg
index d9148b6..446df79 100644
--- a/img/cd-icon-arrow.svg
+++ b/img/cd-icon-arrow.svg
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
- .st0{fill:#BBBBBB;}
-</style>
-<g>
- <polygon class="st0" points="0.9,5.5 3.1,3.4 8,8.3 12.9,3.4 15.1,5.5 8,12.6 "/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#BBBBBB;}
+</style>
+<g>
+ <polygon class="st0" points="0.9,5.5 3.1,3.4 8,8.3 12.9,3.4 15.1,5.5 8,12.6 "/>
+</g>
+</svg>
diff --git a/img/cd-icon-check.svg b/img/cd-icon-check.svg
index 358aae8..2bcd4d2 100644
--- a/img/cd-icon-check.svg
+++ b/img/cd-icon-check.svg
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
- .st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
-</style>
-<polyline class="st0" points="4,7 7,10 12,5 "/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:none;stroke:#FFFFFF;stroke-width:2;stroke-miterlimit:10;}
+</style>
+<polyline class="st0" points="4,7 7,10 12,5 "/>
+</svg>
diff --git a/img/cd-icon-filter.svg b/img/cd-icon-filter.svg
index d4c5e73..9b382b3 100644
--- a/img/cd-icon-filter.svg
+++ b/img/cd-icon-filter.svg
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
-<style type="text/css">
- .st0{fill:#8F83B8;}
-</style>
-<g>
- <rect x="10" y="3" class="st0" width="6" height="2"/>
- <polygon class="st0" points="3,7 9,7 9,1 3,1 3,3 0,3 0,5 3,5 "/>
- <rect y="11" class="st0" width="6" height="2"/>
- <polygon class="st0" points="13,9 7,9 7,15 13,15 13,13 16,13 16,11 13,11 "/>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#8F83B8;}
+</style>
+<g>
+ <rect x="10" y="3" class="st0" width="6" height="2"/>
+ <polygon class="st0" points="3,7 9,7 9,1 3,1 3,3 0,3 0,5 3,5 "/>
+ <rect y="11" class="st0" width="6" height="2"/>
+ <polygon class="st0" points="13,9 7,9 7,15 13,15 13,13 16,13 16,11 13,11 "/>
+</g>
+</svg>
diff --git a/index.html b/index.html
index 42d59f3..c8755b4 100644
--- a/index.html
+++ b/index.html
@@ -11,11 +11,10 @@
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
- <link href="https:" fonts.googleapis.com css?family="Comfortaa:400,700,300|Quattrocento" rel="stylesheet">
+ <link href=https://fonts.googleapis.com/css?family=Comfortaa:400,700,300 rel="stylesheet">
<link rel="stylesheet" type="text/css" href="css/style.css">
<link rel="stylesheet" href="css/styles_filter.css">
<script src="js/modernizr.js"></script>
- <script src="js/modernizr.js"></script>
<title>Bliss OS</title>
</head>
<body>
@@ -930,41 +929,41 @@
<script src="js/mainani.js" type="text/javascript"></script>
<script src="js/script.js" type="text/javascript"></script>
<script type="text/javascript">
- // Select all links with hashes
- $('a[href*="#"]')
- // Remove links that don't actually link to anything
- .not('[href="#"]')
- .not('[href="#0"]')
- .click(function(event) {
- // On-page links
- if (
- location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') &&
- location.hostname == this.hostname
- ) {
+ // Select all links with hashes
+ $('a[href*="#"]')
+ // Remove links that don't actually link to anything
+ .not('[href="#"]')
+ .not('[href="#0"]')
+ .click(function(event) {
+ // On-page links
+ if (
+ location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') &&
+ location.hostname == this.hostname
+ ) {
// Figure out element to scroll to
var target = $(this.hash);
target = target.length ? target : $('[name=' + this.hash.slice(1) + ']');
- // Does a scroll target exist?
- if (target.length) {
- // Only prevent default if animation is actually gonna happen
- event.preventDefault();
- $('html, body').animate({
- scrollTop: target.offset().top
- }, 1000, function() {
- // Callback after animation
- // Must change focus!
- var $target = $(target);
- $target.focus();
- if ($target.is(":focus")) { // Checking if the target was focused
- return false;
- } else {
- $target.attr('tabindex', '-1'); // Adding tabindex for elements not focusable
- $target.focus(); // Set focus again
- };
- });
+ // Does a scroll target exist?
+ if (target.length) {
+ // Only prevent default if animation is actually gonna happen
+ event.preventDefault();
+ $('html, body').animate({
+ scrollTop: target.offset().top
+ }, 1000, function() {
+ // Callback after animation
+ // Must change focus!
+ var $target = $(target);
+ $target.focus();
+ if ($target.is(":focus")) { // Checking if the target was focused
+ return false;
+ } else {
+ $target.attr('tabindex', '-1'); // Adding tabindex for elements not focusable
+ $target.focus(); // Set focus again
+ };
+ });
+ }
}
- }
- });
- </script>
+ });
+ </script>
</body>
</html>
