From 247bfeeed72bf38d9de99fde5906610d343f1e6d Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Tue, 24 Jan 2017 15:19:46 -0200
Subject: [PATCH] Webpages list style adjusts

---
 amadeus/static/css/base/amadeus.css  | 34 ++++++++++++++++++++++++----------
 amadeus/static/css/themes/green.css  |  4 ++++
 webpage/templates/webpages/list.html | 12 ++++++------
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index dd6a202..ae1c00e 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -752,29 +752,21 @@ a.add-row {
 }
 
 .resource_list {
-    margin-left: 30px;
+    margin-left: 20px;
     border-top: none !important;
 }
 
-.resource_list > .list-group-item:first-child {
-    border-top-left-radius: 4px !important;
-    border-top-right-radius: 4px !important;
-}
-
 .resource_list > .list-group-item {
     position: relative;
     display: block;
-    padding: 10px 15px;
+    padding: 10px 0px 10px 15px;
     margin-bottom: -1px;
-    border-width: 1px !important;
     overflow: inherit;
     cursor: pointer;
 }
 
 .resource_list > .list-group-item:last-child {
     margin-bottom: 0;
-    border-bottom-right-radius: 4px !important;
-    border-bottom-left-radius: 4px !important;
 }
 
 .resource_list .list-group-item .list-group-item-heading {
@@ -786,6 +778,28 @@ a.add-row {
     margin: 0px;
 }
 
+.resource_list .btn-group button {
+    margin-top: -5px;
+    padding-right: 15px;
+    padding-left: 15px;
+}
+
+.resource_list .btn-group button:focus {
+    outline: none;
+}
+
+.resource_list .btn-group button:active {
+    margin-top: -5px;
+}
+
+.resource_list .btn-group button i {
+    margin-right: 0px;
+}
+
+.resource_list .fa-arrows {
+    margin-right: 0px;
+}
+
 .resource_list > .disabled a {
     cursor: not-allowed;
 }
diff --git a/amadeus/static/css/themes/green.css b/amadeus/static/css/themes/green.css
index bbd057b..7374fee 100644
--- a/amadeus/static/css/themes/green.css
+++ b/amadeus/static/css/themes/green.css
@@ -393,6 +393,10 @@ a.add-row {
     color: inherit;
 }
 
+.resource_list .btn-group button:active, .resource_list .btn-group button:focus, .resource_list .btn-group button:hover {
+    background-color: initial !important;
+}
+
 @media(max-width: 768px) {
     .navbar .navbar-nav .dropdown .dropdown-menu li > a {
         color: #333333 !important;
diff --git a/webpage/templates/webpages/list.html b/webpage/templates/webpages/list.html
index ba491a9..c25c1ef 100644
--- a/webpage/templates/webpages/list.html
+++ b/webpage/templates/webpages/list.html
@@ -20,10 +20,10 @@
 				{% if has_subject_permissions %}
 					<div class="pull-right category-card-items">
 		                <a><i class="fa fa-arrows" aria-hidden="true"></i></a>
-		                <span class="btn-group">
-			                <a href="" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
-			                    <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
-			                </a>
+		                <span class="btn-group pull-right">
+			                <button class="btn btn-sm btn_menu" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+			                	<i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+			                </button>
 			                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="moreResources">
 			                    <li><a href="{% url 'webpages:update' topic.slug resource.slug %}" class="edit"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
 			                    <li><a href="javascript:delete_resource('{% url 'webpages:delete' resource.slug %}')" class="delete"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>{% trans 'Remove' %}</a></li>
@@ -53,11 +53,11 @@
 	$(".list-group-item").unbind().on('click', function (e) {
 		var arrow = $(this).find('i.fa-arrows').is(e.target),
 			menu = $(this).find('i.fa-ellipsis-v').is(e.target),
+			btn = $(this).find('button.btn_menu').is(e.target),
 			del = $(this).find('a.delete').is(e.target),
 			upd = $(this).find('a.edit').is(e.target);
 		
-
-		if (!arrow && !menu && !del && !upd) {
+		if (!arrow && !menu && !del && !upd && !btn) {
 			var link = $(this).find('.resource_link').attr('href'),
 				target = $(this).find('.resource_link').attr('target');
 
--
libgit2 0.21.2