Adwaita: popover scss cleanup

3 files changed, 19 insertions, 8 deletions

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 06d5c5240e..ee5a2ad1b9 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1572,28 +1572,31 @@ column-header.button.dnd { // for treeview-like derive widgets
  ***************/
 
 .popover {
-  margin: 10px;
   padding: 2px;
   border: 1px solid $borders-color;
   border-radius: 5px;
   background-color: mix($bg_color, $base_color, 50%);
 
   box-shadow: 0 2px 3px transparentize(black, 0.5);
+
   &:backdrop {
     box-shadow: none;
   }
-  & > .list,
-  & > .view,
-  & > .toolbar,
+
+  > .list,
+  > .view,
+  > .toolbar,
   &.osd > .toolbar {
     border-style: none;
     background-color: transparent;
   }
+
   .button.flat,
   .button.flat:hover {
     text-shadow: none;
     transition: none;
   }
+
   &.osd { @extend %osd; }
 }
 
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index a4a662d4de..63bc73d3d0 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -2139,7 +2139,6 @@ column-header .titlebar .button.titlebutton,
  * Popovers   *
  ***************/
 .popover {
-  margin: 10px;
   padding: 2px;
   border: 1px solid #1c1f1f;
   border-radius: 5px;
@@ -2147,7 +2146,12 @@ column-header .titlebar .button.titlebutton,
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
   .popover:backdrop {
     box-shadow: none; }
-  .popover > .list, .popover > .view, .popover > .toolbar, .popover > .inline-toolbar, .popover > .search-bar, .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
+  .popover > .list,
+  .popover > .view,
+  .popover > .toolbar,
+  .popover > .inline-toolbar,
+  .popover > .search-bar,
+  .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
   .popover .button.flat, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 42262af64e..19170b382f 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -2136,7 +2136,6 @@ column-header .titlebar .button.titlebutton,
  * Popovers   *
  ***************/
 .popover {
-  margin: 10px;
   padding: 2px;
   border: 1px solid #a1a1a1;
   border-radius: 5px;
@@ -2144,7 +2143,12 @@ column-header .titlebar .button.titlebutton,
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.5); }
   .popover:backdrop {
     box-shadow: none; }
-  .popover > .list, .popover > .view, .popover > .toolbar, .popover > .inline-toolbar, .popover > .search-bar, .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
+  .popover > .list,
+  .popover > .view,
+  .popover > .toolbar,
+  .popover > .inline-toolbar,
+  .popover > .search-bar,
+  .popover > .location-bar, .popover.osd > .toolbar, .popover.osd > .inline-toolbar, .popover.osd > .search-bar, .popover.osd > .location-bar {
     border-style: none;
     background-color: transparent; }
   .popover .button.flat, .popover .header-bar .titlebutton.button, .header-bar .popover .titlebutton.button,