diff --git a/ui/chatArea/chatHead.css b/ui/chatArea/chatHead.css index d7a3846f0..c0f9ee85b 100644 --- a/ui/chatArea/chatHead.css +++ b/ui/chatArea/chatHead.css @@ -1,39 +1,42 @@ -QLineEdit { +QLineEdit +{ color: @black; background: white; border: 0px; } -#nameLabel { +#nameLabel +{ color: @black; font: @mediumBold; font-size:12px; } -#statusLabel { +#statusLabel +{ color: @mediumGrey; font: @medium; font-size:12px; } -#peersLabel { +#peersLabel +{ color: @mediumGrey; font: @medium; font-size:12px; } -QLabel[peerType="our"] { +QLabel[peerType="our"] +{ color: green; } -QLabel[peerType="muted"] { +QLabel[peerType="muted"] +{ color: darkred; } -QLabel[playingAudio="true"] { +QLabel[playingAudio="true"] +{ font-weight: bold; } - -QMenu:disabled { - color: gray; -} diff --git a/ui/friendList/friendList.css b/ui/friendList/friendList.css index 3d7972065..3e18a085e 100644 --- a/ui/friendList/friendList.css +++ b/ui/friendList/friendList.css @@ -1,64 +1,80 @@ -QScrollArea { +QScrollArea +{ background: @themeMedium; } -QScrollBar:vertical { +QScrollBar:vertical +{ background: @themeMedium; width: 16px; padding: 0px 3px 0px 3px; } -QScrollBar:handle:vertical { +QScrollBar:handle:vertical +{ background: @themeDark; min-height: 20px; border-radius: 5px; margin: 3px 0px 3px 0px; } -QScrollBar:handle:vertical:hover { +QScrollBar:handle:vertical:hover +{ background: @themeMediumDark; } -QScrollBar:handle:vertical:pressed { +QScrollBar:handle:vertical:pressed +{ background: @themeDark; } -QScrollBar:add-line:vertical {height: 0px;subcontrol-position: bottom;subcontrol-origin: margin;} +QScrollBar:add-line:vertical +{ + height: 0px; + subcontrol-position: bottom; + subcontrol-origin: margin; +} -QScrollBar:sub-line:vertical {height: 0px;subcontrol-position: top;subcontrol-origin: margin;} +QScrollBar:sub-line:vertical +{ + height: 0px; + subcontrol-position: top; + subcontrol-origin: margin; +} -QScrollBar:add-page:vertical, QScrollBar::sub-page:vertical { +QScrollBar:add-page:vertical, QScrollBar::sub-page:vertical +{ background: none; } QWidget#circleWidgetContainer > QFrame#line { - color: white; + color: white; } QWidget#circleWidgetContainer { - background-color: @themeMedium; + background-color: @themeMedium; } QWidget#circleWidgetContainer:hover { - background-color: @themeLight; + background-color: @themeLight; } QWidget#circleWidgetContainer QLineEdit { - background-color: @themeLight; + background-color: @themeLight; } QWidget#circleWidgetContainer > QLabel#status { - font: @small; - color: @lightGrey; + font: @small; + color: @lightGrey; } QWidget#circleWidgetContainer > QLabel#name { - font: @big; - color: @white; + font: @big; + color: @white; } diff --git a/ui/loginScreen/loginScreen.css b/ui/loginScreen/loginScreen.css index 9bc063f9f..074070f05 100644 --- a/ui/loginScreen/loginScreen.css +++ b/ui/loginScreen/loginScreen.css @@ -1,58 +1,68 @@ -#LoginScreen { - background-color: #1c1c1c; +#LoginScreen +{ + background-color: #1c1c1c; } -#line { - color: #757575; +#line +{ + color: #757575; } -#stackedWidget { - background-color: #d6d2Cf; +#stackedWidget +{ + background-color: #d6d2Cf; } #labelNewProfile, -#labelLoadProfile { - border-style: solid; - border-width: 15px 0 15px 15px; - border-color: #d6d2cf #d6d2cf #d6d2cf #1c1c1c; +#labelLoadProfile +{ + border-style: solid; + border-width: 15px 0 15px 15px; + border-color: #d6d2cf #d6d2cf #d6d2cf #1c1c1c; } -#labelNewProfile { - margin-top:125px; - margin-bottom:45px; +#labelNewProfile +{ + margin-top:125px; + margin-bottom:45px; } -#labelLoadProfile { - margin-top:165px; - margin-bottom:5px; +#labelLoadProfile +{ + margin-top:165px; + margin-bottom:5px; } LoginScreen > QPushButton, QStackedWidget QPushButton { - background: transparent; - border: none; - color: white; - font-size: 9pt; - font-weight: bold; + background: transparent; + border: none; + color: white; + font-size: 9pt; + font-weight: bold; } #loginButton, #importButton, -#createAccountButton { - border-radius:5px; - padding:5px; - background-color:#42a33a; +#createAccountButton +{ + border-radius:5px; + padding:5px; + background-color:#42a33a; } #loginButton:hover, #importButton:hover, -#createAccountButton:hover { - background: #0c530d; +#createAccountButton:hover +{ + background: #0c530d; } -QLabel, QCheckBox, QProgressBar { - color: black; +QLabel, QCheckBox, QProgressBar +{ + color: black; } -QCheckBox:disabled { - color: gray; +QCheckBox:disabled +{ + color: gray; } diff --git a/ui/msgEdit/msgEdit.css b/ui/msgEdit/msgEdit.css index e9845285d..27125a6c1 100644 --- a/ui/msgEdit/msgEdit.css +++ b/ui/msgEdit/msgEdit.css @@ -1,27 +1,33 @@ -QTextEdit { - border-color: @lightGrey; - border-style: solid; - border-width: 1px 0 1px 1px; +QTextEdit +{ + border-color: @lightGrey; + border-style: solid; + border-width: 1px 0 1px 1px; background: white; } -QTextEdit:hover { - border-color: #d7d4d1; +QTextEdit:hover +{ + border-color: #d7d4d1; } -QTextEdit:pressed { - border-color: #4ea6ea; +QTextEdit:pressed +{ + border-color: #4ea6ea; } -QTextEdit#group { - /*border-radius: 0 6px 6px 0; would use to round corners in groupchat, but Qt's implementation seems to be bugged*/ - border: 1px solid #c4c1bd; +QTextEdit#group +{ + /*border-radius: 0 6px 6px 0; would use to round corners in groupchat, but Qt's implementation seems to be bugged*/ + border: 1px solid #c4c1bd; } -QTextEdit#group:hover { - border-color: #d7d4d1; +QTextEdit#group:hover +{ + border-color: #d7d4d1; } -QTextEdit#group:pressed { - border-color: #4ea6ea; +QTextEdit#group:pressed +{ + border-color: #4ea6ea; } diff --git a/ui/statusButton/statusButton.css b/ui/statusButton/statusButton.css index 0a149ff5a..f97975d2c 100644 --- a/ui/statusButton/statusButton.css +++ b/ui/statusButton/statusButton.css @@ -10,21 +10,22 @@ QPushButton QPushButton:default { - background-color: @themeMediumDark; + background-color: @themeMediumDark; } /*Bugged in Qt, but it's probably better to leave enabled so that users can tell it's clickable*/ QPushButton:hover { - background-color: @themeMedium; + background-color: @themeMedium; } QPushButton:pressed { - background-color: @themeMediumDark; + background-color: @themeMediumDark; } -QPushButton:focus { +QPushButton:focus +{ outline: none; } @@ -32,9 +33,9 @@ QPushButton::menu-indicator {image: none;} QPushButton::menu-indicator:pressed, QPushButton::menu-indicator:open { - image: url(":ui/statusButton/menu_indicator.svg"); - subcontrol-origin: padding; - subcontrol-position: bottom center; - position: relative; + image: url(":ui/statusButton/menu_indicator.svg"); + subcontrol-origin: padding; + subcontrol-position: bottom center; + position: relative; bottom: 2px; } diff --git a/ui/window/profile.css b/ui/window/profile.css index 9c1e97056..daddea876 100644 --- a/ui/window/profile.css +++ b/ui/window/profile.css @@ -1,4 +1,5 @@ -#selfAvatar:hover { +#selfAvatar:hover +{ border-radius: 6px; background-color: #ccc; } diff --git a/ui/window/statusPanel.css b/ui/window/statusPanel.css index 5344a79a7..3b94f248e 100644 --- a/ui/window/statusPanel.css +++ b/ui/window/statusPanel.css @@ -7,7 +7,8 @@ QLineEdit border-radius: 4px; } -QToolButton { +QToolButton +{ background: none; background-color: @themeMedium; color: white; @@ -15,17 +16,20 @@ QToolButton { border-radius: 4px; } -QToolButton:pressed { +QToolButton:pressed +{ background-color: @themeMediumDark; border-radius: 4px; color: white; } -QToolButton::menu-indicator { +QToolButton::menu-indicator +{ image: none } -QPushButton#green { +QPushButton#green +{ background: none; background-color: #6bc260; color: white; @@ -48,12 +52,14 @@ QPushButton#green:pressed /** Uncomment this after https://github.com/qTox/qTox/pull/1640 is merged! -QComboBox:down-arrow { +QComboBox:down-arrow +{ image: url(ui/css/down_arrow.png); } **/ -QListView { +QListView +{ background-color: @themeLight; border-style: none; border-radius: 4px; @@ -69,13 +75,15 @@ QListView { background-color: @themeDark; } -#statusPanel > #statusHead > #nameLabel { +#statusPanel > #statusHead > #nameLabel +{ background-color: @themeDark; font: @extraBig; color: @white; } -#statusPanel > #statusHead > #statusLabel { +#statusPanel > #statusHead > #statusLabel +{ background-color: @themeDark; font: @medium; color: @lightGrey; @@ -102,7 +110,8 @@ QListView { background-color: @themeMedium; } -#statusPanel > #statusHead > #statusButton:focus { +#statusPanel > #statusHead > #statusButton:focus +{ outline: none; } @@ -116,4 +125,3 @@ QListView { position: relative; bottom: 2px; } - diff --git a/ui/window/window.css b/ui/window/window.css index 84c771a95..49c60da8c 100644 --- a/ui/window/window.css +++ b/ui/window/window.css @@ -35,7 +35,8 @@ QPushButton#minimizeButton { border: 0px solid transparent; background-color: transparent; - image: url(":ui/window/minimizeButton.png");} + image: url(":ui/window/minimizeButton.png"); +} QPushButton#minimizeButton:hover {image: url(":ui/window/minimizeButtonHover.png");} QPushButton#minimizeButton:pressed {image: url(":ui/window/minimizeButtonPressed.png");} QPushButton#minimizeButton:focus {outline: none;} @@ -44,7 +45,8 @@ QPushButton#maximizeButton { border: 0px solid transparent; background-color: transparent; - image: url(":ui/window/maximizeButton.png");} + image: url(":ui/window/maximizeButton.png"); +} QPushButton#maximizeButton:hover {image: url(":ui/window/maximizeButtonHover.png");} QPushButton#maximizeButton:pressed {image: url(":ui/window/maximizeButtonPressed.png");} QPushButton#maximizeButton:focus {outline: none;} @@ -53,7 +55,8 @@ QPushButton#closeButton { border: 0px solid transparent; background-color: transparent; - image: url(":ui/window/closeButton.png");} + image: url(":ui/window/closeButton.png"); +} QPushButton#closeButton:hover {image: url(":ui/window/closeButtonHover.png");} QPushButton#closeButton:pressed {image: url(":ui/window/closeButtonPressed.png");} QPushButton#closeButton:focus {outline: none;} @@ -62,7 +65,8 @@ QPushButton#restoreButton { border: 0px solid transparent; background-color: transparent; - image: url(":ui/window/restoreButton.png");} + image: url(":ui/window/restoreButton.png"); +} QPushButton#restoreButton:hover {image: url(":ui/window/restoreButtonHover.png");} QPushButton#restoreButton:pressed {image: url(":ui/window/restoreButtonPressed.png");} QPushButton#restoreButton:focus {outline: none;}