Merge pull request #4299 from AntonKhorev/no-changeset-action-button-css

Remove subscribe/unsubscribe button custom css

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 73226a51823d48aebae0d9df8a74736fa6446240..a366a1bc1dac33bf2df82e0a3d94a9c20f88450a 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -763,12 +763,6 @@ tr.turn:hover {
     }
   }
 
-  .subscribe-buttons input {
-    font-size: 90%;
-    line-height: 15px;
-    min-height: 20px;
-  }
-
   span.action-button:hover {
     cursor: pointer;
     text-decoration: underline;

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 9acbd05ae03992fc923f82f03420cf8c7b4ce8d1..93e0abf219cbae0f908edcd53b43112ed5dd6885 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -17,15 +17,11 @@
 
     <% if current_user %>
       <div class="col-auto">
-        <div class="subscribe-buttons">
-          <form action="#">
-            <% if @changeset.subscribers.exists?(current_user.id) %>
-              <input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
-            <% else %>
-              <input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
-            <% end %>
-          </form>
-        </div>
+        <% if @changeset.subscribers.exists?(current_user.id) %>
+          <button class="action-button btn btn-sm btn-primary" name="unsubscribe" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.unsubscribe") %></button>
+        <% else %>
+          <button class="action-button btn btn-sm btn-primary" name="subscribe" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>"><%= t("javascripts.changesets.show.subscribe") %></button>
+        <% end %>
       </div>
     <% end %>
   </div>