Skip to content

Q
qgroundcontrol
Commit 660172e9 authored by dongfang's avatar dongfang
Browse files
Options

Fixes css merge conflict

parents 10840b7c 33f39e71
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
README
View file @ 660172e9
...@@ -37,7 +37,7 @@ Build QGroundControl ...@@ -37,7 +37,7 @@ Build QGroundControl
-------------------- --------------------
1) From the terminal go to the `groundcontrol` directory 1) From the terminal go to the `groundcontrol` directory
2) Run `qmake` 2) Run `qmake -spec macx-g++`
3) Run `make -j8` 3) Run `make -j8`
......
files/styles/style-indoor.css
View file @ 660172e9
...@@ -178,8 +178,8 @@ QDoubleSpinBox::down-button { ...@@ -178,8 +178,8 @@ QDoubleSpinBox::down-button {
} }
QPushButton { QPushButton {
/*min-height: 20px;*/ min-height: 16px;
/*max-height: 20px;*/ max-height: 20px;
border: 1px solid #465158; border: 1px solid #465158;
margin: 1px; margin: 1px;
border-radius: 2px; border-radius: 2px;
...@@ -202,7 +202,7 @@ QPushButton:pressed { ...@@ -202,7 +202,7 @@ QPushButton:pressed {
QToolButton { QToolButton {
font-weight: bold; font-weight: bold;
min-height: 20px; min-height: 16px;
/*min-width: 24px;*/ /*min-width: 24px;*/
max-height: 20px; max-height: 20px;
border: 1px solid #4A4A4F; border: 1px solid #4A4A4F;
......
src/ui/QGCToolBar.cc
View file @ 660172e9
...@@ -237,7 +237,7 @@ void QGCToolBar::setPerspectiveChangeActions(const QList<QAction*> &actions) ...@@ -237,7 +237,7 @@ void QGCToolBar::setPerspectiveChangeActions(const QList<QAction*> &actions)
advancedButton->setText(tr("Pro")); advancedButton->setText(tr("Pro"));
advancedButton->setToolTip(tr("Options for advanced users")); advancedButton->setToolTip(tr("Options for advanced users"));
advancedButton->setCheckable(true); advancedButton->setCheckable(true);
advancedButton->setStyleSheet("QPushButton { min-width: 60px; font-weight: bold; text-align: left; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 0px; margin-right: 13px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-right-radius: 6px; border-top-right-radius: 6px; border-right: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QPushButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }"); advancedButton->setStyleSheet("QPushButton { min-height: 20px; max-height: 20px; min-width: 60px; font-weight: bold; text-align: left; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 0px; margin-right: 13px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-right-radius: 6px; border-top-right-radius: 6px; border-right: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QPushButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }");
addWidget(advancedButton); addWidget(advancedButton);
group->addButton(advancedButton); group->addButton(advancedButton);
} else { } else {
......
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