[gtk+] Adwaita, HighContrast: day names in GtkCalendar

From: Jakub Steiner <jimmac src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+] Adwaita, HighContrast: day names in GtkCalendar
Date: Mon, 31 Aug 2015 08:12:19 +0000 (UTC)

commit c5d195ccfea1af22e59d237f3e4e453a830b00de
Author: Jakub Steiner <jimmac gmail com>
Date:   Thu Aug 27 16:25:46 2015 +0200

    Adwaita, HighContrast: day names in GtkCalendar
    
    Ideally I'd like to mimic the treeview column-header style,
    but font-weight: bold; doesn't seem to work. Making them plain
    for now.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753357

 gtk/theme/Adwaita/gtk-contained-dark.css |   43 +++++++++++++++++++++-
 gtk/theme/Adwaita/gtk-contained.css      |   57 ++++++++++++++++++++++++++++++
 gtk/theme/HighContrast/gtk.css           |    4 ++-
 3 files changed, 101 insertions(+), 3 deletions(-)
---
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 42481dc..c16aa07 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1007,7 +1007,11 @@ GtkTextView {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 
238, 236, 0.1); }
   .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive {
+<<<<<<< HEAD
     color: #949796;
+=======
+    color: #939695;
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #1c1f1f;
     background-image: linear-gradient(to bottom, #333636);
     text-shadow: none;
@@ -1018,7 +1022,11 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked {
+<<<<<<< HEAD
     color: #949796;
+=======
+    color: #939695;
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #1c1f1f;
     background-image: linear-gradient(to bottom, #313434, #333636);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -1026,8 +1034,13 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop {
+<<<<<<< HEAD
     color: #949796;
     border-color: #1f2222;
+=======
+    color: #939695;
+    border-color: #1e2222;
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
@@ -1035,9 +1048,15 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked {
+<<<<<<< HEAD
     color: #949796;
     border-color: #1f2222;
     background-image: linear-gradient(to bottom, #303535);
+=======
+    color: #939695;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive {
@@ -1142,12 +1161,18 @@ GtkTextView {
   border-style: solid; }
 
 .linked.vertical > .entry, .linked.vertical > .button, .header-bar .linked.vertical > .button.titlebutton,
+<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
+=======
+.titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .button,
+.linked.vertical > GtkComboBox > .button {
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-style: solid solid none solid;
   border-radius: 0; }
 
 .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical

.button.titlebutton:first-child,

+<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child

.the-button-in-the-combobox,

 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
@@ -1155,12 +1180,26 @@ GtkTextView {
 .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
 .titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
+=======
+.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child

.button,

+.linked.vertical > GtkComboBox:first-child > .button {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
+.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
+.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.button,
+.linked.vertical > GtkComboBox:last-child > .button {
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
 .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > 
.button.titlebutton:only-child,
+<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
+=======
+.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.button,
+.linked.vertical > GtkComboBox:only-child > .button {
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-radius: 3px;
   border-style: solid; }
 
@@ -3712,8 +3751,8 @@ GtkCalendar {
   GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
-    color: #eeeeec;
-    background: #1c1f1f; }
+    font-size: smaller;
+    color: #eeeeec; }
   GtkCalendar:backdrop {
     color: #d5d5d5;
     border-color: #1f2222; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index da34e32..ee9aeb7 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1007,7 +1007,11 @@ GtkTextView {
     box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
   .inline-toolbar GtkToolButton > .button:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive {
+<<<<<<< HEAD
     color: #8e9192;
+=======
+    color: #8d9091;
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #f4f4f4);
     text-shadow: none;
@@ -1018,7 +1022,11 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:insensitive:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:active, .inline-toolbar 
GtkToolButton > .button:insensitive:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:insensitive:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:insensitive:checked {
+<<<<<<< HEAD
     color: #8e9192;
+=======
+    color: #8d9091;
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, #ececec, #f4f4f4);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -1026,8 +1034,13 @@ GtkTextView {
       color: inherit; }
   .inline-toolbar GtkToolButton > .button:backdrop, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop {
+<<<<<<< HEAD
     color: #8e9192;
     border-color: darkgray;
+=======
+    color: #8d9091;
+    border-color: #a8a8a8;
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
@@ -1035,9 +1048,15 @@ GtkTextView {
   .inline-toolbar GtkToolButton > .button:backdrop:active, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:active,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:active, .inline-toolbar 
GtkToolButton > .button:backdrop:checked, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:checked,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:checked {
+<<<<<<< HEAD
     color: #8e9192;
     border-color: darkgray;
     background-image: linear-gradient(to bottom, #d5d5d5);
+=======
+    color: #8d9091;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #d4d4d4);
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
   .inline-toolbar GtkToolButton > .button:backdrop:insensitive, .inline-toolbar .header-bar GtkToolButton > 
.button.titlebutton:backdrop:insensitive,
   .inline-toolbar .titlebar GtkToolButton > .button.titlebutton:backdrop:insensitive {
@@ -1142,12 +1161,18 @@ GtkTextView {
   border-style: solid; }
 
 .linked.vertical > .entry, .linked.vertical > .button, .header-bar .linked.vertical > .button.titlebutton,
+<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .the-button-in-the-combobox,
 .linked.vertical > GtkComboBox > .the-button-in-the-combobox {
+=======
+.titlebar .linked.vertical > .button.titlebutton, .linked.vertical > .button:hover, .linked.vertical > 
.button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > 
GtkComboBoxText > .button,
+.linked.vertical > GtkComboBox > .button {
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-style: solid solid none solid;
   border-radius: 0; }
 
 .linked.vertical > .entry:first-child, .linked.vertical > .button:first-child, .header-bar .linked.vertical

.button.titlebutton:first-child,

+<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child

.the-button-in-the-combobox,

 .linked.vertical > GtkComboBox:first-child > .the-button-in-the-combobox {
   border-top-left-radius: 3px;
@@ -1155,12 +1180,26 @@ GtkTextView {
 .linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
 .titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:last-child > .the-button-in-the-combobox {
+=======
+.titlebar .linked.vertical > .button.titlebutton:first-child, .linked.vertical > GtkComboBoxText:first-child

.button,

+.linked.vertical > GtkComboBox:first-child > .button {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px; }
+.linked.vertical > .entry:last-child, .linked.vertical > .button:last-child, .header-bar .linked.vertical > 
.button.titlebutton:last-child,
+.titlebar .linked.vertical > .button.titlebutton:last-child, .linked.vertical > GtkComboBoxText:last-child > 
.button,
+.linked.vertical > GtkComboBox:last-child > .button {
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-style: solid; }
 .linked.vertical > .entry:only-child, .linked.vertical > .button:only-child, .header-bar .linked.vertical > 
.button.titlebutton:only-child,
+<<<<<<< HEAD
 .titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.the-button-in-the-combobox,
 .linked.vertical > GtkComboBox:only-child > .the-button-in-the-combobox {
+=======
+.titlebar .linked.vertical > .button.titlebutton:only-child, .linked.vertical > GtkComboBoxText:only-child > 
.button,
+.linked.vertical > GtkComboBox:only-child > .button {
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   border-radius: 3px;
   border-style: solid; }
 
@@ -1728,7 +1767,11 @@ GtkComboBox {
         background-image: linear-gradient(to bottom, #65a1df);
         text-shadow: none;
         icon-shadow: none;
+<<<<<<< HEAD
         box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
+=======
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
         .titlebar.selection-mode .button:insensitive > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive > .label,
         .header-bar.selection-mode .button:insensitive > .label,
         .header-bar.selection-mode .titlebar .button.titlebutton:insensitive > .label {
@@ -1738,8 +1781,13 @@ GtkComboBox {
         .header-bar.selection-mode .button:insensitive:checked {
           color: #b9d4f1;
           border-color: #1c5187;
+<<<<<<< HEAD
           background-image: linear-gradient(to bottom, #4b8dd3, #5094db);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a5c8ec; }
+=======
+          background-image: linear-gradient(to bottom, #4a8cd1, #5093da);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px #a4c7ec; }
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
           .titlebar.selection-mode .button:insensitive:active > .label, .titlebar.selection-mode .header-bar 
.button.titlebutton:insensitive:active > .label, .titlebar.selection-mode .button:insensitive:checked > 
.label, .titlebar.selection-mode .header-bar .button.titlebutton:insensitive:checked > .label,
           .header-bar.selection-mode .button:insensitive:active > .label,
           .header-bar.selection-mode .titlebar .button.titlebutton:insensitive:active > .label,
@@ -3878,12 +3926,21 @@ GtkCalendar {
       color: rgba(142, 145, 146, 0.45); }
     GtkCalendar.button:insensitive, .header-bar GtkCalendar.button.titlebutton:insensitive,
     .titlebar GtkCalendar.button.titlebutton:insensitive {
+<<<<<<< HEAD
       color: rgba(142, 145, 146, 0.45); }
   GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     color: #2e3436;
     background: #a1a1a1; }
+=======
+      color: rgba(141, 144, 145, 0.45); }
+  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
+    color: alpha(currentColor,0.55); }
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    font-size: smaller;
+    color: #2e3436; }
+>>>>>>> Adwaita, HighContrast: day names in GtkCalendar
   GtkCalendar:backdrop {
     color: #333333;
     border-color: darkgray; }
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index ffbd863..920b97e 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -2205,8 +2205,10 @@ GtkCalendar {
     GtkCalendar.header:backdrop {
       background-image: linear-gradient(to bottom, #fff);
       border-bottom-color: #c5c5c5; }
-  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop, GtkCalendar.highlight, 
GtkCalendar.highlight:backdrop {
+  GtkCalendar:inconsistent, GtkCalendar:inconsistent:backdrop {
     color: alpha(currentColor,0.55); }
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
+    color: #000; }
 
 /***********
  * Dialogs *

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