From: Tom Hughes <tom@compton.nu>
Date: Sun, 18 Sep 2022 17:34:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/3698'
X-Git-Tag: live~2081
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/364a56dfc38e3a38ead04079e8d0a0555c5ac655?hp=10babd39b095a13d70726cc7d512e084ab0e5f63

Merge remote-tracking branch 'upstream/pull/3698'
---

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 88452226b..f16785d82 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -1257,16 +1257,6 @@ tr.turn:hover {
   display: inline !important;
 }
 
-/* Rules for the oauth settings page */
-
-.oauth_clients .buttons .oauth-edit {
-  border-radius: 2px 0 0 2px;
-}
-
-.oauth_clients .buttons .oauth-delete {
-  border-radius: 0 2px 2px 0;
-}
-
 /* Rules for the oauth authorization page */
 
 .oauth-authorize ul {
@@ -1428,7 +1418,7 @@ abbr.geo {
   border-bottom: none;
 }
 
-/* General styles for action lists / subnavs / pager navs */
+/* General styles for action lists / subnavs */
 
 
 nav.secondary-actions {
@@ -1441,10 +1431,6 @@ nav.secondary-actions {
     margin-bottom: 0;
     margin-left: -1px;
     padding: 0;
-    &.pager {
-      display: inline-block;
-      margin-right: 60px;
-    }
     > li {
       flex-basis: auto;
       list-style: none;
@@ -1461,60 +1447,6 @@ div.secondary-actions {
   text-align: center;
 }
 
-.buttons {
-  min-width: 200px;
-  input[type="submit"],
-  input[type="button"],
-  input[type="reset"],
-  .button,
-  .button_to {
-    box-sizing: border-box;
-    float: left;
-    border-radius: 0;
-    margin:0;
-    min-width: 75px;
-    max-width: 180px;
-    border-right:1px solid white;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
-  input:first-child,
-  .button:first-child,
-  .button_to:first-child {
-    border-radius:2px 0 0 2px;
-  }
-  input:last-child,
-  .button:last-child,
-  .button_to:last-child {
-    border-radius:0 2px 2px 0;
-    border-right-width: 0;
-  }
-  input:only-child,
-  .button:only-child,
-  .button_to:only-child,
-  *[value="Hide"] + input:last-child,
-  *[value="Hide"] + .button:last-child,
-  *[value="Hide"] + .button_to:last-child {
-    border-radius:2px;
-    border-right-width: 0;
-  }
-    /* if a 3-button set has a hidden middle button */
-  *[value="Hide"] + input:nth-child(3),
-  *[value="Hide"] + .button:nth-child(3),
-  *[value="Hide"] + .button_to:nth-child(3) {
-    border-radius:0 2px 2px 0;
-    border-right-width: 0;
-  }
-  /* if a 3-button set starts with a hidden button */
-  *[value="Hide"] + input:nth-child(2):not(:last-child),
-  *[value="Hide"] + .button:nth-child(2):not(:last-child),
-  *[value="Hide"] + .button_to:nth-child(2):not(:last-child) {
-    border-radius:2px 0 0 2px;
-    border-right-width: 1px;
-  }
-}
-
 /* Create a single-line dl */
 
 dl.dl-inline {
diff --git a/app/views/browse/new_note.html.erb b/app/views/browse/new_note.html.erb
index 657ad9039..c8f658f53 100644
--- a/app/views/browse/new_note.html.erb
+++ b/app/views/browse/new_note.html.erb
@@ -10,7 +10,7 @@
     <div class="mb-3">
       <textarea class="form-control" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t("javascripts.notes.new.advice") %>"></textarea>
     </div>
-    <div class="buttons clearfix">
+    <div class="btn-wrapper">
       <input type="submit" name="add" value="<%= t("javascripts.notes.new.add") %>" disabled="1" class="btn btn-primary">
     </div>
   </form>