luna-one 3.1.418 → 3.1.421

package/dist/application/components/NavBarHandler/NavBarHandler.js

@@ -31,7 +31,9 @@ var NavBarHandler = function NavBarHandler(_ref) {
       searchComponent = _ref.searchComponent,
       searchDeployed = _ref.searchDeployed,
       setSearchDeployed = _ref.setSearchDeployed,
-      navigate = _ref.navigate;
+      navigate = _ref.navigate,
+      globalSearch = _ref.globalSearch,
+      setGlobalSearch = _ref.setGlobalSearch;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -118,7 +120,9 @@ var NavBarHandler = function NavBarHandler(_ref) {
     menuBarTheme: data === null || data === void 0 ? void 0 : data.menuBarTheme,
     topNavTheme: data === null || data === void 0 ? void 0 : data.topNavTheme,
     navigate: navigate,
-    authLabels: data === null || data === void 0 ? void 0 : data.authLabels
+    authLabels: data === null || data === void 0 ? void 0 : data.authLabels,
+    setGlobalSearch: setGlobalSearch,
+    globalSearch: globalSearch
   });
 };
 

package/dist/luna/components/MegaMenu/MegaMenu.scss

@@ -520,11 +520,11 @@
     overflow: hidden;
     white-space: nowrap;
     font-family: $header-font-family;
-    background-color: $concrete-gray-1;
+    background-color: #DCEDF9;
     visibility: hidden;
 
     &--is-open {
-      padding: 32px 0px;
+      padding: 20px 0px;
       opacity: 1;
       height: auto;
       min-height: auto;
@@ -536,7 +536,7 @@
       font-size: $large-body-font-size;
       line-height: 16.6px;
       color: $trimble-blue;
-      padding: 10px 20px;
+      padding: 4px 20px 16px 20px;
       margin: 0;
       -webkit-transition: 0.2s;
       -o-transition: 0.2s;
@@ -545,22 +545,18 @@
       z-index: 2;
       text-decoration: none !important;
       visibility: inherit;
-
       &--underline {
         color: $trimble-blue;
         margin: 0;
         font-size: $large-body-font-size;
         display: inline;
-        -webkit-transition: 0.2s;
-        -o-transition: 0.2s;
-        transition: 0.2s;
-        box-shadow: 0 5px $concrete-gray-1, 0 8px $concrete-gray-1;
+        box-shadow: none;
         visibility: visible;
-
         &--is-open {
           color: $trimble-blue;
-          box-shadow: 0 5px $concrete-gray-1, 0 8px $trimble-blue;
+          box-shadow: none;
           visibility: visible;
+          border-bottom: 2px solid $trimble-blue;
         }
       }
     }

package/dist/luna/components/MobileNav/MobileNav.js

@@ -138,7 +138,7 @@ var MobileNav = function MobileNav(props) {
     var _navOptions$filter, _navOptions$filter$fi;
 
     return navOptions === null || navOptions === void 0 ? void 0 : (_navOptions$filter = navOptions.filter(function (option) {
-      return publicOnly ? option.isPublicPage : option;
+      return publicOnly ? option.isPublicPage ? option.isPublicPage : option : option;
     })) === null || _navOptions$filter === void 0 ? void 0 : (_navOptions$filter$fi = _navOptions$filter.filter(function (option) {
       // filter out unusable options
       return option.type === "category" || option.type === "links" || option.type === "link" || option.type === "page";

package/dist/luna/components/NavBarTop/NavBarTop.js

@@ -76,7 +76,9 @@ var NavBarTop = function NavBarTop(props) {
       displaySectorName = props.displaySectorName,
       theme = props.theme,
       setDesktopSearchDeployed = props.setDesktopSearchDeployed,
-      desktopSearchDeployed = props.desktopSearchDeployed;
+      desktopSearchDeployed = props.desktopSearchDeployed,
+      globalSearch = props.globalSearch,
+      setGlobalSearch = props.setGlobalSearch;
   var inputFocus = (0, _utilizeFocus.utilizeFocus)();
 
   var _useContext = (0, _react.useContext)(_NavBar.NavBarContext),
@@ -92,6 +94,7 @@ var NavBarTop = function NavBarTop(props) {
   var toggleDesktopSearch = function toggleDesktopSearch(isDesktop) {
     if (!desktopSearchDeployed) {
       setSearchDeployed(true);
+      setGlobalSearch(false);
       setDesktopSearchDeployed(true);
 
       if (!mouse) {
@@ -170,7 +173,7 @@ var NavBarTop = function NavBarTop(props) {
     }
   };
 
-  var logoElement = document.querySelector('.ter-navbar-top__logo');
+  var logoElement = document.querySelector(".ter-navbar-top__logo");
 
   var handleToggleWithKeyBoard = function handleToggleWithKeyBoard(event) {
     if (!mouse) {

package/dist/luna/other-organisms/Flyout/Flyout.js

@@ -84,7 +84,9 @@ var Flyout = function Flyout(_ref) {
       desktopSearchDeployed = _ref.desktopSearchDeployed,
       languageSelectorDeployed = _ref.languageSelectorDeployed,
       handleLanguageSelectorDeployed = _ref.handleLanguageSelectorDeployed,
-      closeHamburger = _ref.closeHamburger;
+      closeHamburger = _ref.closeHamburger,
+      globalSearch = _ref.globalSearch,
+      setGlobalSearch = _ref.setGlobalSearch;
 
   var _useState = (0, _react.useState)(""),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -108,6 +110,7 @@ var Flyout = function Flyout(_ref) {
     setDesktopSearchDeployed(true);
     close();
     closeHamburger();
+    setGlobalSearch(true);
   };
 
   var generateFlyoutLinks = function generateFlyoutLinks(links) {
@@ -137,8 +140,8 @@ var Flyout = function Flyout(_ref) {
         className: "flyout-links__link-icon"
       }, /*#__PURE__*/_react.default.createElement("img", {
         style: {
-          height: "16px",
-          width: "26px"
+          height: "20px",
+          width: "20px"
         },
         id: _lodash.default.uniqueId("id-"),
         src: _externalArrowWhiteTheme.default,
@@ -197,12 +200,16 @@ var Flyout = function Flyout(_ref) {
     className: "ter-flyout__divider ter-flyout__divider-logo"
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "ter-flyout__links"
-  }, links && generateFlyoutLinks(links)), !disableSearch && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("figure", {
+  }, links && generateFlyoutLinks(links)), !disableSearch && /*#__PURE__*/_react.default.createElement("div", {
+    className: "ter-flyout__search"
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: "ter-flyout__search-icon",
     onClick: function onClick() {
       return openSearchComponent();
     }
-  }, /*#__PURE__*/_react.default.createElement("img", {
+  }, /*#__PURE__*/_react.default.createElement("p", {
+    className: "ter-flyout__search-text"
+  }, searchPlaceholder), /*#__PURE__*/_react.default.createElement("img", {
     id: _lodash.default.uniqueId("id-"),
     src: _searchHighlighted.default,
     alt: "Search"

package/dist/luna/other-organisms/Flyout/Flyout.scss

@@ -94,7 +94,7 @@
       &__menu {
         list-style-type: none;
         padding: 0 0 0 7px;
-        font-size: $body-font-size;
+        font-size: $subheading-size-mobile;
         display: inline-block;
         margin-top: 0;
         margin-bottom: 0;
@@ -151,45 +151,63 @@
           }
         }
       }
+
+      &__link:hover > .flyout-links__link-text:before {
+        border-bottom: 2px solid $trimble-gold;
+      }
     }
   }
 
   &__search {
-    height: 30px;
     display: flex;
-    flex-direction: row;
-    align-items: center;
-    border-color: rgba(255, 255, 255, 0.5);
-    margin-top: 15px;
-    padding-bottom: 5px;
-
     @media screen and (max-width: $breakpoint-sm) {
-      border: none ;
+      border: none;
       height: 60px;
       margin: 0;
       padding: 0 0 0 7px;
     }
 
     &-icon {
-      height: 21px;
-      width: 21px;
-      margin-right: 10px;
+      justify-content: space-between;
+      width: 251px;
+      padding: 0 0 0 6px;
+      margin-top: 15px;
+      display: flex;
+
+      img {
+        position: relative;
+        left: 8px;
+        margin-top: 3px;
+        height: 20px;
+        width: 20px;
+
+        @media screen and (max-width: $breakpoint-sm) {
+          left: -3px;
+        }
+      }
+
+      @media screen and (max-width: $breakpoint-sm) {
+        width: 100%;
+      }
     }
 
-    &-input {
-      width: 100%;
-      font-size: $large-body-font-size;
+    &-text {
+      font-size: $subheading-size-mobile;
       color: $white;
+      line-height: 25px;
       background: transparent;
       border: none;
 
-      &:focus {
-        outline: none;
-      }
-
       &::placeholder {
         color: $white;
       }
+      @media screen and (max-width: $breakpoint-sm) {
+       padding-bottom: 25px;
+      }
+    }
+
+    &-text:hover {
+      border-bottom: 2px solid $trimble-gold;
     }
 
     &-btn {
@@ -201,8 +219,17 @@
 
       @media screen and (max-width: $breakpoint-sm) {
         display: block;
+
       }
     }
+
+    &-icon:hover > &-text {
+      border-bottom: 2px solid $trimble-gold;
+    }
+  }
+
+  &__search:hover > p:before {
+    border-bottom: 2px solid $trimble-gold;
   }
 
   &__divider {

package/dist/luna/other-organisms/NavBar/NavBar.js

@@ -156,7 +156,9 @@ var NavBar = function NavBar(props) {
       topNavTheme = props.topNavTheme,
       menuBarTheme = props.menuBarTheme,
       navigate = props.navigate,
-      authLabels = props.authLabels;
+      authLabels = props.authLabels,
+      setGlobalSearch = props.setGlobalSearch,
+      globalSearch = props.globalSearch;
 
   var _useState = (0, _react.useState)(null),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -484,7 +486,9 @@ var NavBar = function NavBar(props) {
     displaySectorName: displaySectorName,
     theme: topNavTheme,
     desktopSearchDeployed: desktopSearchDeployed,
-    setDesktopSearchDeployed: setDesktopSearchDeployed
+    setDesktopSearchDeployed: setDesktopSearchDeployed,
+    globalSearch: globalSearch,
+    setGlobalSearch: setGlobalSearch
   }, !disableLogin && /*#__PURE__*/_react.default.createElement(Login, {
     loginPage: loginPage,
     login: login,
@@ -557,7 +561,9 @@ var NavBar = function NavBar(props) {
     setSearchDeployed: setSearchDeployed,
     desktopSearchDeployed: desktopSearchDeployed,
     setDesktopSearchDeployed: setDesktopSearchDeployed,
-    closeHamburger: closeHamburger
+    closeHamburger: closeHamburger,
+    globalSearch: globalSearch,
+    setGlobalSearch: setGlobalSearch
   }));
 };
 

package/dist/luna/other-organisms/NavBar/NavMiniMenu.js

@@ -54,6 +54,7 @@ var NavMiniMenu = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       displayIcons = props.displayIcons,
       theme = props.theme,
       active = props.active;
+  var isCollapsed = (links === null || links === void 0 ? void 0 : links.length) > 4 ? true : false;
   (0, _react.useImperativeHandle)(ref, function (e) {
     return {
       handleClick: function handleClick() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "luna-one",
-  "version": "3.1.418",
+  "version": "3.1.421",
   "dependencies": {
     "@loadable/component": "^5.15.2",
     "@storybook/addon-knobs": "^6.3.1",