diff options
author | Matt Watson <mattdangerw@gmail.com> | 2016-04-08 15:39:10 -0700 |
---|---|---|
committer | Philip Chimento <philip@endlessm.com> | 2016-04-15 11:08:21 -0700 |
commit | f06f6a8c3dccc7963ef66aee598a7c195ac95290 (patch) | |
tree | 39696b7cd7ce0e083f1f6af161c606a403d3db3e | |
parent | 1422952da02779a180381ce68d259e804b8108a3 (diff) |
css: remove reset file
It had gotten pretty stale compared to property changes, and this can
actually be done quite simply without a standalone file.
Just moving to endless-widgets.css
https://phabricator.endlessm.com/T11000
Conflicts: (appropriate changes made in endless-widgets.css)
data/css/reset.css
-rw-r--r-- | data/css/endless-widgets.css | 9 | ||||
-rw-r--r-- | data/css/reset.css | 69 | ||||
-rw-r--r-- | data/eos-sdk.gresource.xml | 1 |
3 files changed, 6 insertions, 73 deletions
diff --git a/data/css/endless-widgets.css b/data/css/endless-widgets.css index ea192e7..8d61bb8 100644 --- a/data/css/endless-widgets.css +++ b/data/css/endless-widgets.css @@ -1,6 +1,9 @@ -/* Wipe all theming CSS to start with */ - -@import url("resource:///com/endlessm/sdk/css/reset.css"); +/* Wipe all theming CSS to start with. We'll leave the adwaita theme for + * spinner.*/ +EosWindow, +EosWindow :not(GtkSpinner) { + all: unset; +} @define-color endless_theme_bg_color #2e3436; @define-color endless_wm_shadow alpha(black, 0.5); diff --git a/data/css/reset.css b/data/css/reset.css deleted file mode 100644 index 4a711ae..0000000 --- a/data/css/reset.css +++ /dev/null @@ -1,69 +0,0 @@ -/* @import this colorsheet to get the default values for every property. - * This is useful when writing special CSS tests that should not be - * inluenced by themes - not even the default ones. - * Keep in mind that the output will be very ugly and not look like - * anything GTK. - * Also, when adding new style properties, please add them here. - */ - -EosWindow, -EosWindow :not(GtkSpinner) { - color: inherit; - font-size: inherit; - background-color: initial; - font-family: inherit; - font-style: inherit; - font-variant: inherit; - font-weight: inherit; - text-shadow: inherit; - icon-shadow: inherit; - box-shadow: initial; - margin-top: initial; - margin-left: initial; - margin-bottom: initial; - margin-right: initial; - padding-top: initial; - padding-left: initial; - padding-bottom: initial; - padding-right: initial; - border-top-style: initial; - border-top-width: initial; - border-left-style: initial; - border-left-width: initial; - border-bottom-style: initial; - border-bottom-width: initial; - border-right-style: initial; - border-right-width: initial; - border-top-left-radius: initial; - border-top-right-radius: initial; - border-bottom-right-radius: initial; - border-bottom-left-radius: initial; - outline-style: initial; - outline-width: initial; - outline-offset: initial; - background-clip: initial; - background-origin: initial; - background-size: initial; - background-position: initial; - border-top-color: initial; - border-right-color: initial; - border-bottom-color: initial; - border-left-color: initial; - outline-color: initial; - background-repeat: initial; - background-image: initial; - border-image-source: initial; - border-image-repeat: initial; - border-image-slice: initial; - border-image-width: initial; - transition-property: initial; - transition-duration: initial; - transition-timing-function: initial; - transition-delay: initial; - engine: initial; - gtk-key-bindings: initial; - - -GtkWidget-focus-line-width: 0; - -GtkWidget-focus-padding: 0; - -GtkNotebook-initial-gap: 0; -} diff --git a/data/eos-sdk.gresource.xml b/data/eos-sdk.gresource.xml index 4ba633d..6e0fde3 100644 --- a/data/eos-sdk.gresource.xml +++ b/data/eos-sdk.gresource.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <gresources> <gresource prefix="/com/endlessm/sdk"> - <file>css/reset.css</file> <file>css/endless-widgets.css</file> <file>widgets/topbar.ui</file> <file>assets/autocomplete_list_middle.png</file> |