Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Same bg for scrollarea, conversation view, selected source #496

Merged
merged 3 commits into from
Jul 30, 2019
Merged

Same bg for scrollarea, conversation view, selected source #496

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8ce3ef
match sourcelist selection and bg color
Jul 29, 2019
09f00c2
scrollarea now bg color
Jul 29, 2019
874eec3
add padding around text in speech bubbles
Jul 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions securedrop_client/gui/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ class MainView(QWidget):

CSS = '''
#view_holder {
background-color: #fff;
background-color: #efeef7;
}
'''

Expand Down Expand Up @@ -670,6 +670,12 @@ class SourceList(QListWidget):
QListWidget::item:selected {
background: #efeef7;
}
QListView {
show-decoration-selected: 0;
}
QListView::item {
border-bottom: 1px solid #efeef7;
}
'''

def __init__(self):
Expand Down Expand Up @@ -1282,10 +1288,9 @@ class SpeechBubble(QWidget):
#speech_bubble {
font-family: Source Sans Pro Regular;
font-size: 15px;
padding: 8px;
padding: 20px;
min-height: 32px;
min-width: 556px;
border: 1px solid #999;
border-bottom: 0;
}
#color_bar {
Expand Down Expand Up @@ -1528,6 +1533,16 @@ class ConversationView(QWidget):

CONVERSATION_SPACING = 28

CSS = '''
#container {
background: #efeef7;
}
#scroll {
background: #efeef7;
border: none;
}
'''

def __init__(
self,
source_db_object: Source,
Expand All @@ -1537,6 +1552,9 @@ def __init__(
self.source = source_db_object
self.controller = controller

# Set styles
self.setStyleSheet(self.CSS)

self.container = QWidget()
self.container.setObjectName('container')
self.conversation_layout = QVBoxLayout()
Expand Down