diff --git a/qt_ui/widgets/QTopPanel.py b/qt_ui/widgets/QTopPanel.py index 901bef6d..2a77cb23 100644 --- a/qt_ui/widgets/QTopPanel.py +++ b/qt_ui/widgets/QTopPanel.py @@ -34,7 +34,7 @@ class QTopPanel(QFrame): self.proceedButton = QPushButton("Mission Planning") self.proceedButton.setIcon(CONST.ICONS["Proceed"]) - self.proceedButton.setProperty("style", "btn-primary") + self.proceedButton.setProperty("style", "btn-success") self.proceedButton.clicked.connect(self.proceed) if self.game and self.game.turn == 0: self.proceedButton.setEnabled(False) diff --git a/qt_ui/windows/infos/QInfoPanel.py b/qt_ui/windows/infos/QInfoPanel.py index a7a81d56..6b31afa3 100644 --- a/qt_ui/windows/infos/QInfoPanel.py +++ b/qt_ui/windows/infos/QInfoPanel.py @@ -22,7 +22,7 @@ class QInfoPanel(QGroupBox): layout = QVBoxLayout() layout.addWidget(self.informations_list) layout.setSpacing(0) - layout.setContentsMargins(0, 0, 0, 0) + layout.setContentsMargins(0, 20, 0, 0) self.setLayout(layout) diff --git a/resources/stylesheets/style-dcs.css b/resources/stylesheets/style-dcs.css index edb863b6..d5c5be60 100644 --- a/resources/stylesheets/style-dcs.css +++ b/resources/stylesheets/style-dcs.css @@ -19,6 +19,28 @@ grey text -------------------- #B7C0C6 */ +/*QMenuBar*/ +QMenuBar { + spacing: 2px; /* spacing between menu bar items */ + border-bottom:none; +} + +QMenuBar::item { + padding: 4px 10px; + background: transparent; + border-radius: 2px; + margin: 4px 0; +} + +QMenuBar::item:selected { /* when selected using mouse or keyboard */ + background: #1D2731; +} + +QMenuBar::item:pressed { + background: #1D2731; +} + + /*QWidget*/ QWidget { @@ -48,7 +70,7 @@ QPushButton { background: qlineargradient(x1:0, y1:0, x2:1, y2:1,stop:0 #A4B3B9, stop:1 #85989D); border: 1px solid #97A9A9; color:#fff; - padding: 6px 20px; + padding: 4px 10px; cursor: pointer; } @@ -57,16 +79,27 @@ QPushButton:hover { cursor:pointer; } +/*btn-success = a green button*/ +QPushButton[style="btn-primary"]{ + background: qlineargradient(x1:0, y1:0, x2:1, y2:1,stop:0 #A4B3B9, stop:1 #85989D); + border: 1px solid #97A9A9; + color:#fff; + padding: 6px 20px; + border-radius:2px; + cursor: pointer; + font-weight:bold; + text-transform:uppercase; +} - -/*btn-success = a small green button*/ +/*btn-success = a green button*/ QPushButton[style="btn-success"]{ background-color:#82A466; color: white; cursor:pointer; - padding: 5px; + padding: 6px 20px; border-radius:2px; - border:none; + font-weight:bold; + text-transform:uppercase; } QPushButton[style="btn-success"]:hover{