{% block content %} diff --git a/hyperglass/render/templates/results.html.j2 b/hyperglass/render/templates/results.html.j2 index 08ad709..c0d26e8 100644 --- a/hyperglass/render/templates/results.html.j2 +++ b/hyperglass/render/templates/results.html.j2 @@ -1,17 +1,15 @@
-
-
+
+
{% import "templates/title.html.j2" as title %} {{ title.title(branding, primary_asn, size_title="h1", size_subtitle="h4", direction="left") }}
-
+

-
+
diff --git a/hyperglass/render/templates/theme.sass.j2 b/hyperglass/render/templates/theme.sass.j2 index ae70bce..fb4ab77 100644 --- a/hyperglass/render/templates/theme.sass.j2 +++ b/hyperglass/render/templates/theme.sass.j2 @@ -34,6 +34,17 @@ $hg-footer: findFooterColor($hg-background) // Theme Overrides $enable-responsive-font-sizes: true + +$enable-validation-icons: false + $theme-colors: ("primary": $hg-primary, "danger": $hg-danger, "warning": $hg-warning, "light": $hg-light, "dark": $hg-dark, "loading": $hg-loading, "footer": $hg-footer) + $body-bg: $hg-background -$body-color: findTextColor($body-bg) \ No newline at end of file + +$body-color: findTextColor($body-bg) + +$border-radius: .44rem + +$border-radius-lg: .4rem + +$border-radius-sm: .35rem \ No newline at end of file diff --git a/hyperglass/static/hyperglass.es6 b/hyperglass/static/hyperglass.es6 index 99f478a..e5fc132 100644 --- a/hyperglass/static/hyperglass.es6 +++ b/hyperglass/static/hyperglass.es6 @@ -9,14 +9,16 @@ const ClipboardJS = require('clipboard'); const frontEndConfig = require('./frontend.json'); const inputMessages = frontEndConfig.messages; +const pageContainer = $('#hg-page-container'); +const formContainer = $('#hg-form'); const queryLocation = $('#location'); const queryType = $('#query_type'); const queryTarget = $('#query_target'); const queryTargetAppend = $('#hg-target-append'); const submitIcon = $('#hg-submit-icon'); const resultsContainer = $('#hg-results'); -const formContainer = $('#hg-form'); const resultsAccordion = $('#hg-accordion'); +const resultsColumn = resultsAccordion.parent(); const backButton = $('#hg-back-btn'); const footerHelpBtn = $('#hg-footer-help-btn'); const footerTermsBtn = $('#hg-footer-terms-btn'); @@ -33,6 +35,16 @@ class InputInvalid extends Error { } } +const swapSpacing = (goTo) => { + if (goTo === 'form') { + pageContainer.removeClass('px-0 px-md-3'); + resultsColumn.removeClass('px-0'); + } else if (goTo === 'results') { + pageContainer.addClass('px-0 px-md-3'); + resultsColumn.addClass('px-0'); + } +}; + const resetResults = () => { queryLocation.selectpicker('deselectAll'); queryLocation.selectpicker('val', ''); @@ -41,6 +53,7 @@ const resetResults = () => { resultsContainer.animsition('out', formContainer, '#'); resultsContainer.hide(); $('.hg-info-btn').remove(); + swapSpacing('form'); formContainer.show(); formContainer.animsition('in'); backButton.addClass('d-none'); @@ -114,9 +127,12 @@ const supportedBtn = qt => `