Merge pull request #72 from jdm135/master

Fix layout 6 UI.

Author: DanielHindi

widget/css/style.css

@@ -40,14 +40,14 @@
 }
 
 /* List Layout Grids */
-.list-layout .list-item{
+/*.list-layout .list-item{
 	padding-left:15px;
 	padding-right:8px;
 }
 .list-layout .list-item + .list-item{
 	padding-left:8px;
 	padding-right:15px;
-}
+}*/
 .list-layout .list-item-media{
 	position:relative;
 	left:0;
@@ -93,9 +93,6 @@
 .list-layout.layout5 .list-item-media .list-media-holder img{
 	max-height:100%;
 }
-.list-layout.layout-6 .list-item-media .list-media-holder{
-	height:150px;
-}
 .list-layout.layout-6 .list-item-media .list-media-holder img{
 	max-height:100%;
 }
@@ -106,6 +103,12 @@
 	padding:10px 0;
 	min-height:70px;
 }
+.list-layout .list-item-copy.with-text{
+	min-height:42px;
+}
+.list-layout .list-item-copy.without-text{
+	min-height:32px;
+}
 .list-layout .list-item-copy p.summary{
 	font-size:13px;
 }

widget/index.html

@@ -169,17 +169,17 @@
             <!-- End layout 5 -->
             <!-- Layout 6 -->
             <div class="padded padding-top-zero padding-bottom-zero" ng-if="data.design.selectedLayout == 6" style=" padding-top: 10px; ">
-                <div class="list-layout layout-6">
+                <div class="list-layout layout-6" ng-class="data.content.text?'':'margin-top-fifteen'">
                     <div ng-repeat="pluginRow in data.plugins" class="row">
-                        <div class="list-item col-xs-6 pull-left" ng-repeat="plugin in pluginRow" ng-click="navigateToPlugin(plugin)" style="padding-top: 6px !important;">
+                        <div class="list-item col-xs-6 pull-left" ng-repeat="plugin in pluginRow" ng-click="navigateToPlugin(plugin)">
                             <div class="list-item-media text-center overflow-hidden">
                                 <div class="list-media-holder">
                                     <img load-image="1x1" data-final-src="{{ plugin.iconUrl }}" crop-width="200" crop-height="200" crop-type="crop" ng-if="plugin.iconUrl"/>
 									<img load-image="1x1" data-final-src="../../../styles/media/holder-1x1.png" ng-if="plugin.iconClassName" />
                                 </div>
-                                <div class="list-item-copy text-center padding-top-five" style="min-height: 42px;">
+                                <div class="list-item-copy text-center" ng-class="data.design.hideText==false?'with-text':'without-text'">
                                     <p class="ellipsis margin-zero text-primary">
-                                        <a class="text-primary"  ng-show="data.design.hideText==false">
+                                        <a class="text-primary" ng-show="data.design.hideText==false">
                                             {{ plugin.title }}
                                         </a>
                                     </p>