diff --git a/rare/resources/colors/Rare.scheme b/rare/resources/colors/Rare.scheme index e2f3146c..5bab6402 100644 --- a/rare/resources/colors/Rare.scheme +++ b/rare/resources/colors/Rare.scheme @@ -2,22 +2,22 @@ Active\AlternateBase=#fff7f7f7 Active\Base=#ff333344 Active\BrightText=#ffffffff -Active\Button=#ff3c3f41 +Active\Button=#ff272a2e Active\ButtonText=#ffeeeeee -Active\Dark=#ff9f0910 -Active\Highlight=#ff2f4f4f +Active\Dark=#ff232529 +Active\Highlight=#ff385e5e Active\HighlightedText=#ffeeeeee -Active\Light=#ffffffff -Active\Link=#ff0000ff +Active\Light=#ff2c2f33 +Active\Link=#ff0000dd Active\LinkVisited=#ffff00ff -Active\Mid=#ffb80e35 -Active\Midlight=#ffca0651 +Active\Mid=#ff25272b +Active\Midlight=#ff292c30 Active\PlaceholderText=#80eeeeee -Active\Shadow=#ff767676 +Active\Shadow=#ff0b0c0d Active\Text=#ffeeeeee Active\ToolTipBase=#ffffffdc Active\ToolTipText=#ffeeeeee -Active\Window=#ff202225 +Active\Window=#ff212226 Active\WindowText=#ffeeeeee Disabled\ButtonText=#ff808080 Disabled\HighlightedText=#ff808080 diff --git a/rare/resources/resources.py b/rare/resources/resources.py index c7baa662..a45a4bb1 100644 Binary files a/rare/resources/resources.py and b/rare/resources/resources.py differ diff --git a/rare/resources/static_css/__init__.py b/rare/resources/static_css/__init__.py index 82dc3338..0e139851 100644 Binary files a/rare/resources/static_css/__init__.py and b/rare/resources/static_css/__init__.py differ diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py index b7ec5de0..effb5639 100644 Binary files a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py and b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py differ diff --git a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss index 5f2fec42..abc7d805 100644 --- a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss +++ b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss @@ -105,6 +105,7 @@ QComboBox, QSpinBox, QDoubleSpinBox, QProgressBar, +QScrollArea, QPushButton { min-height: 3.00ex; /* min-height: 1.30em; */ @@ -763,6 +764,7 @@ QScrollArea#WrapperSettingsScroll { QScrollBar#WrapperSettingsScrollBar { background-color: #BCBEBF; } +/* QLabel#WrapperSettingsLabel { border-width: 1px; border-style: solid; @@ -776,3 +778,4 @@ QLabel#WrapperSettingsLabel:disabled { border-color: rgb( 67, 71, 77); background-color: rgb( 32, 34, 37); } +*/ diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py index e3221643..b987bee2 100644 Binary files a/rare/resources/stylesheets/RareStyle/__init__.py and b/rare/resources/stylesheets/RareStyle/__init__.py differ diff --git a/rare/resources/stylesheets/RareStyle/stylesheet.qss b/rare/resources/stylesheets/RareStyle/stylesheet.qss index 831a1483..39c97c9e 100644 --- a/rare/resources/stylesheets/RareStyle/stylesheet.qss +++ b/rare/resources/stylesheets/RareStyle/stylesheet.qss @@ -105,6 +105,7 @@ QComboBox, QSpinBox, QDoubleSpinBox, QProgressBar, +QScrollArea, QPushButton { min-height: 3.00ex; /* min-height: 1.30em; */ @@ -763,6 +764,7 @@ QScrollArea#WrapperSettingsScroll { QScrollBar#WrapperSettingsScrollBar { background-color: rgb( 40, 42, 46); } +/* QLabel#WrapperSettingsLabel { border-width: 1px; border-style: solid; @@ -776,3 +778,4 @@ QLabel#WrapperSettingsLabel:disabled { border-color: rgb( 67, 71, 77); background-color: rgb( 32, 34, 37); } +*/ \ No newline at end of file