From acec20e1d6114495c5ed03cadcabf3ee01330fe0 Mon Sep 17 00:00:00 2001
From: lvuch <laurenvuchetich@gmail.com>
Date: Mon, 22 May 2017 11:26:19 -0700
Subject: [PATCH] modals

---
 app/catalog-tab/index/template.hbs      |  6 ++---
 app/components/env-catalog/template.hbs | 30 ++++++++++++++-----------
 app/styles/pages/_catalog.scss          |  1 -
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/app/catalog-tab/index/template.hbs b/app/catalog-tab/index/template.hbs
index db6e07d8c..0486ea873 100644
--- a/app/catalog-tab/index/template.hbs
+++ b/app/catalog-tab/index/template.hbs
@@ -24,8 +24,8 @@
 <div class="row">
   <div class="col span-3">
     <div class="catalog-search box">
-      <div class="mb-15">
-        <label>{{t 'catalogPage.index.search.label'}}</label>
+      <div class="mb-25">
+        <label class="pb-10">{{t 'catalogPage.index.search.label'}}</label>
         <div class="search-group input-group full-width">
           {{input value=search type="search" class="input-sm pull-right" placeholder=(t 'generic.search')}}
           {{#if search}}
@@ -36,7 +36,7 @@
         </div>
       </div>
       <div>
-        <label>{{t 'catalogPage.index.filters.label'}}</label>
+        <label class="pb-10">{{t 'catalogPage.index.filters.label'}}</label>
         <div class="dropdown filter-group">
           <button type="button" class="btn bg-default btn-md dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="text-align: left;"><i class="icon icon-chevron-down pull-right"></i><span class="text-capitalize">{{catalogId}}</span></button>
           <ul class="dropdown-menu dropdown-menu-right">
diff --git a/app/components/env-catalog/template.hbs b/app/components/env-catalog/template.hbs
index 65da59e36..6f2029c27 100644
--- a/app/components/env-catalog/template.hbs
+++ b/app/components/env-catalog/template.hbs
@@ -12,19 +12,22 @@
   </div>
 
   {{#if (or global.length ary.length)}}
-    <table class="table fixed no-lines no-top-padding">
-      <tr class="text-muted hidden-xs hidden-sm text-left">
-        <th width="200">{{t 'catalogSettings.more.name.label'}}</th>
-        <th width="30">&nbsp;</th>
-        <th>{{t 'catalogSettings.more.url.label'}}</th>
-        <th width="30">&nbsp;</th>
-        <th width="100">{{t 'catalogSettings.more.kind.label'}}</th>
-        <th width="30">&nbsp;</th>
-        <th width="200">{{t 'catalogSettings.more.branch.label'}}</th>
-        <th width="30">&nbsp;</th>
-      </tr>
+    <table class="table fixed">
+      <thead>
+        <tr class="fixed-header">
+          <th width="200">{{t 'catalogSettings.more.name.label'}}</th>
+          <th width="30">&nbsp;</th>
+          <th>{{t 'catalogSettings.more.url.label'}}</th>
+          <th width="30">&nbsp;</th>
+          <th width="100">{{t 'catalogSettings.more.kind.label'}}</th>
+          <th width="30">&nbsp;</th>
+          <th width="200">{{t 'catalogSettings.more.branch.label'}}</th>
+          <th width="30">&nbsp;</th>
+        </tr>
+      </thead>
+      <tbody>
       {{#each global as |row|}}
-        <tr>
+        <tr class="main-row">
           <td class="pt-5 pb-5" data-title="{{t 'catalogSettings.more.name.label'}}:">
             {{row.name}}
           </td>
@@ -43,7 +46,7 @@
         </tr>
       {{/each}}
       {{#each ary as |row|}}
-        <tr>
+        <tr class="main-row">
           <td class="pt-5 pb-5" data-title="{{t 'catalogSettings.more.name.label'}}:">
             {{input class="form-control input-sm name" type="text" value=row.name placeholder=(t 'catalogSettings.more.name.placeholder')}}
           </td>
@@ -72,6 +75,7 @@
           </td>
         </tr>
       {{/each}}
+      </tbody>
     </table>
   {{/if}}
 </div>
diff --git a/app/styles/pages/_catalog.scss b/app/styles/pages/_catalog.scss
index 1de19a24a..7f54aa4cd 100644
--- a/app/styles/pages/_catalog.scss
+++ b/app/styles/pages/_catalog.scss
@@ -20,7 +20,6 @@
 
   .dropdown {
     .btn {
-      background-color: $input-bg;
       i {
         margin-top: 2px;
       }