diff --git a/rare/resources/stylesheets/ChildOfMetropolis/__init__.py b/rare/resources/stylesheets/ChildOfMetropolis/__init__.py index 7f9596ba..e92a93fa 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 9f22f1d4..115ff41d 100644 --- a/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss +++ b/rare/resources/stylesheets/ChildOfMetropolis/stylesheet.qss @@ -77,6 +77,7 @@ QScrollBar { border-radius: 2px; padding: 2px; } + QHeaderView::section, QTableView QTableCornerButton::section, QLineEdit, @@ -105,20 +106,12 @@ QSpinBox, QDoubleSpinBox, QProgressBar, QPushButton { - min-height: 1.30em; -} -QLineEdit, -QTextEdit -QTimeEdit, -QDateEdit, -QDateTimeEdit, -QSpinBox, -QDoubleSpinBox, -QProgressBar { - max-height: 1.30em; + /* min-height: 1.30em; */ + min-height: 18px; } QToolButton { - min-height: 1.10em; + /* min-height: 1.10em; */ + min-height: 15px; } QFrame[frameShape="0"] { @@ -189,6 +182,7 @@ QComboBox QAbstractItemView { image: url(":/stylesheets/ChildOfMetropolis/sort-down.svg"); } QProgressBar { + padding: 0px; text-align: center; } QProgressBar::chunk { @@ -673,7 +667,7 @@ QTabBar#MainTabBar::tab { margin-right: 3px; border-top-color: transparent; border-bottom-color: #5CD3FF; - padding: 5px; + padding: 3px 5px; }/* QTabBar#MainTabBar::tab:top:first, QTabBar#MainTabBar::tab:bottom:first { @@ -749,6 +743,7 @@ QLineEdit#SearchBar { /* Wrapper settings styling */ QPushButton#WrapperWidgetButton, QToolButton#WrapperWidgetButton { + padding: 0px; border-color: #DADDDE; } QPushButton#WrapperWidgetButton:disabled, diff --git a/rare/resources/stylesheets/RareStyle/__init__.py b/rare/resources/stylesheets/RareStyle/__init__.py index 0b909452..5a7bf933 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 62bbb553..e55a5533 100644 --- a/rare/resources/stylesheets/RareStyle/stylesheet.qss +++ b/rare/resources/stylesheets/RareStyle/stylesheet.qss @@ -8,7 +8,7 @@ disabled: #43474d rgb( 67, 71, 77) -- disabled font color normal: #202225 rgb( 32, 34, 37) -- main background color editable: #272733 rgb( 38, 38, 51) -- background color for reactive/editable widgets (TextEdits, ProgressBars etc) hover: #222233 rgb( 34, 34, 51) -- background color when hovering over reactive widgets (Buttons, Headers) -selection: #2f4f4f rgb( 47, 79, 79) -- background color for selectable widgets +selection: #274242 rgb( 39, 66, 66) -- background color for selectable widgets alternate: #282a2e rgb( 40, 42, 46) -- background color for alternating rows in List/Tree/TableViews and for ScrollBars [Border] @@ -45,7 +45,7 @@ QLabel:disabled { border-width: 0px; background-color: transparent; padding: 0px; - selection-background-color: rgb( 47, 79, 79); + selection-background-color: rgb( 39, 66, 66); } QMenu, @@ -77,6 +77,7 @@ QScrollBar { border-radius: 2px; padding: 2px; } + QHeaderView::section, QTableView QTableCornerButton::section, QLineEdit, @@ -92,7 +93,7 @@ QProgressBar, QScrollBar { border-color: rgb( 47, 79, 79); background-color: rgb( 38, 38, 51); - selection-background-color: rgb( 47, 79, 79); + selection-background-color: rgb( 39, 66, 66); } QLineEdit, @@ -108,17 +109,6 @@ QPushButton { /* min-height: 1.30em; */ min-height: 18px; } -QLineEdit, -QTextEdit -QTimeEdit, -QDateEdit, -QDateTimeEdit, -QSpinBox, -QDoubleSpinBox, -QProgressBar { - /* max-height: 1.30em; */ - max-height: 18px; -} QToolButton { /* min-height: 1.10em; */ min-height: 15px; @@ -141,7 +131,7 @@ QComboBox:!editable:hover { } *::item:selected, QComboBox QAbstractItemView { - selection-background-color: rgb( 47, 79, 79); + selection-background-color: rgb( 39, 66, 66); } *::drop-down, *::drop-down:editable, @@ -192,12 +182,13 @@ QComboBox QAbstractItemView { image: url(":/stylesheets/RareStyle/sort-down.svg"); } QProgressBar { + padding: 0px; text-align: center; } QProgressBar::chunk { width: 2%; margin: 0%; - background-color: rgb( 47, 79, 79); + background-color: rgb( 39, 66, 66); } QScrollBar { border-radius: 4px; @@ -303,7 +294,7 @@ QListView::item:selected, QTreeView::item:selected, QTableView::item:selected { border-color: rgb( 72, 61, 139); - background-color: rgb( 47, 79, 79); + background-color: rgb( 39, 66, 66); } QPushButton,