[gtk+] HighContrast: Drop deprecated style properties



commit 643454147c306c6d175bb12e3c2af4a6fdaa0db9
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 5 20:39:16 2016 -0500

    HighContrast: Drop deprecated style properties

 gtk/theme/HighContrast/_common.scss           |   72 ++++++++++--------------
 gtk/theme/HighContrast/gtk-contained-dark.css |   37 ++++---------
 gtk/theme/HighContrast/gtk-contained.css      |   37 ++++---------
 3 files changed, 52 insertions(+), 94 deletions(-)
---
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index ded8dfa..70d19c2 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -8,12 +8,8 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
   -GtkTextView-error-underline-color: $error_color;
-  -GtkPaned-handle-size: 1;
   -gtk-icon-style: symbolic; //force symbolic style icons
 
-  -GtkCheckButton-indicator-size: 16;
-  -GtkCheckMenuItem-indicator-size: 16;
-
   // The size for scrollbars. The slider is 2px smaller, but we keep it
   // up so that the whole area is sensitive to button presses for the
   // slider. The stepper button is larger in both directions, the slider
@@ -22,15 +18,12 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
   -GtkScrolledWindow-scrollbar-spacing: 0;
 
   -GtkToolItemGroup-expander-size: 11;
-  -GtkExpander-expander-size: 16;
 
   -GtkTreeView-horizontal-separator: 4;
 
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
 
-  -GtkStatusbar-shadow-type: none;
-
   // We use the outline properties to signal the focus properties
   // to the adwaita engine: using real CSS properties is faster,
   // and we don't use any outlines for now.
@@ -1553,11 +1546,6 @@ scrollbar {
  * Switch *
  **********/
 
-GtkSwitch {
-    -GtkSwitch-slider-width: 47px;
-    -GtkSwitch-slider-height: 28px;
-}
-
 switch {
     font: bold condensed 9;
     outline-offset: -4px;
@@ -1600,6 +1588,10 @@ switch {
         }
     }
     & slider {
+      margin: -1px;
+      min-width: 45px;
+      min-height: 27px;
+      border: 1px solid;
       border-radius: 3px;
       @include button(normal, $edge: none);
       box-shadow: inset 0 1px white,
@@ -1793,26 +1785,33 @@ progressbar {
 }
 
 // moving bit
-progressbar progress {
-  border-width: 1px;
-  border-style: solid;
-  border-radius: 3px;
-  border-color: $selected_borders_color;
-  background-color: $selected_bg_color;
-  // I really prefer these flat w/o this shadow - Lapo
-  box-shadow: inset 0 1px 0 transparentize($borders_edge,0.8);
+progressbar {
+  &.horizontal {
+    trough, progress { min-height: 2px; }
+  }
   &.vertical {
-    box-shadow: inset 1px 0 0 transparentize($borders_edge,0.8);
+    trough, progress { min-width: 2px; }
   }
-  &:backdrop {
-    border-color: $selected_bg_color;
+  & progress {
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 3px;
+    border-color: $selected_borders_color;
     background-color: $selected_bg_color;
-    box-shadow: none;
-  }
-  &.osd {
-    border-width: 0;
-    border-radius: 0;
-    -GtkProgressBar-min-horizontal-bar-height: 2px; //FIXME still too tall
+    // I really prefer these flat w/o this shadow - Lapo
+    box-shadow: inset 0 1px 0 transparentize($borders_edge,0.8);
+    &.vertical {
+      box-shadow: inset 1px 0 0 transparentize($borders_edge,0.8);
+    }
+    &:backdrop {
+      border-color: $selected_bg_color;
+      background-color: $selected_bg_color;
+      box-shadow: none;
+    }
+    &.osd {
+      border-width: 0;
+      border-radius: 0;
+    }
   }
 }
 
@@ -2051,6 +2050,8 @@ row.activatable {
 
 expander {
   & arrow {
+    min-width: 16px;
+    min-height: 16px;
     -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
     &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
     &:hover { color: lighten($fg_color,30%); } //only lightens the arrow
@@ -2321,19 +2322,6 @@ paned {
   }
 }
 
-paned.wide { // this is for the paned with wide separator
-  -GtkPaned-handle-size: 5; // wider separator here
-  margin: 0; // no need of the invisible drag area so, reset margin
-  separator {
-    background-color: transparent;
-    border-style: none solid;
-    border-color: $borders_color;
-    border-width: 1px;
-  }
-  &.vertical separator { border-style: solid none;}
-  separator:backdrop { border-color: $backdrop_borders_color; }
-}
-
 /**************
  * GtkInfoBar *
  **************/
diff --git a/gtk/theme/HighContrast/gtk-contained-dark.css b/gtk/theme/HighContrast/gtk-contained-dark.css
index 522e1db..3a36f70 100644
--- a/gtk/theme/HighContrast/gtk-contained-dark.css
+++ b/gtk/theme/HighContrast/gtk-contained-dark.css
@@ -35,17 +35,12 @@
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
   -GtkTextView-error-underline-color: #cc0000;
-  -GtkPaned-handle-size: 1;
   -gtk-icon-style: symbolic;
-  -GtkCheckButton-indicator-size: 16;
-  -GtkCheckMenuItem-indicator-size: 16;
   -GtkScrolledWindow-scrollbar-spacing: 0;
   -GtkToolItemGroup-expander-size: 11;
-  -GtkExpander-expander-size: 16;
   -GtkTreeView-horizontal-separator: 4;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
-  -GtkStatusbar-shadow-type: none;
   outline-color: rgba(255, 255, 255, 0.3);
   outline-style: dashed;
   outline-offset: -3px;
@@ -1668,10 +1663,6 @@ scrollbar {
 /**********
  * Switch *
  **********/
-GtkSwitch {
-  -GtkSwitch-slider-width: 47px;
-  -GtkSwitch-slider-height: 28px; }
-
 switch {
   font: bold condensed 9;
   outline-offset: -4px;
@@ -1709,6 +1700,10 @@ switch {
       color: gray;
       border-color: gray; }
   switch slider {
+    margin: -1px;
+    min-width: 45px;
+    min-height: 27px;
+    border: 1px solid;
     border-radius: 3px;
     border-width: 2px;
     border-style: solid;
@@ -1959,6 +1954,10 @@ progressbar {
     box-shadow: none;
     border-width: 0; }
 
+progressbar.horizontal trough, progressbar.horizontal progress {
+  min-height: 2px; }
+progressbar.vertical trough, progressbar.vertical progress {
+  min-width: 2px; }
 progressbar progress {
   border-width: 1px;
   border-style: solid;
@@ -1974,8 +1973,7 @@ progressbar progress {
     box-shadow: none; }
   progressbar progress.osd {
     border-width: 0;
-    border-radius: 0;
-    -GtkProgressBar-min-horizontal-bar-height: 2px; }
+    border-radius: 0; }
 
 /*************
  * Level Bar *
@@ -2296,6 +2294,8 @@ row.activatable {
  * Expanders *
  *************/
 expander arrow {
+  min-width: 16px;
+  min-height: 16px;
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
   expander arrow:dir(rtl) {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
@@ -2581,21 +2581,6 @@ placessidebar .view paned separator.wide:backdrop {
   border-color: gray;
   border-width: 1px; }
 
-paned.wide {
-  -GtkPaned-handle-size: 5;
-  margin: 0; }
-  paned.wide separator,
-  paned.wide placessidebar .view separator:backdrop,
-  placessidebar .view paned.wide separator:backdrop {
-    background-color: transparent;
-    border-style: none solid;
-    border-color: gray;
-    border-width: 1px; }
-  paned.wide.vertical separator {
-    border-style: solid none; }
-  paned.wide separator:backdrop {
-    border-color: #737373; }
-
 /**************
  * GtkInfoBar *
  **************/
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 6ccba92..de18c6f 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -35,17 +35,12 @@
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
   -GtkTextView-error-underline-color: #cc0000;
-  -GtkPaned-handle-size: 1;
   -gtk-icon-style: symbolic;
-  -GtkCheckButton-indicator-size: 16;
-  -GtkCheckMenuItem-indicator-size: 16;
   -GtkScrolledWindow-scrollbar-spacing: 0;
   -GtkToolItemGroup-expander-size: 11;
-  -GtkExpander-expander-size: 16;
   -GtkTreeView-horizontal-separator: 4;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
-  -GtkStatusbar-shadow-type: none;
   outline-color: rgba(0, 0, 0, 0.3);
   outline-style: dashed;
   outline-offset: -3px;
@@ -1668,10 +1663,6 @@ scrollbar {
 /**********
  * Switch *
  **********/
-GtkSwitch {
-  -GtkSwitch-slider-width: 47px;
-  -GtkSwitch-slider-height: 28px; }
-
 switch {
   font: bold condensed 9;
   outline-offset: -4px;
@@ -1709,6 +1700,10 @@ switch {
       color: gray;
       border-color: gray; }
   switch slider {
+    margin: -1px;
+    min-width: 45px;
+    min-height: 27px;
+    border: 1px solid;
     border-radius: 3px;
     border-width: 2px;
     border-style: solid;
@@ -1959,6 +1954,10 @@ progressbar {
     box-shadow: none;
     border-width: 0; }
 
+progressbar.horizontal trough, progressbar.horizontal progress {
+  min-height: 2px; }
+progressbar.vertical trough, progressbar.vertical progress {
+  min-width: 2px; }
 progressbar progress {
   border-width: 1px;
   border-style: solid;
@@ -1974,8 +1973,7 @@ progressbar progress {
     box-shadow: none; }
   progressbar progress.osd {
     border-width: 0;
-    border-radius: 0;
-    -GtkProgressBar-min-horizontal-bar-height: 2px; }
+    border-radius: 0; }
 
 /*************
  * Level Bar *
@@ -2296,6 +2294,8 @@ row.activatable {
  * Expanders *
  *************/
 expander arrow {
+  min-width: 16px;
+  min-height: 16px;
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
   expander arrow:dir(rtl) {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
@@ -2581,21 +2581,6 @@ placessidebar .view paned separator.wide:backdrop {
   border-color: gray;
   border-width: 1px; }
 
-paned.wide {
-  -GtkPaned-handle-size: 5;
-  margin: 0; }
-  paned.wide separator,
-  paned.wide placessidebar .view separator:backdrop,
-  placessidebar .view paned.wide separator:backdrop {
-    background-color: transparent;
-    border-style: none solid;
-    border-color: gray;
-    border-width: 1px; }
-  paned.wide.vertical separator {
-    border-style: solid none; }
-  paned.wide separator:backdrop {
-    border-color: #8d8d8d; }
-
 /**************
  * GtkInfoBar *
  **************/


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