diff options
author | Micah Lee <micah@micahflee.com> | 2020-11-29 09:25:40 -0800 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2020-11-29 09:25:40 -0800 |
commit | 3c6cbd04a79307b1905f472a5dad3a168f414f68 (patch) | |
tree | 2df73f9a145e6902bc865f11fd2c1e82e255cf97 /desktop | |
parent | af5dda0d4a3ad1ed0a0ebdfe32fb20abf9b56162 (diff) | |
parent | 66e9feae51e307414f68055f0f50c6324fbcddb8 (diff) | |
download | onionshare-3c6cbd04a79307b1905f472a5dad3a168f414f68.tar.gz onionshare-3c6cbd04a79307b1905f472a5dad3a168f414f68.zip |
Merge branch 'develop' into 929_download_errors
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/pyproject.toml | 1 | ||||
-rw-r--r-- | desktop/src/onionshare/gui_common.py | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/desktop/pyproject.toml b/desktop/pyproject.toml index d1be9c45..028f1ec1 100644 --- a/desktop/pyproject.toml +++ b/desktop/pyproject.toml @@ -14,7 +14,6 @@ icon = "src/onionshare/resources/onionshare" sources = ['src/onionshare'] requires = [ "./onionshare_cli-2.3.dev2-py3-none-any.whl", - "psutil", "pyside2==5.15.1", "qrcode" ] diff --git a/desktop/src/onionshare/gui_common.py b/desktop/src/onionshare/gui_common.py index 7a32f8ec..f488a740 100644 --- a/desktop/src/onionshare/gui_common.py +++ b/desktop/src/onionshare/gui_common.py @@ -128,7 +128,15 @@ class GuiCommon: """, "server_status_url_buttons": """ QPushButton { - color: #3f7fcf; + border: 1px solid #d3d3d3; + border-radius: 4px; + background-color: #ffffff; + padding: 8px 16px; + text-align: center; + color: #4e0d4e; + } + QPushButton:pressed { + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(239, 239, 240, 255)) } """, "server_status_button_stopped": """ |