Merge pull request #226 from crossroads/master

#DecemberRelease3
crossroads · Dec 14, 2018 · baa3cee · baa3cee
2 parents 369961d + 26cd92f
commit baa3cee
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 18 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -376,5 +376,5 @@ workflows:
               - tests
             filters:
               branches:
-                only: /^(live)$/
+                only: /^(live|master)$/
 
diff --git a/app/templates/faq.hbs b/app/templates/faq.hbs
@@ -3,7 +3,7 @@
     {{outlet "appMenuList"}}
 
     {{#init-foundation}}
-      <nav class="tab-bar {{unless session.isLoggedIn 'sticky_title_bar'}}" data-topbar>
+      <nav class="tab-bar {{unless session.isLoggedIn 'sticky_title_bar'}}">
         <section class="left-small">
           {{#if session.isLoggedIn}}
             <a class="left-off-canvas-toggle menu-icon" href="#"><span></span></a>

diff --git a/app/templates/feedback.hbs b/app/templates/feedback.hbs
@@ -2,7 +2,7 @@
   <div class="inner-wrap">
     {{outlet "appMenuList"}}
 
-    <nav class="tab-bar" data-topbar>
+    <nav class="tab-bar">
       <section class="left-small">
         <a class="left-off-canvas-toggle menu-icon" href="#"><span></span></a>
       </section>

diff --git a/app/templates/item/edit.hbs b/app/templates/item/edit.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{link-to (t "back") 'offer.index' model.offer.id classNames="back"}}
   </section>

diff --git a/app/templates/item/index.hbs b/app/templates/item/index.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{link-to (t "back") 'offer.offer_details' model.offer.id classNames="back"}}
   </section>

diff --git a/app/templates/item/messages.hbs b/app/templates/item/messages.hbs
@@ -1,6 +1,6 @@
 {{#scroll-to-bottom}}
 
-  <nav class="tab-bar item_details_title sticky_title_bar" data-topbar>
+  <nav class="tab-bar item_details_title sticky_title_bar">
     <section class="left-small">
       {{link-to (t "back") 'offer.offer_details' item.offer classNames="back"}}
     </section>

diff --git a/app/templates/offer/cancel.hbs b/app/templates/offer/cancel.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{link-to (t "back") 'offer.offer_details' model classNames='back'}}
   </section>

diff --git a/app/templates/offer/confirm.hbs b/app/templates/offer/confirm.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{link-to (t "back") 'offer.offer_details' model classNames="back"}}
   </section>

diff --git a/app/templates/offer/index.hbs b/app/templates/offer/index.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{#if displayHomeLink}}
       {{#link-to 'offers' classNames="back"}}{{t "application.home"}}{{/link-to}}

diff --git a/app/templates/offer/ios_notification.hbs b/app/templates/offer/ios_notification.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{link-to (t "back") 'offer.confirm' model classNames="back"}}
   </section>

diff --git a/app/templates/offer/messages.hbs b/app/templates/offer/messages.hbs
@@ -1,6 +1,6 @@
 {{#scroll-to-bottom}}
 
-  <nav class="tab-bar sticky_title_bar" data-topbar>
+  <nav class="tab-bar sticky_title_bar">
     <section class="left-small">
       {{link-to (t "back") 'offer.offer_details' offer classNames="back"}}
     </section>

diff --git a/app/templates/offer/offer_details.hbs b/app/templates/offer/offer_details.hbs
@@ -1,6 +1,6 @@
 {{#joyride-foundation currentController=this}}
 
-  <nav class="tab-bar offer_details_title {{unless model.nonSubmittedOffer 'non-draft'}}" data-topbar>
+  <nav class="tab-bar offer_details_title {{unless model.nonSubmittedOffer 'non-draft'}}">
     <section class="left-small">
       {{#if displayHomeLink}}
         {{#link-to 'offers.index' classNames="back"}}{{t "back"}}{{/link-to}}

diff --git a/app/templates/offer/submit.hbs b/app/templates/offer/submit.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     <a {{action "backLink"}} class="back">{{t "back"}}</a>
   </section>

diff --git a/app/templates/offer/transport_details.hbs b/app/templates/offer/transport_details.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar offer_details_title {{unless model.isDraft 'non-draft'}}" data-topbar>
+<nav class="tab-bar offer_details_title {{unless model.isDraft 'non-draft'}}">
   <section class="left-small">
     {{link-to (t "back") 'offers.index' classNames="back"}}
   </section>

diff --git a/app/templates/offers/index.hbs b/app/templates/offers/index.hbs
@@ -2,7 +2,7 @@
   <div class="inner-wrap">
     {{outlet "appMenuList"}}
 
-    <nav class="tab-bar" data-topbar>
+    <nav class="tab-bar">
       <section class="left-small">
         <a class="left-off-canvas-toggle menu-icon" href="#"><span></span></a>
       </section>

diff --git a/app/templates/register.hbs b/app/templates/register.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{link-to (t "back") 'index' classNames='back'}}
   </section>

diff --git a/app/templates/support.hbs b/app/templates/support.hbs
@@ -2,7 +2,7 @@
   <div class="inner-wrap">
     {{outlet "appMenuList"}}
 
-    <nav class="tab-bar" data-topbar>
+    <nav class="tab-bar">
       <section class="left-small">
         <a class="left-off-canvas-toggle menu-icon" href="#"><span></span></a>
       </section>

diff --git a/app/templates/tour.hbs b/app/templates/tour.hbs
@@ -1,4 +1,4 @@
-<nav class="tab-bar" data-topbar>
+<nav class="tab-bar">
   <section class="left-small">
     {{link-to (t "back") 'index' classNames="back"}}
   </section>