Merge pull request #1411 from spadgett/bump-origin-web-catalog

Merged by openshift-bot

Author: OpenShift Bot

app/styles/_catalog.less

@@ -1,29 +1,23 @@
-@landing-side-bar-top-offset: @navbar-os-header-height-desktop;
-@landing-side-bar-width-lg: 425px;
-@landing-side-bar-width-md: 375px;
-@landing-side-bar-width-sm: 325px;
+@landing-search-area-height: 52px;
 
-.console-os .wrap.no-sidebar .middle.landing-page {
+.landing {
   background: @panel-shaded;
-  flex: none;
-  h1, .nav-tabs {
-    margin-bottom: 0;
-  }
   @media(min-width: @screen-sm-min){
-    overflow-y: auto;
-    width: calc(100% ~"-" @landing-side-bar-width-sm);
+    top: @landing-search-area-height;
   }
-  @media(min-width: @screen-md-min) {
-    width: calc(100% ~"-" @landing-side-bar-width-md);
+  .catalogs-overlay-modal .wizard-pf-body .wizard-pf-main {
+    .row();
+    padding-left: 0;
+    padding-right: 0;
   }
-
-  @media(min-width: @screen-lg-min) {
-    width: calc(100% ~"-" @landing-side-bar-width-lg);
+  h1, .nav-tabs {
+    margin-bottom: 0 !important;
+    margin-top: 0 !important;
   }
 }
 
 @media(min-width: @screen-sm-min) {
-  .landing-side-bar {
-    top: @landing-side-bar-top-offset;
+  .catalog-search, .landing-side-bar {
+    top: @navbar-os-header-height-desktop;
   }
 }

app/views/landing-page.html

@@ -8,7 +8,14 @@
     <div class="middle-section">
       <div class="middle-container">
         <div class="middle-content">
-          <landing-page service-classes="serviceClasses" image-streams="imageStreams">
+          <landing-page>
+            <landingsearch>
+              <catalog-search
+                  service-classes="serviceClasses"
+                  image-streams="imageStreams"
+                  base-project-url="project">
+              </catalog-search>
+            </landingsearch>
             <landingheader>
               <div class="build-applications-view">
                 <saas-list saas-offerings="saasOfferings"></saas-list>

bower.json

@@ -48,7 +48,7 @@
     "file-saver": "1.3.3",
     "bootstrap-switch": "3.3.3",
     "origin-web-common": "0.0.12",
-    "origin-web-catalog": "0.0.6"
+    "origin-web-catalog": "0.0.7"
   },
   "devDependencies": {
     "angular-mocks": "1.5.11",

dist/scripts/templates.js

@@ -10253,7 +10253,11 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "<div class=\"middle-section\">\n" +
     "<div class=\"middle-container\">\n" +
     "<div class=\"middle-content\">\n" +
-    "<landing-page service-classes=\"serviceClasses\" image-streams=\"imageStreams\">\n" +
+    "<landing-page>\n" +
+    "<landingsearch>\n" +
+    "<catalog-search service-classes=\"serviceClasses\" image-streams=\"imageStreams\" base-project-url=\"project\">\n" +
+    "</catalog-search>\n" +
+    "</landingsearch>\n" +
     "<landingheader>\n" +
     "<div class=\"build-applications-view\">\n" +
     "<saas-list saas-offerings=\"saasOfferings\"></saas-list>\n" +

dist/scripts/vendor.js

@@ -404,7 +404,7 @@ dd{margin-left:0}
 @media (min-width:415px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
 .dl-horizontal dd{margin-left:180px}
 }
-.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.dropdown-menu>li>a,.form-horizontal .form-group:after,.list-view-pf .list-group-item:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after,ul.messenger.messenger-theme-flat .messenger-message:after{clear:both}
+.btn-group-vertical>.btn-group:after,.btn-toolbar:after,.clearfix:after,.container-fluid:after,.container:after,.dl-horizontal dd:after,.dropdown-menu>li>a,.form-horizontal .form-group:after,.landing .catalogs-overlay-modal .wizard-pf-body .wizard-pf-main:after,.list-view-pf .list-group-item:after,.modal-footer:after,.modal-header:after,.nav:after,.navbar-collapse:after,.navbar-header:after,.navbar:after,.pager:after,.panel-body:after,.row:after,ul.messenger.messenger-theme-flat .messenger-message:after{clear:both}
 abbr[data-original-title],abbr[title]{cursor:help;border-bottom:1px dotted #9c9c9c}
 .initialism{font-size:90%;text-transform:uppercase}
 blockquote{padding:10.5px 21px;margin:0 0 21px;font-size:16.25px;border-left:5px solid #f1f1f1}
@@ -1372,7 +1372,7 @@ button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance
 .carousel-caption{left:20%;right:20%;padding-bottom:30px}
 .carousel-indicators{bottom:20px}
 }
-.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{content:" ";display:table}
+.btn-group-vertical>.btn-group:after,.btn-group-vertical>.btn-group:before,.btn-toolbar:after,.btn-toolbar:before,.clearfix:after,.clearfix:before,.container-fluid:after,.container-fluid:before,.container:after,.container:before,.dl-horizontal dd:after,.dl-horizontal dd:before,.form-horizontal .form-group:after,.form-horizontal .form-group:before,.landing .catalogs-overlay-modal .wizard-pf-body .wizard-pf-main:after,.landing .catalogs-overlay-modal .wizard-pf-body .wizard-pf-main:before,.modal-footer:after,.modal-footer:before,.modal-header:after,.modal-header:before,.nav:after,.nav:before,.navbar-collapse:after,.navbar-collapse:before,.navbar-header:after,.navbar-header:before,.navbar:after,.navbar:before,.pager:after,.pager:before,.panel-body:after,.panel-body:before,.row:after,.row:before{content:" ";display:table}
 .center-block{display:block;margin-left:auto;margin-right:auto}
 .fa.fa-pull-left,.fa.pull-left{margin-right:.3em}
 .pull-right{float:right!important}
@@ -3686,6 +3686,7 @@ table.dataTable th:active{outline:0}
 .weight-slider-values .weight-percentage{font-size:15px;margin-left:5px}
 @media (min-width:768px){.weight-slider-values{-webkit-flex-direction:row;-moz-flex-direction:row;-ms-flex-direction:row;flex-direction:row;justify-content:space-between}
 .weight-slider-values .weight-percentage{margin-right:5px}
+.landing{top:52px}
 }
 .osc-file-input textarea{font-family:Menlo,Monaco,Consolas,monospace;margin:5px 0}
 .health-checks-form .pause-rollouts-checkbox,.set-limits-form .pause-rollouts-checkbox{margin-top:21px}
@@ -3702,14 +3703,10 @@ table.dataTable th:active{outline:0}
 .row-cards-pf-flex .card-pf-body-with-version{display:flex;flex-direction:column;justify-content:space-between}
 .row-cards-pf-flex .card-pf-footer .btn{margin-bottom:10px}
 .row-cards-pf-flex .card-pf-title{line-height:1.3;margin:0;overflow:hidden;text-overflow:ellipsis}
-.console-os .wrap.no-sidebar .middle.landing-page{background:#f2f2f2;flex:none}
-.console-os .wrap.no-sidebar .middle.landing-page .nav-tabs,.console-os .wrap.no-sidebar .middle.landing-page h1{margin-bottom:0}
-@media (min-width:768px){.console-os .wrap.no-sidebar .middle.landing-page{overflow-y:auto;width:calc(100% - 325px)}
-.landing-side-bar{top:60px}
-}
-@media (min-width:992px){.console-os .wrap.no-sidebar .middle.landing-page{width:calc(100% - 375px)}
-}
-@media (min-width:1200px){.console-os .wrap.no-sidebar .middle.landing-page{width:calc(100% - 425px)}
+.landing{background:#f2f2f2}
+.landing .catalogs-overlay-modal .wizard-pf-body .wizard-pf-main{margin-left:-20px;margin-right:-20px;padding-left:0;padding-right:0}
+.landing .nav-tabs,.landing h1{margin-bottom:0!important;margin-top:0!important}
+@media (min-width:768px){.catalog-search,.landing-side-bar{top:60px}
 }
 .collapse{display:none}
 .collapse.in{display:block}