Conflicts solved

10 years ago · e8fccf3f5d
parent 4d0920cd8d d13719f361
commit e8fccf3f5d
1 changed files with 3 additions and 8 deletions
--- a/app/assets/stylesheets/new_common/create/listing/listing_navigation.css.scss
+++ b/app/assets/stylesheets/new_common/create/listing/listing_navigation.css.scss
@ -32,12 +32,7 @@
  margin-top: 48px;
  font-size: $sFontSize-small;
 }
-.Filters--navListing .Button--create.is-disabled {
-  height: 34px;
-  margin-top: 48px;
-  font-size: $sFontSize-small;
-  &:hover {
-    background: none;
-    color: $cTypography-link;
-  }
+.Filters--navListing .Button--create.is-disabled:hover {
+  background: none;
+  color: $cTypography-link;
 }