[gtk-css-engine] [moblesse] Don't use global radius, just where needed.



commit a1ce7a0e3c9f806b81c49d39b2d231bbd5483719
Author: Robert Staudinger <robsta gnome org>
Date:   Tue Jun 23 15:32:02 2009 +0200

    [moblesse] Don't use global radius, just where needed.

 data/user-agent.css               |   19 +++++++------
 themes/moblesse/gtk-2.0/gtkrc.css |   51 ++++++++++++++++++++++++++++++++++---
 2 files changed, 57 insertions(+), 13 deletions(-)
---
diff --git a/data/user-agent.css b/data/user-agent.css
index b8a65f6..cfc05a8 100644
--- a/data/user-agent.css
+++ b/data/user-agent.css
@@ -16,6 +16,11 @@ GtkCalendar > shadow {
 	border-radius: inherit;
 }
 
+GtkCalendar > gtk-header {
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+}
+
 GtkCellRendererProgress > box {
 	background: inherit;
 	border: inherit;
@@ -29,7 +34,7 @@ GtkCheckButton > flat-box {
 }
 
 /* FIXME: rtl variant? */
-GtkComboBoxEntry > shadow {
+GtkComboBoxEntry > GtkEntry > shadow {
 	background: inherit;
 	border-left: inherit;
 	border-top: inherit;
@@ -118,13 +123,11 @@ GtkHScale > box {
 	border-bottom: inherit;
 }
 
-/* The steppers would fit this rule as well, but they are overridden by a 
- * custom match. */
-GtkHScrollbar > box {
+GtkHScrollbar > gtk-trough {
 	background: inherit;
 	border-top: inherit;
 	border-bottom: inherit;
-	border-radius: 0;
+	border-radius: inherit;
 }
 
 /* DEPRECATED, maybe consider later.
@@ -278,13 +281,11 @@ GtkVScale > box {
 	border-bottom: inherit;
 }
 
-/* The steppers would fit this rule as well, but they are overridden by a 
- * custom match. */
-GtkVScrollbar > box {
+GtkVScrollbar > gtk-trough {
 	background: inherit;
 	border-left: inherit;
 	border-right: inherit;
-	border-radius: 0;
+	border-radius: inherit;
 }
 
 GtkWindow > flat-box {
diff --git a/themes/moblesse/gtk-2.0/gtkrc.css b/themes/moblesse/gtk-2.0/gtkrc.css
index 854fb32..f1242f1 100644
--- a/themes/moblesse/gtk-2.0/gtkrc.css
+++ b/themes/moblesse/gtk-2.0/gtkrc.css
@@ -11,7 +11,6 @@
 
 	background-color: gtk-color(bg_color);
 	border-color: gtk-color(fg_color);
-	border-radius: 3px;
 	color: gtk-color(text_color);
 	/* Terminate recursion for properties inherited by the builtin stylesheet.
 	border-radius: none;
@@ -49,6 +48,7 @@ gtk-check-mark[shadow=in] {
 gtk-handle {
 	background: gtk-mix(0.5, selected_bg_color, grey);
 	border: 1px solid;
+  border-radius: 3px;
 }
 
 gtk-header {
@@ -69,6 +69,7 @@ gtk-radio-knob[shadow=in] {
 	background: gtk-color(selected_bg_color);
 }
 
+/* FIXME: maybe have just 'gtk-stepper' with direction/orientation attributes? */
 gtk-stepper-up, gtk-stepper-down {
 	border: 1px solid;
 }
@@ -76,6 +77,7 @@ gtk-stepper-up, gtk-stepper-down {
 gtk-tab {
   background: gtk-shade(1.05, bg_color);
 	border: 1px solid;
+  border-radius: 3px;
 }
 
 gtk-trough {
@@ -86,8 +88,9 @@ gtk-trough {
  * Regular gtk widgets.
  */
 
-GtkButton, GtkComboBox, GtkEntry, GtkFrame, GtkNotebook {
+GtkButton, GtkComboBox, GtkComboBoxEntry, GtkEntry, GtkFrame, GtkNotebook {
 	border: 1px solid;
+	border-radius: 3px;
 }
 
 GtkButton:prelight, GtkComboBox:prelight {
@@ -103,6 +106,7 @@ GtkButton:active {
 GtkCalendar {
 	background: gtk-color(base_color);
 	border: 1px solid;
+	border-radius: 3px;
 }
 
 /* FIXME: the calendar seems to invalidate a bigger area for the
@@ -111,6 +115,15 @@ GtkCalendar > arrow {
 	background: gtk-mix(0.5, selected_bg_color, grey);
 }
 
+GtkComboBoxEntry > GtkButton {
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+GtkComboBoxEntry > GtkEntry {
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+
 GtkEntry {
 	background: gtk-color(base_color);
 }
@@ -125,6 +138,10 @@ GtkExpander:prelight {
 	border: 1px solid;
 }
 
+GtkMenu {
+	border: 1px solid;
+}
+
 GtkMenuItem:prelight {
 	background: gtk-color(selected_bg_color);
   color: gtk-color(selected_fg_color);  /* FIXME seems not to apply. */
@@ -137,6 +154,7 @@ GtkNotebook {
 /* FIXME: why can we not just use "GtkProgressBar.bar" here? */
 GtkProgressBar > box.bar {
 	background: gtk-color(selected_bg_color);
+  border-radius: 3px;
 }
 
 GtkToggleButton[active=true] {
@@ -149,6 +167,10 @@ GtkToggleButton[active=true]:prelight {
 	background: gtk-lighter(selected_bg_color);
 }
 
+GtkSpinButton {
+  border-radius: 3px; /* FIXME: seems not to apply to the steppers. */
+}
+
 GtkSpinButton > arrow {
 	background-position: center;
 	background-repeat: no-repeat;
@@ -172,9 +194,30 @@ GtkTreeView > GtkButton {
 	background: gtk-color(bg_color);
 }
 
-GtkMenu {
-	border: 1px solid;
+GtkHScrollbar, GtkVScrollbar {
+  border-radius: 3px;
+}
+
+GtkScrollbar > gtk-handle {
+  border-radius: 0px;
 }
+GtkHScrollbar > gtk-stepper-up {
+  border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+GtkHScrollbar > gtk-stepper-down {
+  border-top-right-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
+GtkVScrollbar > gtk-stepper-up {
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+GtkVScrollbar > gtk-stepper-down {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+
 
 /*
  * Drawing primitives.



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