[gnome-control-center/wip/carlosg/wacom-calibrator-style-leaks: 1/2] wacom: Ensure calibrator UI CSS only applies to its UI



commit dbd78496e14787aa65e0b826561a47751be74533
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed May 1 16:05:36 2019 +0200

    wacom: Ensure calibrator UI CSS only applies to its UI
    
    Set a name on the fullscreen window, and require it in all selectors
    in the custom CSS. Fixes style leaking to other g-c-c bits.
    
    https://gitlab.gnome.org/GNOME/gnome-control-center/issues/504

 panels/wacom/calibrator/calibrator.css | 16 ++++++++--------
 panels/wacom/calibrator/calibrator.ui  |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/panels/wacom/calibrator/calibrator.css b/panels/wacom/calibrator/calibrator.css
index bfb0574ce..cf5fcedc2 100644
--- a/panels/wacom/calibrator/calibrator.css
+++ b/panels/wacom/calibrator/calibrator.css
@@ -1,25 +1,25 @@
-window {
+#calibrator {
     background-color: #000;
 }
 
-* {
+#calibrator * {
     color: #fff;
 }
 
-label {
+#calibrator label {
     font-size: larger;
 }
 
-#title {
+#calibrator #title {
     font-weight: bold;
     color: #888;
 }
 
-#error {
+#calibrator #error {
     font-weight: bold;
 }
 
-#target {
+#calibrator #target {
     background-image: url('target.svg');
     background-repeat: no-repeat;
     background-position: 50% 50%;
@@ -36,12 +36,12 @@ label {
     100% { background-size: 0px }
 }
 
-#target:not(disabled) {
+#calibrator #target:not(disabled) {
     animation: target-enabled-animation 1 ease 0.5s;
     background-size: 100px;
 }
 
-#target:disabled {
+#calibrator #target:disabled {
     animation: target-disabled-animation 1 ease 0.2s;
     background-size: 0px;
 }
diff --git a/panels/wacom/calibrator/calibrator.ui b/panels/wacom/calibrator/calibrator.ui
index 4f26ee268..6734b76f1 100644
--- a/panels/wacom/calibrator/calibrator.ui
+++ b/panels/wacom/calibrator/calibrator.ui
@@ -2,6 +2,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkWindow" id="window">
+    <property name="name">calibrator</property>
     <child>
       <object class="GtkStack" id="stack">
         <property name="visible">True</property>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]