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

Fix truncation and alignment issues in conversation view #1029

Merged
merged 2 commits into from
Mar 31, 2020
Merged

Fix truncation and alignment issues in conversation view #1029

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83c4f21
fix margins, padding, and layouts
Mar 31, 2020
9f650b1
align export link left
Mar 31, 2020
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: 6 additions & 18 deletions securedrop_client/gui/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1888,11 +1888,8 @@ class SpeechBubble(QWidget):
min-width: 540px;
max-width: 540px;
background-color: #fff;
padding: 16px;
}
#message {
min-width: 540px;
max-width: 540px;
font-family: 'Source Sans Pro';
font-weight: 400;
font-size: 15px;
Expand All @@ -1904,8 +1901,6 @@ class SpeechBubble(QWidget):
max-height: 5px;
background-color: #102781;
border: 0px;
min-width: 590px;
max-width: 590px;
}
'''

Expand All @@ -1918,7 +1913,6 @@ def __init__(self, message_uuid: str, text: str, update_signal, index: int) -> N
self.index = index

# Set styles
self.setObjectName('speech_bubble')
self.setStyleSheet(self.CSS)
self.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)

Expand All @@ -1940,10 +1934,12 @@ def __init__(self, message_uuid: str, text: str, update_signal, index: int) -> N

# Speech bubble
speech_bubble = QWidget()
speech_bubble.setObjectName('speech_bubble')
speech_bubble_layout = QVBoxLayout()
speech_bubble.setLayout(speech_bubble_layout)
speech_bubble_layout.addWidget(self.message)
speech_bubble_layout.addWidget(self.color_bar)
speech_bubble_layout.setContentsMargins(0, 0, 0, 0)
speech_bubble_layout.setSpacing(0)

# Bubble area includes speech bubble plus error message if there is an error
Expand Down Expand Up @@ -1985,8 +1981,6 @@ class ReplyWidget(SpeechBubble):
"""

CSS_MESSAGE_REPLY_FAILED = '''
min-width: 540px;
max-width: 540px;
font-family: 'Source Sans Pro';
font-weight: 400;
font-size: 15px;
Expand All @@ -2010,8 +2004,6 @@ class ReplyWidget(SpeechBubble):
'''

CSS_MESSAGE_REPLY_SUCCEEDED = '''
min-width: 540px;
max-width: 540px;
font-family: 'Source Sans Pro';
font-weight: 400;
font-size: 15px;
Expand All @@ -2028,8 +2020,6 @@ class ReplyWidget(SpeechBubble):
'''

CSS_MESSAGE_REPLY_PENDING = '''
min-width: 540px;
max-width: 540px;
font-family: 'Source Sans Pro';
font-weight: 400;
font-size: 15px;
Expand Down Expand Up @@ -2123,14 +2113,12 @@ class FileWidget(QWidget):
#file_widget {
min-width: 540px;
max-width: 540px;
padding: 16px;
}
#file_options {
min-width: 137px;
}
QPushButton#export_print {
border: none;
padding: 0px 8px;
font-family: 'Source Sans Pro';
font-weight: 500;
font-size: 13px;
Expand All @@ -2150,7 +2138,6 @@ class FileWidget(QWidget):
color: #05a6fe;
}
QLabel#file_name {
padding-bottom: 2px;
font-family: 'Source Sans Pro';
font-weight: 600;
font-size: 13px;
Expand Down Expand Up @@ -2194,7 +2181,8 @@ class FileWidget(QWidget):
}
"""

VERTICAL_MARGIN = 10
TOP_MARGIN = 4
BOTTOM_MARGIN = 14
FILE_FONT_SPACING = 2
FILE_OPTIONS_FONT_SPACING = 1.6
FILENAME_WIDTH_PX = 360
Expand Down Expand Up @@ -2232,7 +2220,7 @@ def __init__(
self.setLayout(layout)

# Set margins and spacing
layout.setContentsMargins(0, self.VERTICAL_MARGIN, 0, self.VERTICAL_MARGIN)
layout.setContentsMargins(0, self.TOP_MARGIN, 0, self.BOTTOM_MARGIN)
layout.setSpacing(0)

# File options: download, export, print
Expand All @@ -2241,7 +2229,7 @@ def __init__(
file_options_layout = QHBoxLayout()
self.file_options.setLayout(file_options_layout)
file_options_layout.setContentsMargins(0, 0, 0, 0)
file_options_layout.setSpacing(0)
file_options_layout.setSpacing(8)
file_options_layout.setAlignment(Qt.AlignLeft)
self.download_button = QPushButton(_(' DOWNLOAD'))
self.download_button.setObjectName('download_button')
Expand Down