Bug 11327: fixed

diff --git a/static/css/style.css b/static/css/style.css
index d2de598c055f9af2fb70c2458ac3eabf39e8ccca..9e256be26dcbf8e9dea5daabc4c90a15b6ddbbec 100644 (file)
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -4,7 +4,7 @@
  * Copyright 2011-2017 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
-@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,700");
+@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,500");
 /*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
 html {
   font-family: sans-serif;

diff --git a/static/js/site-min.js b/static/js/site-min.js
index 1b912a8faa6892501f4795143aba97c30dfe593a..408634ae50f85247411b6a545f229015b7e0736c 100644 (file)
--- a/static/js/site-min.js
+++ b/static/js/site-min.js
@@ -1 +1 @@
-function getCookie(o){var e=document.cookie.match("\\b"+o+"=([^;]*)\\b");return e?e[1]:void 0}$("#scrollto").click(function(){$("html, body").animate({scrollTop:$("#features").offset().top-72},1500,"easeInOutExpo")}),$(document).ready(function(){$(window).scroll(function(){$(document).scrollTop()>100?($(".fixed-top").addClass("scrolled"),$(".menu-text").addClass("hidden")):($(".fixed-top").removeClass("scrolled"),$(".menu-text").removeClass("hidden"))})}),$.query=function(o){return new RegExp("[\\?&]"+o+"=([^&#]*)").exec(window.location.href)[1]||0},$("a.download-splash").click(function(o){o.preventDefault(),linkLocation=this.href,window.location="http://downloads.ipfire.org/download-splash?file="+linkLocation}),/.*download-splash.*/i.test(window.location.href)&&$("p.download-path").ready(function(){var o=!1,e=["http://downloads.ipfire.org/"],n=$.query("file");for(i in e)prefix=e[i],n.substring(0,prefix.length)==prefix&&(o=!0);o&&($("p.download-path").prepend($("<a>",{href:encodeURI(n),text:n})),setTimeout(function(){window.location=n},"2000"))}),jQuery.postJSON=function(url,args,callback){args._xsrf=getCookie("_xsrf"),$.ajax({url:url,data:$.param(args),dataType:"text",type:"POST",success:function(response){callback(eval("("+response+")"))}})};
\ No newline at end of file
+function getCookie(o){var e=document.cookie.match("\\b"+o+"=([^;]*)\\b");return e?e[1]:void 0}$(document).ready(function(){$(window).scroll(function(){$(document).scrollTop()>100?($(".fixed-top").addClass("scrolled"),$(".menu-text").addClass("hidden")):($(".fixed-top").removeClass("scrolled"),$(".menu-text").removeClass("hidden"))}),$("#scrollto").click(function(){$("html, body").animate({scrollTop:$("#features").offset().top-72},1500,"easeInOutExpo")})}),$.query=function(o){return new RegExp("[\\?&]"+o+"=([^&#]*)").exec(window.location.href)[1]||0},$("a.download-splash").click(function(o){o.preventDefault(),linkLocation=this.href,window.location="http://downloads.ipfire.org/download-splash?file="+linkLocation}),/.*download-splash.*/i.test(window.location.href)&&$("p.download-path").ready(function(){var o=!1,e=["http://downloads.ipfire.org/"],n=$.query("file");for(i in e)prefix=e[i],n.substring(0,prefix.length)==prefix&&(o=!0);o&&($("p.download-path").prepend($("<a>",{href:encodeURI(n),text:n})),setTimeout(function(){window.location=n},"2000"))}),jQuery.postJSON=function(url,args,callback){args._xsrf=getCookie("_xsrf"),$.ajax({url:url,data:$.param(args),dataType:"text",type:"POST",success:function(response){callback(eval("("+response+")"))}})};
\ No newline at end of file

diff --git a/static/js/site.js b/static/js/site.js
index 1b9b8f7835c89888392cfdbbd061d126bf11f7c0..6c27e83b44b18ab733173a6f4072cb76a2cc3b9a 100644 (file)
--- a/static/js/site.js
+++ b/static/js/site.js
@@ -1,9 +1,3 @@
-$("#scrollto").click(function() {
-    $('html, body').animate({
-        scrollTop: $("#features").offset().top -72
-    }, 1500, 'easeInOutExpo');
-});
-
 $(document).ready(function () {
     $(window).scroll(function () {
         if ($(document).scrollTop() > 100) {
@@ -14,6 +8,12 @@ $(document).ready(function () {
             $(".menu-text").removeClass("hidden");
         }
     });
+    
+    $("#scrollto").click(function() {
+           $('html, body').animate({
+               scrollTop: $("#features").offset().top -72
+           }, 1500, 'easeInOutExpo');
+       });
 });
 
 $.query = function(name){

diff --git a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-grid.css b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-grid.css
index b493d452022983f50357f04d7d1f781a5c2c527f..911e92fbb9b174b539e3a0bf4034ae7c4b9e8604 100644 (file)
--- a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-grid.css
+++ b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-grid.css
@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,700");
+@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,500");
 @-ms-viewport {
   width: device-width; }
 

diff --git a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-reboot.css b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-reboot.css
index 62b4122279d72a0a047ad027b73fd5b56815868f..e0a9747fc89df9f5d81ccec7f006afc4f1c1919a 100644 (file)
--- a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-reboot.css
+++ b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap-reboot.css
@@ -1,4 +1,4 @@
-@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,700");
+@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,500");
 /*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
 html {
   font-family: sans-serif;

diff --git a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css
index 91079d5c056d9cb90c1481c685c3af42718ac8eb..e7175654666b4e542ec11b489ba574eb91f037be 100644 (file)
--- a/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css
+++ b/static/scss/bootstrap-4.0.0-alpha.6/css/bootstrap.css
@@ -4,7 +4,7 @@
  * Copyright 2011-2017 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
-@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,700");
+@import url("https://fonts.googleapis.com/css?family=Ubuntu:300,400,500");
 /*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
 html {
   font-family: sans-serif;

diff --git a/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss b/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss
index 7584fe4d05f26555777ac53435bcdd63d1c44bb0..aaf29a9dc74d2ee00c79293e0075ed63917ff0a4 100755 (executable)
--- a/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss
+++ b/static/scss/bootstrap-4.0.0-alpha.6/scss/_custom.scss
@@ -96,7 +96,7 @@ $grid-gutter-widths: (
 
 // Fonts
 
-@import url('https://fonts.googleapis.com/css?family=Ubuntu:300,400,700');
+@import url('https://fonts.googleapis.com/css?family=Ubuntu:300,400,500');
 $font-family-sans-serif: 'Ubuntu', sans-serif;
 $font-family-base:       $font-family-sans-serif;