From 4fcb755f248bada8506cadc108abc3cf5573793e Mon Sep 17 00:00:00 2001 From: Alex Wolfe Date: Wed, 11 Mar 2015 20:21:59 -0700 Subject: [PATCH] Fixed live search display issue --- public/_includes/_docs-nav.jade | 4 ++-- public/_includes/_scripts-include.jade | 16 ++++++++------- public/resources/css/layout/_layout.scss | 2 +- public/resources/css/module/_side-nav.scss | 23 +++++++++++----------- public/resources/js/site.js | 5 +++++ public/resources/js/theme.js | 0 6 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 public/resources/js/theme.js diff --git a/public/_includes/_docs-nav.jade b/public/_includes/_docs-nav.jade index 4c5c66d2e2..afc4cacb13 100644 --- a/public/_includes/_docs-nav.jade +++ b/public/_includes/_docs-nav.jade @@ -1,6 +1,6 @@ nav.side-nav.l-pinned-left.l-layer-4.l-offset-nav - header.side-nav-search - form + header.side-nav-search.st-input-wrapper + form.st-input-inner label(for="search-io" class="is-hidden") Search Docs input(type="search" id="search-io" placeholder="SEARCH DOCS...") button(class="mobile-trigger button" aria-label="View Docs Menu" ng-click="toggleDocsMenu($event)" md-button) Docs diff --git a/public/_includes/_scripts-include.jade b/public/_includes/_scripts-include.jade index a23813ad4c..adc7bab4cb 100644 --- a/public/_includes/_scripts-include.jade +++ b/public/_includes/_scripts-include.jade @@ -22,11 +22,13 @@ script. ga('create', 'UA-8594346-15', 'auto'); ga('send', 'pageview') - -script. - (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){ - (w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t); - e=d.getElementsByTagName(t)[0];s.async=1;s.src=u;e.parentNode.insertBefore(s,e); - })(window,document,'script','//s.swiftypecdn.com/install/v1/st.js','_st'); - _st('install','VsuU7kH5Hnnj9tfyNvfK'); +if current.path[0] == "docs" + + script. + (function(w,d,t,u,n,s,e){w['SwiftypeObject']=n;w[n]=w[n]||function(){ + (w[n].q=w[n].q||[]).push(arguments);};s=d.createElement(t); + e=d.getElementsByTagName(t)[0];s.async=1;s.src=u;e.parentNode.insertBefore(s,e); + })(window,document,'script','//s.swiftypecdn.com/install/v1/st.js','_st'); + + _st('install','VsuU7kH5Hnnj9tfyNvfK'); \ No newline at end of file diff --git a/public/resources/css/layout/_layout.scss b/public/resources/css/layout/_layout.scss index dc4938e406..2893dddb1f 100644 --- a/public/resources/css/layout/_layout.scss +++ b/public/resources/css/layout/_layout.scss @@ -44,7 +44,7 @@ } .l-offset-side-nav { - padding-left: 224px; + padding-left: 232px; @media handheld and (max-width: $phone-breakpoint), screen and (max-device-width: $phone-breakpoint), diff --git a/public/resources/css/module/_side-nav.scss b/public/resources/css/module/_side-nav.scss index f46141f759..9b0892e9fe 100644 --- a/public/resources/css/module/_side-nav.scss +++ b/public/resources/css/module/_side-nav.scss @@ -1,13 +1,12 @@ -.swiftype-widget { - .autocomplete { - left: $unit !important; - } -} +/* +* Side Navigation +* +*/ .side-nav { background: $mist; box-shadow: 3px 0px 6px rgba($coal, .3); - width: 224px; + width: 232px; @media handheld and (max-width: $phone-breakpoint), screen and (max-device-width: $phone-breakpoint), @@ -19,12 +18,8 @@ bottom: auto; } - a { - text-decoration: none; - display: block; - } - + // SEARCH BOX .side-nav-search { background: $tin; padding: $unit; @@ -48,6 +43,7 @@ padding: 0px $unit; margin: 0px; font-size: 14px !important; + display: inline-block; } .mobile-trigger { @@ -75,9 +71,10 @@ opacity: .87; } } - } + + // PRIMARY SIDENAV BUTTON .side-nav-primary { list-style-type: none; margin: 0px; @@ -103,6 +100,8 @@ text-align: left; font-weight: 400; position: relative; + text-decoration: none; + display: block; &.is-selected { background: $fog; diff --git a/public/resources/js/site.js b/public/resources/js/site.js index 74db48fb06..1e560c2bdd 100644 --- a/public/resources/js/site.js +++ b/public/resources/js/site.js @@ -1,3 +1,8 @@ +/* +* Apllication Module +* +*/ + var angularIO = angular.module('angularIOApp', ['ngMaterial']) .config(function($mdThemingProvider) { $mdThemingProvider.theme('default') diff --git a/public/resources/js/theme.js b/public/resources/js/theme.js deleted file mode 100644 index e69de29bb2..0000000000