From ba707c96beba3e36383132732c5242228ce2695d Mon Sep 17 00:00:00 2001 From: Will McGugan Date: Tue, 5 Apr 2022 17:00:35 +0100 Subject: [PATCH] blue and orange --- examples/basic.css | 30 +++++++++++++++--------------- src/textual/_compositor.py | 11 ----------- src/textual/app.py | 8 ++++---- src/textual/design.py | 4 ++-- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/examples/basic.css b/examples/basic.css index f95a83534..2708f0a46 100644 --- a/examples/basic.css +++ b/examples/basic.css @@ -23,23 +23,23 @@ App > Screen { #sidebar .title { height: 1; - background: $secondary-darken2; - color: $on-secondary-darken2; - border-right: outer $secondary-darken3; + background: $primary-darken2; + color: $on-primary-darken2; + border-right: outer $primary-darken3; } #sidebar .user { height: 8; - background: $secondary-darken1; - color: $on-secondary-darken1; + background: $primary-darken1; + color: $on-primary-darken1; - border-right: outer $secondary-darken3; + border-right: outer $primary-darken3; } #sidebar .content { - background: $secondary; - color: $on-secondary; - border-right: outer $secondary-darken3; + background: $primary; + color: $on-primary; + border-right: outer $primary-darken3; } #header { @@ -47,7 +47,7 @@ App > Screen { background: $primary; height: 3; - border: hkey $secondary-darken3; + border: hkey $primary-darken3; } #content { @@ -68,8 +68,8 @@ Tweet { TweetHeader { height:1 - background: $secondary - color: $on-secondary + background: $accent1 + color: $on-accent1 } TweetBody { @@ -79,10 +79,10 @@ TweetBody { #footer { - color: $on-accent1; - background: $accent1; + color: $on-accent2; + background: $accent2; height: 1; - border-top: hkey $accent1-darken2; + border-top: hkey $accent2-darken2; } diff --git a/src/textual/_compositor.py b/src/textual/_compositor.py index 149a82c05..2071ee5f3 100644 --- a/src/textual/_compositor.py +++ b/src/textual/_compositor.py @@ -251,17 +251,6 @@ class Compositor: (z,) + sub_widget.z, sub_clip, ) - # add_widget( - # sub_widget, - # ( - # sub_region - # + child_region.origin - # - scroll_offset - # + layout_offset - # ), - # (z,) + sub_widget.z, - # sub_clip, - # ) # Add any scrollbars for chrome_widget, chrome_region in widget._arrange_scrollbars( diff --git a/src/textual/app.py b/src/textual/app.py index 90aae2045..48ece845a 100644 --- a/src/textual/app.py +++ b/src/textual/app.py @@ -113,12 +113,12 @@ class App(DOMNode): self._refresh_required = False self.design = ColorSystem( - primary="#3F51B5", - secondary="#3F51B5", + primary="#005EA8", + secondary="#F59402", warning="#ffa000", error="#C62828", success="#558B2F", - accent1="#FFC107", + accent1="#1976D2", accent3="#512DA8", ) @@ -140,7 +140,7 @@ class App(DOMNode): title: Reactive[str] = Reactive("Textual") sub_title: Reactive[str] = Reactive("") background: Reactive[str] = Reactive("black") - dark = Reactive(False) + dark = Reactive(True) def get_css_variables(self) -> dict[str, str]: variables = self.design.generate(self.dark) diff --git a/src/textual/design.py b/src/textual/design.py index 164a8f66a..b36d05c59 100644 --- a/src/textual/design.py +++ b/src/textual/design.py @@ -221,8 +221,8 @@ class ColorSystem: if __name__ == "__main__": color_system = ColorSystem( - primary="#1b5e20", - secondary="#263238", + primary="#00838f", + secondary="#00796b", warning="#ffa000", error="#C62828", success="#558B2F",