From e573d3cc96f3896c691a4ab5c0f8a3b1540aa484 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 5 Oct 2018 03:25:50 +0200 Subject: [PATCH] StyleCSS: add alternative stylesheet to be comined with the system theme (#1170) Even while we (still) have the goal to ship our own stylesheet and provide the typical subdued media-aplication look, right now this porting and styling effort (#1023) is unfinished and handled with rather low priority (writing code is more important than toying with styles and looks). This alternative stylesheet is meant to be used with a typical "light" desktop theme. We'll add just the bare minimum of definitions to make lumiera work well in that setup. And right now, I'll use that setup to continue with my development work --- data/config/setup.ini | 3 +- src/common/configfacade.cpp | 2 +- src/gui/lumiera-light-theme-complement.css | 25 ++++ src/gui/{gtk-lumiera.css => lumiera.css} | 5 +- wiki/thinkPad.ichthyo.mm | 144 ++++++++++++++++++++- 5 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 src/gui/lumiera-light-theme-complement.css rename src/gui/{gtk-lumiera.css => lumiera.css} (98%) diff --git a/data/config/setup.ini b/data/config/setup.ini index aaa0e2f2a..bffb29e92 100644 --- a/data/config/setup.ini +++ b/data/config/setup.ini @@ -18,6 +18,7 @@ authors = Joel Holdsworth|Christian Thäter|Hermann Voßeler|Stefan Kangas| copyright = 2007 - 2015 [Gui] -stylesheet = gtk-lumiera.css +#stylesheet = lumiera.css +stylesheet = lumiera-light-theme-complement.css iconpath = $ORIGIN/../../share/lumiera/icons:$ORIGIN/gui/icons:~/.lumiera/icons resourcepath = $ORIGIN/../../share/lumiera/gui:$ORIGIN/gui diff --git a/src/common/configfacade.cpp b/src/common/configfacade.cpp index 3841f14eb..74d915aea 100644 --- a/src/common/configfacade.cpp +++ b/src/common/configfacade.cpp @@ -35,7 +35,7 @@ ** @todo as of 2016, this seems not to be used much, if at all. ** The GTK-UI, which in itself is very preliminary, retrieves ** some values from configuration, most notably the name of - ** the GTK stylesheet (`gtk-lumiera.css` is the default) + ** the GTK stylesheet (`lumiera.css` is the default) */ diff --git a/src/gui/lumiera-light-theme-complement.css b/src/gui/lumiera-light-theme-complement.css new file mode 100644 index 000000000..841c07fa1 --- /dev/null +++ b/src/gui/lumiera-light-theme-complement.css @@ -0,0 +1,25 @@ +/* + lumiera-light-theme-complement.css - minimal supplement for GTK-3 light style sheet + + Copyright (C) Lumiera.org + 2018, Hermann Vosseler + + Styles and Graphics of the Lumiera GUI can be used and redistributed + under the the terms of the GNU General Public License version 2 or + above, or (at your option) under Creative Commons CC-By-SA. + +* ********************************************************/ + + +/* CSS stylesheet to provide the additional definitions + * required to run the Lumiera GTK UI with a typical + * "light" standard system theme + */ + + + + +/* ---------- Styles for Lumiera Widgets ---------- */ + + +/* ---------- Styles for special markup ---------- */ diff --git a/src/gui/gtk-lumiera.css b/src/gui/lumiera.css similarity index 98% rename from src/gui/gtk-lumiera.css rename to src/gui/lumiera.css index 6e22479ca..d9aa1a722 100644 --- a/src/gui/gtk-lumiera.css +++ b/src/gui/lumiera.css @@ -1,5 +1,5 @@ /* - gtk-lumiera.css - GTK-3 style sheet for the Lumiera GUI + lumiera.css - GTK-3 style sheet for the Lumiera GUI Copyright (C) Lumiera.org 2014, Hermann Vosseler @@ -275,3 +275,6 @@ class "gtkmm__CustomObject_TimelineRuler" style:highest "timeline_ruler" class "gtkmm__CustomObject_TimelineHeaderWidget" style:highest "timeline_header_widget" */ + + +/* ---------- Styles for special markup ---------- */ diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index ea598d09e..0479d1cdb 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -5293,6 +5293,137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ CSS genügt +

+ + + + + + + + + + + + + + + + + + + + + +

+ füge möglichst hoch in der Hierarchie Regeln ein, +

+

+ die ein property auf den Wert 'inherit' setzten +

+ + + + + + + + +

+ z.B. in den Block mit den "default-Regeln" +

+

+   * { +

+

+     color:            inherit; /* by default inherit content colour from parent widget */ +

+

+     background-color: inherit; +

+

+ } +

+ + + + + + + + + + + @@ -37990,14 +38121,25 @@ - + + + + + + + + + + + +