From 1a5c667c832696dca9fddfd5fbc67897cb952347 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Mon, 2 Sep 2013 09:51:31 +0200
Subject: [PATCH] Working

Merge of Frank's updates
---
 templates/admin/default/assets/css/admin.less | 81 +++++++++++++++++--
 1 file changed, 75 insertions(+), 6 deletions(-)

diff --git a/templates/admin/default/assets/css/admin.less b/templates/admin/default/assets/css/admin.less
index 2bad0952c..86955cd52 100755
--- a/templates/admin/default/assets/css/admin.less
+++ b/templates/admin/default/assets/css/admin.less
@@ -261,6 +261,10 @@ hr {
 			width: 23px;
 			height: @top-bar-height;
 		}
+
+		a.profile {
+		    color: #fff;
+		}
 	}
 
 	.view-shop {
@@ -278,10 +282,6 @@ hr {
 
 .loginpage {
 
-	.brandbar {
-		width: 100%;
-	}
-
 	.hero-unit {
     	background-color: transparent !important;
 
@@ -361,6 +361,10 @@ hr {
 	}
 }
 
+.brandbar-wide {
+        width: 100%;
+}
+
 // -- Navigation bar ----------------------------------------------------------
 
 .navbar {
@@ -616,6 +620,11 @@ form .info .input-append .add-on {
         line-height: 30px;
     }
 
+    .title-without-tabs {
+        border-bottom: 2px solid #A5CED8;
+        margin-bottom: 0.5em;
+    }
+
     // The action bar on the right
     .actions {
         text-align: right;
@@ -635,6 +644,8 @@ form .info .input-append .add-on {
 
         line-height: 30px;
         margin-bottom: 1em;
+        border-bottom: 1px dotted #A5CED8;
+        padding-bottom: 0.5em;
 
         .inner-actions {
             text-align: right;
@@ -674,7 +685,7 @@ label {
 }
 
 .input-append.input-block-level .add-on img {
-    max-height: 18px;
+    max-height: 16px;
 }
 
 // Information in field label
@@ -744,9 +755,12 @@ label {
 
 		line-height: 30px;
 
-		.btn-add-item {
+		.action-btn {
 			display: block;
 			float: right;
+			margin-left: 10px;
+
+			text-transform: none;
 		}
 	}
 
@@ -887,4 +901,59 @@ label {
 	button.add-on{
 		height: auto;
 	}
+
+	th {
+	    a {
+	        color: inherit;
+	    }
+	}
+
+    td {
+        vertical-align: middle;
+
+        img {
+            border: 2px solid white;
+            border-radius: 4px 4px 4px 4px;
+            box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+        }
+
+        &.actions {
+            text-align: right;
+        }
+    }
+}
+
+.menu-list-table .table-striped  {
+    td, th {
+        text-align: left;
+    }
+
+    td:nth-child(2) {
+        text-align: right;
+    }
+
+    caption {
+        background-color: #FFFFFF;
+        border-bottom: 2px solid #A5CED8;
+        color: #5A6876;
+        font-weight: bold;
+        line-height: 30px;
+        text-align: left;
+        text-transform: uppercase;
+    }
+}
+
+.table-left-aligned {
+    th, td {
+        text-align: left;
+    }
+
+    select, textarea, input[type="text"], input[type="password"], input[type="datetime"], input[type="datetime-local"], input[type="date"], input[type="month"], input[type="time"], input[type="week"], input[type="number"], input[type="email"], input[type="url"], input[type="search"], input[type="tel"], input[type="color"], .uneditable-input {
+        margin-bottom: 0;
+    }
+}
+
+// Modal is no longer limited
+.modal-body {
+    max-height: none;
 }
\ No newline at end of file