merging

1 files changed, 11 insertions, 5 deletions

diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index dec08b567..d32306cbc 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -63,7 +63,6 @@
 			margin: 0;
 		}
 		button.close {
-			margin: -2px -2px 0 0;
 			color: #fff;
 			@include opacity(1);
 			z-index: 5;
@@ -71,7 +70,8 @@
 			height: 30px;
 			line-height: 30px;
 			@include single-transition(all, 0.25s, ease-in);
-			position: relative;
+			position: absolute;
+			right: 10px;
 			&:hover {
 				background: rgba(0, 0, 0, 0.1);
 			}
@@ -82,7 +82,7 @@
 		.btn {
 			&.btn-primary {
 				float: right;
-				margin-top: -4px;
+				margin: -4px 25px 0 0;
 				position: relative;
 				i {
 					margin-right: 5px;
@@ -118,12 +118,11 @@
 	}
 	&#more_channels {
 		.modal-body {
-			padding: 5px 10px;
+			padding: 0;
 		}
 	}
 	.more-channel-table {
 		margin: 0;
-		table-layout: fixed;
 		p {
 			font-size: 0.9em;
 			overflow: hidden;
@@ -138,16 +137,23 @@
 		}
 		tbody {
 			> tr {
+				&:hover td {
+					background: #f7f7f7;
+				}
 				&:first-child {
 					td {
 						border: none;
 					}
 				}
 				td {
+					width: 100%;
 					white-space: nowrap;
 					overflow: hidden;
 					text-overflow: ellipsis;
+					padding: 8px 8px 8px 15px;
 					&.td--action {
+						text-align: right;
+						padding: 8px 15px 8px 8px;
 						width: 70px;
 						vertical-align: middle;
 					}