[polari] entryArea: Remove intermediate frame

[Marge Bot <marge-bot src gnome org>]

commit 5eb7e10ee9965a148c0ce6b30541bea7886c354e
Author: Florian Müllner <fmuellner gnome org>
Date:   Mon Feb 15 13:23:49 2021 +0100

    entryArea: Remove intermediate frame
    
    In the early days of GTK3, many widgets did not apply background or
    margins from CSS. A Gtk.Frame without border was a convenient choice
    in that case, as it doesn't have any styling on its own, but can be
    styled via CSS.
    
    Over time GTK3 got a lot better, and now many widgets do apply CSS,
    so resorting to an intermediate frame is no longer necessary.
    
    Part-of: <https://gitlab.gnome.org/GNOME/polari/-/merge_requests/225>

 data/resources/application.css |   7 +++
 data/resources/entry-area.ui   | 118 +++++++++++++++++++----------------------
 2 files changed, 61 insertions(+), 64 deletions(-)
---
diff --git a/data/resources/application.css b/data/resources/application.css
index 8f43bdeb..7e118af8 100644
--- a/data/resources/application.css
+++ b/data/resources/application.css
@@ -36,6 +36,13 @@
 .polari-paste-confirmation {
     border: 0 solid @borders;
     border-top-width: 1px;
+    padding: 6px;
+}
+.polari-paste-confirmation:dir(ltr) {
+    padding-right: 0;
+}
+.polari-paste-confirmation:dir(rtl) {
+    padding-left: 0;
 }
 
 .polari-nick-button {
diff --git a/data/resources/entry-area.ui b/data/resources/entry-area.ui
index 6b696ba2..5d4c2f75 100644
--- a/data/resources/entry-area.ui
+++ b/data/resources/entry-area.ui
@@ -55,81 +55,71 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame1">
+      <object class="GtkBox" id="pasteBox">
         <property name="visible">True</property>
-        <property name="shadow-type">none</property>
+        <property name="spacing">6</property>
         <style>
           <class name="background"/>
           <class name="polari-paste-confirmation"/>
         </style>
         <child>
-          <object class="GtkBox" id="pasteBox">
+          <object class="GtkSpinner" id="uploadSpinner">
             <property name="visible">True</property>
-            <property name="spacing">6</property>
-            <property name="margin-start">6</property>
-            <property name="margin-end">0</property>
-            <property name="margin-top">6</property>
-            <property name="margin-bottom">6</property>
-            <child>
-              <object class="GtkSpinner" id="uploadSpinner">
-                <property name="visible">True</property>
-                <property name="active">False</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="uploadLabel">
-                <property name="visible" bind-source="confirmLabel"
-                          bind-property="visible"
-                          bind-flags="sync-create|invert-boolean" />
-                <property name="halign">start</property>
-                <property name="hexpand">True</property>
-                <property name="ellipsize">end</property>
-                <property name="xalign">0</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="confirmLabel">
-                <property name="halign">start</property>
-                <property name="hexpand">True</property>
-                <property name="ellipsize">end</property>
-                <property name="xalign">0</property>
-                <property name="visible">False</property>
-              </object>
-            </child>
+            <property name="active">False</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="uploadLabel">
+            <property name="visible" bind-source="confirmLabel"
+                      bind-property="visible"
+                      bind-flags="sync-create|invert-boolean" />
+            <property name="halign">start</property>
+            <property name="hexpand">True</property>
+            <property name="ellipsize">end</property>
+            <property name="xalign">0</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="confirmLabel">
+            <property name="halign">start</property>
+            <property name="hexpand">True</property>
+            <property name="ellipsize">end</property>
+            <property name="xalign">0</property>
+            <property name="visible">False</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkRevealer">
+            <property name="visible">True</property>
+            <property name="transition-type">slide-left</property>
+            <property name="reveal-child" bind-source="confirmLabel"
+                      bind-property="visible" bind-flags="sync-create" />
             <child>
-              <object class="GtkRevealer">
+              <object class="GtkBox">
                 <property name="visible">True</property>
-                <property name="transition-type">slide-left</property>
-                <property name="reveal-child" bind-source="confirmLabel"
-                          bind-property="visible" bind-flags="sync-create" />
+                <property name="spacing">6</property>
+                <property name="margin-end">14</property>
+                <child>
+                  <object class="GtkButton" id="cancelButton">
+                    <property name="label" translatable="yes">_Cancel</property>
+                    <property name="visible">True</property>
+                    <property name="receives-default">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="sensitive" bind-source="confirmLabel"
+                              bind-property="visible" bind-flags="sync-create" />
+                  </object>
+                </child>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkButton" id="pasteButton">
+                    <property name="label" translatable="yes">_Paste</property>
                     <property name="visible">True</property>
-                    <property name="spacing">6</property>
-                    <property name="margin-end">14</property>
-                    <child>
-                      <object class="GtkButton" id="cancelButton">
-                        <property name="label" translatable="yes">_Cancel</property>
-                        <property name="visible">True</property>
-                        <property name="receives-default">True</property>
-                        <property name="use-underline">True</property>
-                        <property name="sensitive" bind-source="confirmLabel"
-                                  bind-property="visible" bind-flags="sync-create" />
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="pasteButton">
-                        <property name="label" translatable="yes">_Paste</property>
-                        <property name="visible">True</property>
-                        <property name="receives-default">True</property>
-                        <property name="use-underline">True</property>
-                        <property name="sensitive" bind-source="confirmLabel"
-                                  bind-property="visible" bind-flags="sync-create" />
-                        <style>
-                          <class name="suggested-action"/>
-                        </style>
-                      </object>
-                    </child>
+                    <property name="receives-default">True</property>
+                    <property name="use-underline">True</property>
+                    <property name="sensitive" bind-source="confirmLabel"
+                              bind-property="visible" bind-flags="sync-create" />
+                    <style>
+                      <class name="suggested-action"/>
+                    </style>
                   </object>
                 </child>
               </object>