Fix VJ && JP table2entries comp, when no result

5 files changed, 46 insertions, 20 deletions

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
index 69d36abe6..37a0a5126 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -66,7 +66,7 @@ class JourneyPatterns extends Component{
         data-headline={(bool) ? sp.city_name : ''}
         title={sp.city_name + ' (' + sp.zip_code +')'}
       >
-        <span>{sp.name}</span>
+        <span><span>{sp.name}</span></span>
       </div>
     )
   }
@@ -91,7 +91,7 @@ class JourneyPatterns extends Component{
               </div>
             )}
 
-            <div className='table table-2entries mt-sm mb-sm'>
+            <div className={'table table-2entries mt-sm mb-sm' + ((this.props.journeyPatterns.length > 0) ? '' : ' no_result')}>
               <div className='t2e-head w20'>
                 <div className='th'>
                   <div className='strong mb-xs'>ID Mission</div>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
index fcc5fd153..619745c6a 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
@@ -92,7 +92,7 @@ class VehicleJourneys extends Component{
               </div>
             )}
 
-            <div className='table table-2entries mt-sm mb-sm'>
+            <div className={'table table-2entries mt-sm mb-sm' + ((this.props.vehicleJourneys.length > 0) ? '' : ' no_result')}>
               <div className='t2e-head w20'>
                 <div className='th'>
                   <div className='strong mb-xs'>ID course</div>
diff --git a/app/assets/stylesheets/components/_tables.sass b/app/assets/stylesheets/components/_tables.sass
index b35ceead9..085c22d82 100644
--- a/app/assets/stylesheets/components/_tables.sass
+++ b/app/assets/stylesheets/components/_tables.sass
@@ -224,12 +224,12 @@
 
       .td
         > div
-          > .has_radio
-            top: 50%
-            margin-top: -10px
-
-          &.headlined > .has_radio
-            margin-top: calc((1.4em + 6px) * -1)
+          // > .has_radio
+          //   top: 50%
+          //   margin-top: -10px
+          //
+          // &.headlined > .has_radio
+          //   margin-top: calc((1.4em + 6px) * -1)
 
       .th + .td, .td:first-child
         > .headlined
diff --git a/app/assets/stylesheets/modules/_jp_collection.sass b/app/assets/stylesheets/modules/_jp_collection.sass
index 125479e2d..eff1e2abc 100644
--- a/app/assets/stylesheets/modules/_jp_collection.sass
+++ b/app/assets/stylesheets/modules/_jp_collection.sass
@@ -9,18 +9,23 @@
         position: relative
         padding-left: 25px
 
-        > div
-          height: calc(32px - 13px)
-
         > .headlined
-          height: calc(75px - 13px)
-
           &:before
             margin-left: -25px
             padding-left: 25px
 
         > div > span
           position: relative
+          display: block
+          height: 100%
+
+          > span
+            position: absolute
+            display: block
+            line-height: 1em
+            top: 50%
+            transform: translateY(-50%)
+            margin-top: -2px
 
           &:before
             content: ''
@@ -46,9 +51,11 @@
             z-index: 3
             top: -6px
             left: -20px
-            bottom: -6px
+            bottom: 0
 
         > .headlined > span
+          height: calc(100% - (1.4em + 12px))
+
           &:after
             top: calc((1.4em + 18px) * -1)
 
@@ -59,3 +66,15 @@
         &:nth-child(2) > div > span
           &:after
             top: 50%
+
+    &.no_result
+      .t2e-head > .td > div > span,
+      .t2e-head > .td > .headlined > span
+        > span
+          position: relative
+          top: 0
+          transform: none
+          margin-top: 0
+
+        &:after
+          bottom: -6px
diff --git a/app/assets/stylesheets/modules/_vj_collection.sass b/app/assets/stylesheets/modules/_vj_collection.sass
index ee161829f..ea5f78b5a 100644
--- a/app/assets/stylesheets/modules/_vj_collection.sass
+++ b/app/assets/stylesheets/modules/_vj_collection.sass
@@ -9,12 +9,7 @@
         position: relative
         padding-left: 25px
 
-        > div
-          height: calc(32px - 13px)
-
         > .headlined
-          height: calc(75px - 13px)
-
           &:before
             margin-left: -25px
             padding-left: 25px
@@ -71,3 +66,15 @@
         &:nth-child(2) > div > span
           &:after
             top: 50%
+
+    &.no_result
+      .t2e-head > .td > div > span,
+      .t2e-head > .td > .headlined > span
+        > span
+          position: relative
+          top: 0
+          transform: none
+          margin-top: 0
+
+        &:after
+          bottom: -6px