From 776920ad028440ddcbb0a6f64dde515323768216 Mon Sep 17 00:00:00 2001 From: Andy Strain Date: Thu, 22 Aug 2019 13:07:38 -0400 Subject: [PATCH 01/14] Got rid of bootstrap.min.js --- static/css/custom.css | 45 +++++++++++++++++++++++++++++++ templates/_includes/comments.html | 23 ++++++++-------- templates/base.html | 6 ++--- templates/categories.html | 45 ++++++++++++++++--------------- 4 files changed, 82 insertions(+), 37 deletions(-) diff --git a/static/css/custom.css b/static/css/custom.css index e69de29b..1fec058f 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -0,0 +1,45 @@ +.container-fluid input, .accordion-heading input, accordion-heading input { + position: absolute; + opacity: 0; + z-index: -1; +} + +form.navbar-search input.search-query { + position: unset; + opacity: unset; + z-index: unset; +} +.disqus-comments { + font-family: "Trebuchet MS", Trebuchet, "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, Sans-Serif; + font-size: 0.9em; +} + +.disqus-comment-count span { + position: relative; + content: 'Comments'; +} + +input:checked + .disqus-comment-count span { + display: none; +} + +input:checked + .disqus-comment-count::after { + content: 'Click here to hide comments'; +} + +input:checked ~ .collapse { + height: auto; +} + +@media screen and (max-width: 979px) { + .nav-collapse .navbar-search { + padding-top: 0px; + padding-bottom: 0px; + margin-top: 0px; + margin-bottom: 0px; + } + input:checked ~ .nav-collapse { + height: 100%; + } +} + diff --git a/templates/_includes/comments.html b/templates/_includes/comments.html index 6b46bc91..1bfe0511 100644 --- a/templates/_includes/comments.html +++ b/templates/_includes/comments.html @@ -17,22 +17,21 @@
- + -
-
-
-
- {% from '_includes/disqus_scripts.html' import disqus_comments_script with context %} - {{ disqus_comments_script(article) }} + {% endif %}> + Comments + +
+
+
+ {% from '_includes/disqus_scripts.html' import disqus_comments_script with context %} + {{ disqus_comments_script(article) }} +
diff --git a/templates/base.html b/templates/base.html index 397a1e62..d54f8fef 100644 --- a/templates/base.html +++ b/templates/base.html @@ -56,11 +56,12 @@
- + + + {{ SITENAME }}
    @@ -104,7 +105,6 @@ {% include '_includes/bestazon.html' %} {% endif %} - + - + {% endmacro %} diff --git a/templates/base.html b/templates/base.html index f3fe110a..d55aaf08 100644 --- a/templates/base.html +++ b/templates/base.html @@ -105,7 +105,6 @@ {% include '_includes/bestazon.html' %} {% endif %} - - - {% endblock script %} From 7192432be58034a4d9d6020c8ca058e13ad7a0a3 Mon Sep 17 00:00:00 2001 From: Andrew Strain Date: Thu, 5 Sep 2019 05:15:10 -0400 Subject: [PATCH 10/14] fix(bootstrap.min.js): close accordion when already open --- templates/categories.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/templates/categories.html b/templates/categories.html index 0624661a..5674e4c4 100644 --- a/templates/categories.html +++ b/templates/categories.html @@ -43,7 +43,7 @@

    All Categories

    {% for category, articles in categories %}
    - +

    All Categories

    {% endblock content %} {% block script %} {{ super() }} + {% endblock script %} From c50d5d796471355aeb8620a7adddf737e7cab188 Mon Sep 17 00:00:00 2001 From: Andrew Strain Date: Mon, 9 Sep 2019 04:31:30 -0400 Subject: [PATCH 11/14] fix(bootstrap.min.js): hide checkbox in navbar --- static/css/custom.css | 8 +------- templates/base.html | 4 ++-- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/static/css/custom.css b/static/css/custom.css index 1b9bfe84..aa2d1827 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -1,12 +1,6 @@ /* Top, right navigation button */ input[type=checkbox]#btn-navbar-checkbox { - opacity: 0; - float: right; - position: relative; - left: -43px; - top: 2px; - height: 30px; - width: 38px; + display: none; } input[type=checkbox]#btn-navbar-checkbox:not(:checked) ~ .collapse { diff --git a/templates/base.html b/templates/base.html index aa8f8844..5ddf1874 100644 --- a/templates/base.html +++ b/templates/base.html @@ -56,11 +56,11 @@
    - + + {{ SITENAME }}
      From 4443935279b0b5d4d6b80343479867210f603d46 Mon Sep 17 00:00:00 2001 From: Andrew Strain Date: Wed, 11 Sep 2019 07:14:18 -0400 Subject: [PATCH 12/14] fix(bootstraip.min.js): git rid of html5validator error --- static/css/custom.css | 4 ++++ templates/categories.html | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/static/css/custom.css b/static/css/custom.css index aa2d1827..2d958a39 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -15,6 +15,10 @@ input[type=checkbox]#btn-navbar-checkbox:not(:checked) ~ .collapse { margin-bottom: unset; } +.accordion .accordion-group .accordion-heading label { + margin-bottom: initial; +} + /* radio type accordion */ .accordion .accordion-group input[type=radio] { display: none; diff --git a/templates/categories.html b/templates/categories.html index 5674e4c4..e01cd961 100644 --- a/templates/categories.html +++ b/templates/categories.html @@ -45,12 +45,12 @@

      All Categories

      - {% set num = articles|count %} {{ category }}{{ num }} - +
      From c0f3a0dbb728e21b6e2c7ff2f58d6a9c688e94d0 Mon Sep 17 00:00:00 2001 From: Andrew Strain Date: Wed, 11 Sep 2019 07:54:30 -0400 Subject: [PATCH 13/14] fix(bootstrap.min.js): prettier CSS --- static/css/custom.css | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/static/css/custom.css b/static/css/custom.css index 2d958a39..adb10661 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -1,9 +1,9 @@ /* Top, right navigation button */ -input[type=checkbox]#btn-navbar-checkbox { +input[type="checkbox"]#btn-navbar-checkbox { display: none; } -input[type=checkbox]#btn-navbar-checkbox:not(:checked) ~ .collapse { +input[type="checkbox"]#btn-navbar-checkbox:not(:checked) ~ .collapse { height: auto; } @@ -20,32 +20,36 @@ input[type=checkbox]#btn-navbar-checkbox:not(:checked) ~ .collapse { } /* radio type accordion */ -.accordion .accordion-group input[type=radio] { +.accordion .accordion-group input[type="radio"] { display: none; } -.accordion .accordion-group input[type=radio] ~ .collapse { +.accordion .accordion-group input[type="radio"] ~ .collapse { height: 0; } -.accordion .accordion-group input[type=radio]:checked ~ .collapse { +.accordion .accordion-group input[type="radio"]:checked ~ .collapse { height: auto; } /* checkbox type accordion */ -.accordion .accordion-group input[type=checkbox] { +.accordion .accordion-group input[type="checkbox"] { display: none; } -.accordion .accordion-group input[type=checkbox]:not(:checked) ~ .collapse { +.accordion .accordion-group input[type="checkbox"]:not(:checked) ~ .collapse { height: auto; } /* Disqus comment text */ -input[type=checkbox]#comment-accordion-toggle-checkbox:not(:checked) ~ .accordion-heading #comment-accordion-toggle::before { +input[type="checkbox"]#comment-accordion-toggle-checkbox:not(:checked) + ~ .accordion-heading + #comment-accordion-toggle::before { content: "Click here to hide comments"; } -input[type=checkbox]#comment-accordion-toggle-checkbox:checked ~ .accordion-heading #comment-accordion-toggle::before { +input[type="checkbox"]#comment-accordion-toggle-checkbox:checked + ~ .accordion-heading + #comment-accordion-toggle::before { content: "Comments"; } From 083167e7d2cb5ffbb3a1f7a27b70240a474ae10d Mon Sep 17 00:00:00 2001 From: Andrew Strain Date: Sat, 14 Sep 2019 03:48:45 -0400 Subject: [PATCH 14/14] fix(boostrap.min.js): open comment section on comment permalink --- templates/_includes/comments.html | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/templates/_includes/comments.html b/templates/_includes/comments.html index 578bf18f..cf942127 100644 --- a/templates/_includes/comments.html +++ b/templates/_includes/comments.html @@ -62,14 +62,10 @@
      Comments
      {% macro comments_script() %} {% endmacro %}