Browse Source

Merge pull request #5288

Jakie.OYMJ (1):
      chore(ui): format a few of css code
pull/5289/merge
sudden6 7 years ago
parent
commit
cc4698db65
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 25
      ui/chatArea/chatHead.css
  2. 32
      ui/friendList/friendList.css
  3. 30
      ui/loginScreen/loginScreen.css
  4. 18
      ui/msgEdit/msgEdit.css
  5. 3
      ui/statusButton/statusButton.css
  6. 3
      ui/window/profile.css
  7. 28
      ui/window/statusPanel.css
  8. 12
      ui/window/window.css

25
ui/chatArea/chatHead.css

@ -1,39 +1,42 @@ @@ -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;
}

32
ui/friendList/friendList.css

@ -1,33 +1,49 @@ @@ -1,33 +1,49 @@
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;
}

30
ui/loginScreen/loginScreen.css

@ -1,26 +1,32 @@ @@ -1,26 +1,32 @@
#LoginScreen {
#LoginScreen
{
background-color: #1c1c1c;
}
#line {
#line
{
color: #757575;
}
#stackedWidget {
#stackedWidget
{
background-color: #d6d2Cf;
}
#labelNewProfile,
#labelLoadProfile {
#labelLoadProfile
{
border-style: solid;
border-width: 15px 0 15px 15px;
border-color: #d6d2cf #d6d2cf #d6d2cf #1c1c1c;
}
#labelNewProfile {
#labelNewProfile
{
margin-top:125px;
margin-bottom:45px;
}
#labelLoadProfile {
#labelLoadProfile
{
margin-top:165px;
margin-bottom:5px;
}
@ -37,7 +43,8 @@ QStackedWidget QPushButton @@ -37,7 +43,8 @@ QStackedWidget QPushButton
#loginButton,
#importButton,
#createAccountButton {
#createAccountButton
{
border-radius:5px;
padding:5px;
background-color:#42a33a;
@ -45,14 +52,17 @@ QStackedWidget QPushButton @@ -45,14 +52,17 @@ QStackedWidget QPushButton
#loginButton:hover,
#importButton:hover,
#createAccountButton:hover {
#createAccountButton:hover
{
background: #0c530d;
}
QLabel, QCheckBox, QProgressBar {
QLabel, QCheckBox, QProgressBar
{
color: black;
}
QCheckBox:disabled {
QCheckBox:disabled
{
color: gray;
}

18
ui/msgEdit/msgEdit.css

@ -1,27 +1,33 @@ @@ -1,27 +1,33 @@
QTextEdit {
QTextEdit
{
border-color: @lightGrey;
border-style: solid;
border-width: 1px 0 1px 1px;
background: white;
}
QTextEdit:hover {
QTextEdit:hover
{
border-color: #d7d4d1;
}
QTextEdit:pressed {
QTextEdit:pressed
{
border-color: #4ea6ea;
}
QTextEdit#group {
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 {
QTextEdit#group:hover
{
border-color: #d7d4d1;
}
QTextEdit#group:pressed {
QTextEdit#group:pressed
{
border-color: #4ea6ea;
}

3
ui/statusButton/statusButton.css

@ -24,7 +24,8 @@ QPushButton:pressed @@ -24,7 +24,8 @@ QPushButton:pressed
background-color: @themeMediumDark;
}
QPushButton:focus {
QPushButton:focus
{
outline: none;
}

3
ui/window/profile.css

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
#selfAvatar:hover {
#selfAvatar:hover
{
border-radius: 6px;
background-color: #ccc;
}

28
ui/window/statusPanel.css

@ -7,7 +7,8 @@ QLineEdit @@ -7,7 +7,8 @@ QLineEdit
border-radius: 4px;
}
QToolButton {
QToolButton
{
background: none;
background-color: @themeMedium;
color: white;
@ -15,17 +16,20 @@ QToolButton { @@ -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 @@ -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 { @@ -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 { @@ -102,7 +110,8 @@ QListView {
background-color: @themeMedium;
}
#statusPanel > #statusHead > #statusButton:focus {
#statusPanel > #statusHead > #statusButton:focus
{
outline: none;
}
@ -116,4 +125,3 @@ QListView { @@ -116,4 +125,3 @@ QListView {
position: relative;
bottom: 2px;
}

12
ui/window/window.css

@ -35,7 +35,8 @@ QPushButton#minimizeButton @@ -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 @@ -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 @@ -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 @@ -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;}

Loading…
Cancel
Save