]> git.openstreetmap.org Git - rails.git/commitdiff
Remove .btn-group wrapping Edit button
authorAnton Khorev <tony29@yandex.ru>
Tue, 3 Sep 2024 00:32:33 +0000 (03:32 +0300)
committerAnton Khorev <tony29@yandex.ru>
Tue, 3 Sep 2024 00:32:33 +0000 (03:32 +0300)
app/assets/stylesheets/common.scss
app/views/layouts/_header.html.erb

index 042d4401ca815106704c34c48b27293cbd6c6c34..7673891eb14d00d39a6f5160163ec08503602843 100644 (file)
@@ -119,7 +119,7 @@ header {
 }
 
 nav.primary {
 }
 
 nav.primary {
-  & > .btn-group .btn-outline-primary {
+  #edit_tab .btn-outline-primary {
     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
     @include button-outline-variant($green, $color-hover: $white, $active-color: $white);
   }
 
@@ -205,7 +205,7 @@ body.small-nav {
     margin-right: 0;
     padding: 0;
 
     margin-right: 0;
     padding: 0;
 
-    > .btn-group {
+    #edit_tab {
       width: 100%;
       padding: 10px;
     }
       width: 100%;
       padding: 10px;
     }
index 3e17d34743118df920682ea8764c8604c6fc3504..fcf134fd29c8b0d9c673fcea647e3679b54e448b 100644 (file)
@@ -8,25 +8,23 @@
   <a href="#" id="menu-icon"></a>
   <nav class='primary'>
     <%= content_for :header %>
   <a href="#" id="menu-icon"></a>
   <nav class='primary'>
     <%= content_for :header %>
-    <div class="btn-group">
-      <div id="edit_tab" class="btn-group flex-grow-1">
-        <%= link_to t("layouts.edit"),
-                    edit_path,
-                    :class => "btn btn-outline-primary geolink editlink",
-                    :id => "editanchor",
-                    :data => { :editor => preferred_editor } %>
-        <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split flex-grow-0' type='button' data-bs-toggle='dropdown'></button>
-        <ul class='dropdown-menu'>
-          <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-            <li>
-              <%= link_to t("layouts.edit_with", :editor => t("editor.#{editor}.description")),
-                          edit_path(:editor => editor),
-                          :data => { :editor => editor },
-                          :class => "geolink editlink dropdown-item" %>
-            </li>
-          <% end %>
-        </ul>
-      </div>
+    <div id="edit_tab" class="btn-group">
+      <%= link_to t("layouts.edit"),
+                  edit_path,
+                  :class => "btn btn-outline-primary geolink editlink",
+                  :id => "editanchor",
+                  :data => { :editor => preferred_editor } %>
+      <button class='btn btn-outline-primary dropdown-toggle dropdown-toggle-split flex-grow-0' type='button' data-bs-toggle='dropdown'></button>
+      <ul class='dropdown-menu'>
+        <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+          <li>
+            <%= link_to t("layouts.edit_with", :editor => t("editor.#{editor}.description")),
+                        edit_path(:editor => editor),
+                        :data => { :editor => editor },
+                        :class => "geolink editlink dropdown-item" %>
+          </li>
+        <% end %>
+      </ul>
     </div>
   </nav>
   <nav class='secondary d-flex gap-2 align-items-center'>
     </div>
   </nav>
   <nav class='secondary d-flex gap-2 align-items-center'>