From cfaf12cd638136b8e57576b1eb6485569d714e6a Mon Sep 17 00:00:00 2001 From: TheME Date: Tue, 6 Jun 2017 18:35:19 +0200 Subject: [PATCH 1/8] Update queryads.js --- scripts/pi-hole/js/queryads.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 1b328566..afd9433f 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -122,3 +122,20 @@ $("#btnSearchExact").on("click", function() { exact = "exact"; eventsource(); }); + +// Wrap form-group's buttons to next line when viewed on a small screen +$(window).on('resize',function() { + if ($(window).width() < 991) { + $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); + $(".form-group.input-group-block > input").css("margin-bottom", "5px"); + $(".input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); + } + else { + $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" ); + $(".form-group.input-group > input").css("margin-bottom",""); + $(".input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); + } +}); +$(document).ready(function() { + $(window).trigger('resize'); +}); From 4e06783cb262f29a9eacf4f1a4353a2e1c1c063a Mon Sep 17 00:00:00 2001 From: TheME Date: Tue, 6 Jun 2017 18:37:30 +0200 Subject: [PATCH 2/8] Update list.js --- scripts/pi-hole/js/list.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js index 00a0b2ef..910709ee 100644 --- a/scripts/pi-hole/js/list.js +++ b/scripts/pi-hole/js/list.js @@ -208,11 +208,19 @@ $(function(){ }); }); -$(document).ready(function () { - if (screen.width < 576) { - $(".input-group-btn").css("display", "initial"); +// Wrap form-group's buttons to next line when viewed on a small screen +$(window).on('resize',function() { + if ($(window).width() < 991) { + $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); + $(".form-group.input-group-block > input").css("margin-bottom", "5px"); + $(".input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); } else { - $(".input-group-btn").css("display", "table-cell"); + $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" ); + $(".form-group.input-group > input").css("margin-bottom",""); + $(".input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); } }); +$(document).ready(function() { + $(window).trigger('resize'); +}); From fb7df298c00b5b55f82eff3cb5424b5e59b885ee Mon Sep 17 00:00:00 2001 From: TheME Date: Tue, 6 Jun 2017 19:21:09 +0200 Subject: [PATCH 3/8] queryads.js: codacy fixes --- scripts/pi-hole/js/queryads.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index afd9433f..5e09f4c0 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -124,7 +124,7 @@ $("#btnSearchExact").on("click", function() { }); // Wrap form-group's buttons to next line when viewed on a small screen -$(window).on('resize',function() { +$(window).on("resize",function() { if ($(window).width() < 991) { $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); $(".form-group.input-group-block > input").css("margin-bottom", "5px"); @@ -137,5 +137,5 @@ $(window).on('resize',function() { } }); $(document).ready(function() { - $(window).trigger('resize'); + $(window).trigger("resize"); }); From 5b6c025de32cd884ec776c9a342b391c2fb1d4be Mon Sep 17 00:00:00 2001 From: TheME Date: Tue, 6 Jun 2017 19:22:00 +0200 Subject: [PATCH 4/8] list.js: codacy fixes --- scripts/pi-hole/js/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js index 910709ee..793a4560 100644 --- a/scripts/pi-hole/js/list.js +++ b/scripts/pi-hole/js/list.js @@ -209,7 +209,7 @@ $(function(){ }); // Wrap form-group's buttons to next line when viewed on a small screen -$(window).on('resize',function() { +$(window).on("resize",function() { if ($(window).width() < 991) { $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); $(".form-group.input-group-block > input").css("margin-bottom", "5px"); @@ -222,5 +222,5 @@ $(window).on('resize',function() { } }); $(document).ready(function() { - $(window).trigger('resize'); + $(window).trigger("resize"); }); From 07e2ef6f6d699a1681425ee0b5e883d2ca3896e5 Mon Sep 17 00:00:00 2001 From: TheME Date: Tue, 6 Jun 2017 20:47:35 +0200 Subject: [PATCH 5/8] list.js: small correction --- scripts/pi-hole/js/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js index 793a4560..fb344314 100644 --- a/scripts/pi-hole/js/list.js +++ b/scripts/pi-hole/js/list.js @@ -213,12 +213,12 @@ $(window).on("resize",function() { if ($(window).width() < 991) { $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); $(".form-group.input-group-block > input").css("margin-bottom", "5px"); - $(".input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); + $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); } else { $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" ); $(".form-group.input-group > input").css("margin-bottom",""); - $(".input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); + $(".form-group.input-group > .input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); } }); $(document).ready(function() { From 89864baa769f2a2e91a7f596fee245f49d97c5c0 Mon Sep 17 00:00:00 2001 From: TheME Date: Tue, 6 Jun 2017 20:48:39 +0200 Subject: [PATCH 6/8] queryads.js: small correction --- scripts/pi-hole/js/queryads.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 5e09f4c0..96f97629 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -123,17 +123,18 @@ $("#btnSearchExact").on("click", function() { eventsource(); }); +// Wrap form-group's buttons to next line when viewed on a small screen // Wrap form-group's buttons to next line when viewed on a small screen $(window).on("resize",function() { if ($(window).width() < 991) { $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); $(".form-group.input-group-block > input").css("margin-bottom", "5px"); - $(".input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); + $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); } else { $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" ); $(".form-group.input-group > input").css("margin-bottom",""); - $(".input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); + $(".form-group.input-group > .input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); } }); $(document).ready(function() { From 3ab8c8d0f94c587baeaa011339cdf7fd5de1ac07 Mon Sep 17 00:00:00 2001 From: TheME Date: Mon, 19 Jun 2017 11:29:50 +0200 Subject: [PATCH 7/8] queryads.js: Update* * removed double comment and updated code to center and separate the buttons on small screens, like in my last screenshot. --- scripts/pi-hole/js/queryads.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js index 96f97629..5d56068f 100644 --- a/scripts/pi-hole/js/queryads.js +++ b/scripts/pi-hole/js/queryads.js @@ -123,18 +123,17 @@ $("#btnSearchExact").on("click", function() { eventsource(); }); -// Wrap form-group's buttons to next line when viewed on a small screen // Wrap form-group's buttons to next line when viewed on a small screen $(window).on("resize",function() { if ($(window).width() < 991) { $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); $(".form-group.input-group-block > input").css("margin-bottom", "5px"); - $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); + $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("btn-block text-center"); } else { $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" ); $(".form-group.input-group > input").css("margin-bottom",""); - $(".form-group.input-group > .input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); + $(".form-group.input-group > .btn-block.text-center").removeClass("btn-block text-center").addClass("input-group-btn"); } }); $(document).ready(function() { From 53068e0fef07c3ed96431ab1037004ec0bd7c5a1 Mon Sep 17 00:00:00 2001 From: TheME Date: Mon, 19 Jun 2017 11:31:46 +0200 Subject: [PATCH 8/8] list.js: update* updated code to center and separate the buttons on small screens, like in my last screenshot. --- scripts/pi-hole/js/list.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js index fb344314..5e89b995 100644 --- a/scripts/pi-hole/js/list.js +++ b/scripts/pi-hole/js/list.js @@ -213,12 +213,12 @@ $(window).on("resize",function() { if ($(window).width() < 991) { $(".form-group.input-group").removeClass("input-group").addClass("input-group-block"); $(".form-group.input-group-block > input").css("margin-bottom", "5px"); - $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("input-group-btn-block btn-group"); + $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("btn-block text-center"); } else { $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" ); $(".form-group.input-group > input").css("margin-bottom",""); - $(".form-group.input-group > .input-group-btn-block").removeClass("input-group-btn-block btn-group").addClass("input-group-btn"); + $(".form-group.input-group > .btn-block.text-center").removeClass("btn-block text-center").addClass("input-group-btn"); } }); $(document).ready(function() {