resolve merge conflict

2017-02-02 09:38:07 +01:00
parent 2e0180ba55 23303391e0
commit c3bada3c32
16 changed files with 161 additions and 166 deletions
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2106,12 +2106,6 @@ dl.bb-dl > dd > li {
 	text-align: center;
 }

-.rmagic-button {
-	padding-top: 10px;
-	margin-left: 10px;
-	margin-bottom: 10px;
-}
-
 #nav-login {
 	display: none;
 	width: 200px;
@@ -2119,3 +2113,13 @@ dl.bb-dl > dd > li {
 	border-radius: $radiuspx;

 }
+
+.login-dropdown-menu {
+	padding: 8px;
+	background-color: #eee;
+}
+
+.rmagic-button {
+	margin: 15px 0 5px;
+	
+}