Skip to content

Q
qgroundcontrol
Commit 2e98bbb9 authored by Bryant's avatar Bryant
Browse files
Options

Extended most of the new toolbar theming to the dark theme. It looks pretty... 

Extended most of the new toolbar theming to the dark theme. It looks pretty good, though both themes still need some more refinement.
parent b35459ea
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 78 deletions
files/styles/style-dark.css
View file @ 2e98bbb9
...@@ -79,11 +79,15 @@ QGCToolBar QLabel#symbolLabel { ...@@ -79,11 +79,15 @@ QGCToolBar QLabel#symbolLabel {
background-clip: content; background-clip: content;
} }
QGCToolBar QToolButton#firstAction { QGCToolBar QLabel#toolBarBatteryBar {
margin-left: 8px; color: #008000;
border-bottom-left-radius: 6px; }
border-top-left-radius: 6px;
border-right: none; QGCToolBar QLabel#toolBarTimeoutLabel {
border-radius: 4px;
padding: 0;
color: #000;
background-color: #FF0037;
} }
QGCToolBar QToolButton { QGCToolBar QToolButton {
...@@ -106,6 +110,13 @@ QGCToolBar QToolButton#advancedButton { ...@@ -106,6 +110,13 @@ QGCToolBar QToolButton#advancedButton {
border-left: none; border-left: none;
} }
QGCToolBar QToolButton#firstAction {
margin-left: 8px;
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
border-right: none;
}
QGCToolBar .QWidget { QGCToolBar .QWidget {
margin: 0; margin: 0;
background-color: transparent; background-color: transparent;
...@@ -146,26 +157,6 @@ QLabel#noUas { ...@@ -146,26 +157,6 @@ QLabel#noUas {
font-size: 30pt; font-size: 30pt;
} }
QLabel#toolBarNameLabel {
font: bold 16px;
color: #3C7B9E;
}
QLabel#toolBarModeLabel {
font: 12px;
}
QLabel#toolBarStateLabel {
font: 12px;
color: #3C7B9E;
}
QLabel#toolBarMessageLabel {
font: 12px;
font-style: italic;
color: #3C7B9E;
}
QLineEdit { QLineEdit {
border: 1px solid #777; border: 1px solid #777;
border-radius: 2px; border-radius: 2px;
...@@ -189,6 +180,10 @@ QMenu::item:selected { ...@@ -189,6 +180,10 @@ QMenu::item:selected {
background-color: #666; background-color: #666;
} }
QMenu::item:checked {
background-color: #B8D3E6;
}
QMenu::separator { QMenu::separator {
height: 1px; height: 1px;
background: #379AC3; background: #379AC3;
...@@ -217,7 +212,7 @@ QProgressBar { ...@@ -217,7 +212,7 @@ QProgressBar {
text-align: center; text-align: center;
padding: 2px; padding: 2px;
color: #DDD; color: #DDD;
background-color: #111; background: #111;
height: 10px; height: 10px;
} }
...@@ -256,9 +251,8 @@ QPushButton, QToolButton { ...@@ -256,9 +251,8 @@ QPushButton, QToolButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #777, stop: 1 #333);
} }
QToolButton { QPushButton#connectButton {
padding-left: 3px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
padding-right: 3px;
} }
QPushButton#controlButton { QPushButton#controlButton {
...@@ -266,6 +260,10 @@ QPushButton#controlButton { ...@@ -266,6 +260,10 @@ QPushButton#controlButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00);
} }
QPushButton#deleteButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF0037, stop: 1 #AC0025);
}
QPushButton#killButton { QPushButton#killButton {
font-weight: bold; font-weight: bold;
min-height: 30px; min-height: 30px;
...@@ -280,6 +278,11 @@ QPushButton:checked, QToolButton:checked { ...@@ -280,6 +278,11 @@ QPushButton:checked, QToolButton:checked {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #09A2B2, stop: 1 #414B52);
} }
QPushButton:checked#connectButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF9000, stop: 1 #B37300);
color: #000;
}
QPushButton:checked#controlButton { QPushButton:checked#controlButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #b76f11, stop: 1 #e1a718);
} }
...@@ -306,6 +309,10 @@ QPushButton:pressed#killButton { ...@@ -306,6 +309,10 @@ QPushButton:pressed#killButton {
border-radius: 5px; border-radius: 5px;
} }
QScrollBar {
border: 1px solid #333;
}
QSeparator { QSeparator {
color: #EEE; color: #EEE;
} }
...@@ -323,6 +330,7 @@ QSlider::groove:horizontal { ...@@ -323,6 +330,7 @@ QSlider::groove:horizontal {
QSlider::groove:horizontal:disabled { QSlider::groove:horizontal:disabled {
border: 1px solid #454545; border: 1px solid #454545;
background-color: #CCC;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
margin: 2px 0; margin: 2px 0;
} }
...@@ -388,7 +396,7 @@ QSpinBox::up-button, QDoubleSpinBox::up-button { ...@@ -388,7 +396,7 @@ QSpinBox::up-button, QDoubleSpinBox::up-button {
} }
QStatusBar { QStatusBar {
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop:0.34 #383838, stop:1 #181818);
} }
QTabBar::tab { QTabBar::tab {
...@@ -426,7 +434,12 @@ QTextEdit { ...@@ -426,7 +434,12 @@ QTextEdit {
QToolBar { QToolBar {
border-top-color: #969696; border-top-color: #969696;
border-bottom-color: #484848; border-bottom-color: #484848;
background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 #4B4B4B, stop:0.3 #404040, stop:0.34 #383838, stop:1 #181818); background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4B4B4B, stop: 0.3 #404040, stop: 0.34 #383838, stop:1 #181818);
}
QToolButton {
padding-left: 3px;
padding-right: 3px;
} }
QToolTip { QToolTip {
......
files/styles/style-light.css
View file @ 2e98bbb9
...@@ -58,8 +58,8 @@ QDockWidget::close-button:hover, QDockWidget::float-button:hover { ...@@ -58,8 +58,8 @@ QDockWidget::close-button:hover, QDockWidget::float-button:hover {
} }
QDockWidget::close-button:pressed, QDockWidget::float-button:pressed { QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
background: #555;
padding: 1px -1px -1px 1px; padding: 1px -1px -1px 1px;
background: #555;
} }
QDockWidget::title { QDockWidget::title {
...@@ -90,13 +90,6 @@ QGCToolBar QLabel#toolBarTimeoutLabel { ...@@ -90,13 +90,6 @@ QGCToolBar QLabel#toolBarTimeoutLabel {
background-color: #FF0037; background-color: #FF0037;
} }
QGCToolBar QToolButton#firstAction {
margin-left: 8px;
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
border-right: none;
}
QGCToolBar QToolButton { QGCToolBar QToolButton {
margin: 0; margin: 0;
padding-left: 0; padding-left: 0;
...@@ -116,6 +109,13 @@ QGCToolBar QToolButton#advancedButton { ...@@ -116,6 +109,13 @@ QGCToolBar QToolButton#advancedButton {
border-left: none; border-left: none;
} }
QGCToolBar QToolButton#firstAction {
margin-left: 8px;
border-bottom-left-radius: 6px;
border-top-left-radius: 6px;
border-right: none;
}
QGCToolBar .QWidget { QGCToolBar .QWidget {
margin: 0; margin: 0;
background-color: transparent; background-color: transparent;
...@@ -156,26 +156,6 @@ QLabel#noUas { ...@@ -156,26 +156,6 @@ QLabel#noUas {
font-size: 30pt; font-size: 30pt;
} }
QLabel#toolBarNameLabel {
font: bold 16px;
color: #3C7B9E;
}
QLabel#toolBarModeLabel {
font: 12px;
}
QLabel#toolBarStateLabel {
font: 12px;
color: #3C7B9E;
}
QLabel#toolBarMessageLabel {
font: 12px;
font-style: italic;
color: #3C7B9E;
}
QLineEdit { QLineEdit {
border: 1px solid #111; border: 1px solid #111;
border-radius: 2px; border-radius: 2px;
...@@ -209,11 +189,6 @@ QMenu::separator { ...@@ -209,11 +189,6 @@ QMenu::separator {
margin: 8px 5px 4px 5px; margin: 8px 5px 4px 5px;
} }
QMenu::icon, QMenu::icon:selected, QMenu::icon:disabled, QMenu::icon:checked {
background: #F00;
border: none;
}
QMenuBar::item:selected { QMenuBar::item:selected {
background-color: #CCC; background-color: #CCC;
} }
...@@ -275,9 +250,8 @@ QPushButton, QToolButton { ...@@ -275,9 +250,8 @@ QPushButton, QToolButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #BBB, stop: 1 #777);
} }
QToolButton { QPushButton#connectButton {
padding-left: 3px; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
padding-right: 3px;
} }
QPushButton#controlButton { QPushButton#controlButton {
...@@ -285,24 +259,20 @@ QPushButton#controlButton { ...@@ -285,24 +259,20 @@ QPushButton#controlButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A0AE00, stop: 1 #909E00);
} }
QPushButton#deleteButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF0037, stop: 1 #AC0025);
}
QPushButton#killButton { QPushButton#killButton {
font-weight: bold; font-weight: bold;
min-height: 30px; min-height: 30px;
color: #000; color: #000;
background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFb917, stop:1 #B37300); background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFb917, stop: 1 #B37300);
background-clip: border; background-clip: border;
border: 1px solid #555; border: 1px solid #555;
border-radius: 5px; border-radius: 5px;
} }
QPushButton#connectButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #73D95D, stop: 1 #18A154);
}
QPushButton#deleteButton {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #FF0037, stop: 1 #AC0025);
}
QPushButton:checked, QToolButton:checked { QPushButton:checked, QToolButton:checked {
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444, stop: 1 #888); background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444, stop: 1 #888);
color: #FFF; color: #FFF;
...@@ -360,6 +330,7 @@ QSlider::groove:horizontal { ...@@ -360,6 +330,7 @@ QSlider::groove:horizontal {
} }
QSlider::groove:horizontal:disabled { QSlider::groove:horizontal:disabled {
border: 1px solid #454545;
background-color: #CCC; background-color: #CCC;
height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */ height: 4px; /* the groove expands to the size of the slider by default. by giving it a height, it has a fixed size */
margin: 2px 0; margin: 2px 0;
...@@ -464,9 +435,14 @@ QTextEdit { ...@@ -464,9 +435,14 @@ QTextEdit {
QToolBar { QToolBar {
border-top-color: #969696; border-top-color: #969696;
border-bottom-color: #484848; border-bottom-color: #484848;
background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888); background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #CCC, stop: 1 #888);
} }
QToolButton {
padding-left: 3px;
padding-right: 3px;
}
QToolTip { QToolTip {
background-color: #F6F6F6; background-color: #F6F6F6;
border:0 solid #379AC3; border:0 solid #379AC3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment