From 81ce21fd61c40c4393fc3a26330a77e86dd39c12 Mon Sep 17 00:00:00 2001
From: Alexandre Terrasa <alexandre@moz-code.org>
Date: Fri, 19 Aug 2016 05:40:12 -0400
Subject: [PATCH] nitweb/ng: clean card css

Signed-off-by: Alexandre Terrasa <alexandre@moz-code.org>
---
 share/nitweb/directives/entity/card.html          |   50 ++++++++++-----------
 share/nitweb/directives/metrics/metrics_list.html |    6 +--
 share/nitweb/javascripts/entities.js              |    3 +-
 share/nitweb/stylesheets/nitweb.css               |   19 +++++---
 share/nitweb/views/class.html                     |    2 +-
 share/nitweb/views/group.html                     |    2 +-
 share/nitweb/views/module.html                    |    2 +-
 share/nitweb/views/package.html                   |    2 +-
 share/nitweb/views/property.html                  |    2 +-
 9 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/share/nitweb/directives/entity/card.html b/share/nitweb/directives/entity/card.html
index 642b64d..4a30827 100644
--- a/share/nitweb/directives/entity/card.html
+++ b/share/nitweb/directives/entity/card.html
@@ -1,32 +1,14 @@
 <div class='card'>
+	<div class='card-left text-center' ng-if='!noSynopsis'>
+		<entity-tag mentity='mentity' />
+	</div>
 	<div class='card-body'>
-		<div class='pull-right'>
-			<div class='dropdown'>
-				<button class='btn btn-link dropdown-toggle' type='button' data-toggle='dropdown'>
-					<span class='glyphicon glyphicon-chevron-down'></span>
-				</button>
-				<ul class='dropdown-menu dropdown-menu-right'>
-					<li ng-class='currentTab == "signature" ? "active" : ""'>
-						<a ng-click='currentTab = "signature"'>Signature</a>
-					</li>
-					<li ng-class='currentTab == "doc" ? "active" : ""'>
-						<a ng-click='currentTab = "doc"'>Doc</a>
-					</li>
-					<li ng-class='currentTab == "grade" ? "active" : ""'>
-						<a ng-click='loadEntityStars(); currentTab = "grade"'>Grade</a>
-					</li>
-				</ul>
-			</div>
-		</div>
+		<h5 class='card-heading' ng-if='!noSynopsis'>
+			<entity-signature mentity='mentity'/>
+		</h5>
 		<div class='tab-content'>
-			<div id='{{mentity.html_id}}-signature' class='tab-pane'
+			<div id='{{mentity.html_id}}-signature' class='tab-pane' ng-if='!noSynopsis'
 			  ng-class='currentTab == "signature" ? "active" : ""'>
-				<div class='pull-left text-center'>
-					<entity-tag mentity='mentity' />
-				</div>
-				<h5 class='card-heading'>
-					<entity-signature mentity='mentity'/>
-				</h5>
 				<span class='synopsis' ng-bind-html='mentity.mdoc.html_synopsis' />
 			</div>
 			<div id='{{mentity.html_id}}-doc' class='tab-pane'
@@ -39,4 +21,22 @@
 			</div>
 		</div>
 	</div>
+	<div class='card-right'>
+		<div class='dropdown'>
+			<button class='btn btn-link dropdown-toggle' type='button' data-toggle='dropdown'>
+				<span class='glyphicon glyphicon-chevron-down'></span>
+			</button>
+			<ul class='dropdown-menu dropdown-menu-right'>
+				<li ng-class='currentTab == "signature" ? "active" : ""' ng-if='!noSynopsis'>
+					<a ng-click='currentTab = "signature"'>Signature</a>
+				</li>
+				<li ng-class='currentTab == "doc" ? "active" : ""'>
+					<a ng-click='currentTab = "doc"'>Doc</a>
+				</li>
+				<li ng-class='currentTab == "grade" ? "active" : ""'>
+					<a ng-click='loadEntityStars(); currentTab = "grade"'>Grade</a>
+				</li>
+			</ul>
+		</div>
+	</div>
 </div>
diff --git a/share/nitweb/directives/metrics/metrics_list.html b/share/nitweb/directives/metrics/metrics_list.html
index 2901b5b..7351363 100644
--- a/share/nitweb/directives/metrics/metrics_list.html
+++ b/share/nitweb/directives/metrics/metrics_list.html
@@ -1,8 +1,8 @@
 <div class='card'>
-	<div class='card-heading'>
-		<h3 class='card-title'>{{listTitle}}</h3>
-	</div>
 	<div class='card-body'>
+		<div class='card-heading'>
+			<h4 class='card-title'>{{listTitle}}</h4>
+		</div>
 		<table class='table'>
 			<tr>
 				<th></th>
diff --git a/share/nitweb/javascripts/entities.js b/share/nitweb/javascripts/entities.js
index c1eb43d..98903e7 100644
--- a/share/nitweb/javascripts/entities.js
+++ b/share/nitweb/javascripts/entities.js
@@ -163,7 +163,8 @@
 				restrict: 'E',
 				scope: {
 					mentity: '=',
-					defaultTab: '@'
+					defaultTab: '@',
+					noSynopsis: '='
 				},
 				replace: true,
 				templateUrl: '/directives/entity/card.html',
diff --git a/share/nitweb/stylesheets/nitweb.css b/share/nitweb/stylesheets/nitweb.css
index 6088827..0443397 100644
--- a/share/nitweb/stylesheets/nitweb.css
+++ b/share/nitweb/stylesheets/nitweb.css
@@ -35,6 +35,8 @@ a {
 }
 
 .card {
+	display: table;
+	width: 100%;
 	background: #fff;
 	border: 1px solid #ccc;
 	margin-top: 10px;
@@ -42,16 +44,21 @@ a {
 }
 
 .card-body, .card-left, .card-right {
+	display: table-cell;
 	padding: 15px;
 }
 
-.card-left, .card .pull-left {
-	float: left;
-	padding: 0 15px 15px 0;
+.card-body {
+	padding: 15px 0;
+	width: 100%
+}
+
+.card-body:first-child {
+	padding-left: 15px;
 }
-.card-right, .card .pull-right {
-	float: right;
-	padding: 0 0 15px 15px;
+
+.card-body:last-child {
+	padding-right: 15px;
 }
 
 .card-list {
diff --git a/share/nitweb/views/class.html b/share/nitweb/views/class.html
index fbb9aaf..445ef37 100644
--- a/share/nitweb/views/class.html
+++ b/share/nitweb/views/class.html
@@ -28,7 +28,7 @@
 
 <div class='tab-content'>
 	<div role='tabpanel' class='tab-pane fade in active' id='doc'>
-		<entity-card mentity='mentity' default-tab='doc'/>
+		<entity-card mentity='mentity' default-tab='doc' no-synopsis='true' />
 
 		<entity-list list-title='Parents'
 			list-entities='mentity.parents'
diff --git a/share/nitweb/views/group.html b/share/nitweb/views/group.html
index 1af3d15..46a2c51 100644
--- a/share/nitweb/views/group.html
+++ b/share/nitweb/views/group.html
@@ -18,7 +18,7 @@
 
 <div class='tab-content'>
 	<div role='tabpanel' class='tab-pane fade in active' id='doc'>
-		<entity-card mentity='mentity' default-tab='doc'/>
+		<entity-card mentity='mentity' default-tab='doc' no-synopsis='true' />
 
 		<entity-list list-title='Parent group' list-entities='[mentity.parent]'
 			list-object-filter='{}' ng-if='mentity.parent' />
diff --git a/share/nitweb/views/module.html b/share/nitweb/views/module.html
index 5f8b4a3..92ec2f9 100644
--- a/share/nitweb/views/module.html
+++ b/share/nitweb/views/module.html
@@ -28,7 +28,7 @@
 
 <div class='tab-content'>
 	<div role='tabpanel' class='tab-pane fade in active' id='doc'>
-		<entity-card mentity='mentity' default-tab='doc'/>
+		<entity-card mentity='mentity' default-tab='doc' no-synopsis='true' />
 
 		<entity-list list-title='Imported modules' list-entities='mentity.imports'
 			list-object-filter='{}' />
diff --git a/share/nitweb/views/package.html b/share/nitweb/views/package.html
index 10ea7f6..33b360b 100644
--- a/share/nitweb/views/package.html
+++ b/share/nitweb/views/package.html
@@ -18,7 +18,7 @@
 
 <div class='tab-content'>
 	<div role='tabpanel' class='tab-pane fade in active' id='doc'>
-		<entity-card mentity='mentity' default-tab='doc'/>
+		<entity-card mentity='mentity' default-tab='doc' no-synopsis='true' />
 
 		<entity-list list-title='Groups' list-entities='mentity.mgroups'
 			list-object-filter='{}' />
diff --git a/share/nitweb/views/property.html b/share/nitweb/views/property.html
index d43410d..a3c2281 100644
--- a/share/nitweb/views/property.html
+++ b/share/nitweb/views/property.html
@@ -13,7 +13,7 @@
 
 <div class='tab-content'>
 	<div role='tabpanel' class='tab-pane fade in active' id='doc'>
-		<entity-card mentity='mentity' default-tab='doc'/>
+		<entity-card mentity='mentity' default-tab='doc' no-synopsis='true' />
 	</div>
 	<div role='tabpanel' class='tab-pane fade' id='linearization'>
 		<entity-linearization
-- 
1.7.9.5