From 3b6261b45c0cd4c2e2db1bd35858be8623f57c89 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Wed, 3 Apr 2024 14:27:49 -0500 Subject: [PATCH] style: :lipstick: format other files Signed-off-by: Eric Nemchik --- .../Android-SHIELD-Android-TV.xml | 31 ++++++---- docs/manifest.webmanifest | 12 ++-- docs/requirements.txt | 2 +- docs/stylesheets/extra.css | 16 ++--- docs/stylesheets/github-permalink-style.css | 59 +++++++++++-------- includes/flowcharts/radarr-flowchart.drawio | 2 +- includes/hardlinks/docker-iptables-fix.sh | 29 +++++---- overrides/main.html | 21 ++++--- 8 files changed, 97 insertions(+), 75 deletions(-) diff --git a/docs/Plex/profiles/Android-SHIELD/Android-SHIELD-Android-TV.xml b/docs/Plex/profiles/Android-SHIELD/Android-SHIELD-Android-TV.xml index d85b27909..672082447 100644 --- a/docs/Plex/profiles/Android-SHIELD/Android-SHIELD-Android-TV.xml +++ b/docs/Plex/profiles/Android-SHIELD/Android-SHIELD-Android-TV.xml @@ -9,21 +9,30 @@ - - - - - - - - - + + + + + + + + + - - + + diff --git a/docs/manifest.webmanifest b/docs/manifest.webmanifest index d2c29e0ba..b6bf0a216 100644 --- a/docs/manifest.webmanifest +++ b/docs/manifest.webmanifest @@ -3,13 +3,13 @@ "short_name": "Guidarr", "description": "Guides mainly for Sonarr/Radarr/Bazarr and everything related to it.", "icons": [ - { - "src": "img/logo.png", - "sizes": "512x512", - "type": "image/png" - } + { + "src": "img/logo.png", + "sizes": "512x512", + "type": "image/png" + } ], "theme_color": "#4051B5", "background_color": "#2E303E", "display": "standalone" - } +} diff --git a/docs/requirements.txt b/docs/requirements.txt index 027b9e64e..84ee400a5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -6,4 +6,4 @@ mkdocs-material==9.5.14 mkdocs-minify-plugin==0.8.0 mkdocs-redirects==1.2.1 mkdocs-include-markdown-plugin==6.0.4 -mkdocs-markdownextradata-plugin==0.2.5 \ No newline at end of file +mkdocs-markdownextradata-plugin==0.2.5 diff --git a/docs/stylesheets/extra.css b/docs/stylesheets/extra.css index 76b293fad..9653d07ce 100644 --- a/docs/stylesheets/extra.css +++ b/docs/stylesheets/extra.css @@ -11,7 +11,7 @@ /* remove bottom navigation */ .md-footer__inner:not([hidden]) { - display: none + display: none; } /* Change color of links */ @@ -23,13 +23,14 @@ footer.sponsorship { text-align: center; hr { - display: inline-block; - vertical-align: middle; + display: inline-block; + vertical-align: middle; } } /*Better table view */ -th, td { +th, +td { border: 1px solid var(--md-typeset-table-color); border-spacing: 0; border-bottom: none; @@ -42,10 +43,11 @@ th, td { } .md-typeset__table table:not([class]) { display: table; - font-size: .74rem; + font-size: 0.74rem; border-right: none; } -.md-typeset__table table:not([class]) td, .md-typeset__table table:not([class]) th { +.md-typeset__table table:not([class]) td, +.md-typeset__table table:not([class]) th { padding: 9px; } @@ -56,7 +58,7 @@ th, td { /* dark mode alternating table bg colors */ [data-md-color-scheme="slate"] .md-typeset__table tr:nth-child(2n) { - background-color: hsla(var(--md-hue),25%,25%,1) + background-color: hsla(var(--md-hue), 25%, 25%, 1); } [data-md-color-scheme="slate"] .md-typeset__table tr:nth-child(2n) { color: #f8f8f8; diff --git a/docs/stylesheets/github-permalink-style.css b/docs/stylesheets/github-permalink-style.css index 2b0f509a8..beb4ec948 100644 --- a/docs/stylesheets/github-permalink-style.css +++ b/docs/stylesheets/github-permalink-style.css @@ -1,38 +1,45 @@ .headerlink { - --permalink-size: 20px; /* for font-relative sizes, 0.6em is a good choice */ - --permalink-spacing: 4px; + --permalink-size: 20px; /* for font-relative sizes, 0.6em is a good choice */ + --permalink-spacing: 4px; - width: calc(var(--permalink-size) + var(--permalink-spacing)); - height: var(--permalink-size); - vertical-align: middle; - background-color: var(--md-default-fg-color--lighter); - background-size: var(--permalink-size); - mask-size: var(--permalink-size); - -webkit-mask-size: var(--permalink-size); - mask-repeat: no-repeat; - -webkit-mask-repeat: no-repeat; - visibility: visible; - mask-image: url('data:image/svg+xml;utf8,'); - -webkit-mask-image: url('data:image/svg+xml;utf8,'); + width: calc(var(--permalink-size) + var(--permalink-spacing)); + height: var(--permalink-size); + vertical-align: middle; + background-color: var(--md-default-fg-color--lighter); + background-size: var(--permalink-size); + mask-size: var(--permalink-size); + -webkit-mask-size: var(--permalink-size); + mask-repeat: no-repeat; + -webkit-mask-repeat: no-repeat; + visibility: visible; + mask-image: url('data:image/svg+xml;utf8,'); + -webkit-mask-image: url('data:image/svg+xml;utf8,'); } [id]:target .headerlink { - background-color: var(--md-typeset-a-color); + background-color: var(--md-typeset-a-color); } .headerlink:hover { - background-color: var(--md-accent-fg-color) !important; + background-color: var(--md-accent-fg-color) !important; } @media screen and (min-width: 76.25em) { - h1, h2, h3, h4, h5, h6 { - display: flex; - align-items: center; - flex-direction: row; - } + h1, + h2, + h3, + h4, + h5, + h6 { + display: flex; + align-items: center; + flex-direction: row; + } - .headerlink { - order: -1; - margin-left: calc(var(--permalink-size) * -1 - var(--permalink-spacing)) !important; - } -} \ No newline at end of file + .headerlink { + order: -1; + margin-left: calc( + var(--permalink-size) * -1 - var(--permalink-spacing) + ) !important; + } +} diff --git a/includes/flowcharts/radarr-flowchart.drawio b/includes/flowcharts/radarr-flowchart.drawio index c8abd76ec..d04c90329 100644 --- a/includes/flowcharts/radarr-flowchart.drawio +++ b/includes/flowcharts/radarr-flowchart.drawio @@ -1 +1 @@ -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 \ No newline at end of file +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 diff --git a/includes/hardlinks/docker-iptables-fix.sh b/includes/hardlinks/docker-iptables-fix.sh index 6a96720b8..aaa3127b3 100644 --- a/includes/hardlinks/docker-iptables-fix.sh +++ b/includes/hardlinks/docker-iptables-fix.sh @@ -3,26 +3,25 @@ currentAttempt=0 totalAttempts=10 delay=15 -while [ $currentAttempt -lt $totalAttempts ] -do - currentAttempt=$(( $currentAttempt + 1 )) +while [ $currentAttempt -lt $totalAttempts ]; do + currentAttempt=$(($currentAttempt + 1)) - echo "Attempt $currentAttempt of $totalAttempts..." + echo "Attempt $currentAttempt of $totalAttempts..." - result=$(iptables-save) + result=$(iptables-save) - if [[ $result =~ "-A DOCKER -i docker0 -j RETURN" ]]; then - echo "Docker rules found! Modifying..." + if [[ $result =~ "-A DOCKER -i docker0 -j RETURN" ]]; then + echo "Docker rules found! Modifying..." - iptables -t nat -A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER - iptables -t nat -A PREROUTING -m addrtype --dst-type LOCAL ! --dst 127.0.0.0/8 -j DOCKER + iptables -t nat -A PREROUTING -m addrtype --dst-type LOCAL -j DOCKER + iptables -t nat -A PREROUTING -m addrtype --dst-type LOCAL ! --dst 127.0.0.0/8 -j DOCKER - echo "Done!" + echo "Done!" - break - fi + break + fi - echo "Docker rules not found! Sleeping for $delay seconds..." + echo "Docker rules not found! Sleeping for $delay seconds..." - sleep $delay -done \ No newline at end of file + sleep $delay +done diff --git a/overrides/main.html b/overrides/main.html index 3788c3d2d..fe188f8c9 100644 --- a/overrides/main.html +++ b/overrides/main.html @@ -1,12 +1,17 @@ {% extends "base.html" %} {% block content %} - {{ super() }} - +{{ super() }} + {% endblock %} -