From cb83e30a76d76705c034541c0c1e9ef08b7b4946 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 9 Nov 2023 02:20:42 -0500 Subject: message input theme tweaking --- res/css/bare.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index 80ef2f8..ec5b9a1 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -33,3 +33,8 @@ .status-indicator.idle { color: #FAA61A; } + +/* make room for attachment icon */ +.message-input.with-browse-icon { + padding-left: 30px; +} -- cgit v1.2.3 From 5cca270eb1c627ae59cf294c9670d31b288b768c Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 9 Nov 2023 22:08:14 -0500 Subject: more making message input look better --- res/css/bare.css | 9 ++++--- src/components/chatinput.cpp | 59 ++++++++++---------------------------------- src/components/chatinput.hpp | 6 ++--- 3 files changed, 22 insertions(+), 52 deletions(-) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index ec5b9a1..595fd04 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -34,7 +34,10 @@ color: #FAA61A; } -/* make room for attachment icon */ -.message-input.with-browse-icon { - padding-left: 30px; +.message-input textview, .message-input textview text { + background-color: inherit; +} + +.message-input textview { + padding: 10px 5px; } diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp index af092e1..b6beaa5 100644 --- a/src/components/chatinput.cpp +++ b/src/components/chatinput.cpp @@ -113,30 +113,25 @@ ChatInputTextContainer::ChatInputTextContainer() { }; m_input.signal_key_press_proxy().connect(cb); + m_upload_button.set_image(m_upload_img); + m_upload_button.set_halign(Gtk::ALIGN_CENTER); + m_upload_button.set_valign(Gtk::ALIGN_CENTER); + m_upload_button.get_style_context()->add_class(GTK_STYLE_CLASS_FLAT); + m_upload_img.property_icon_name() = "document-send-symbolic"; m_upload_img.property_icon_size() = Gtk::ICON_SIZE_LARGE_TOOLBAR; m_upload_img.get_style_context()->add_class("message-input-browse-icon"); - AddPointerCursor(m_upload_ev); - - m_upload_ev.signal_button_press_event().connect([this](GdkEventButton *ev) -> bool { - if (ev->button == GDK_BUTTON_PRIMARY) { - ShowFileChooser(); - // return focus - m_input.grab_focus(); - return true; - } - return false; + m_upload_button.signal_clicked().connect([this]() { + ShowFileChooser(); + m_input.grab_focus(); }); - m_upload_ev.add(m_upload_img); - add_overlay(m_upload_ev); - add(m_input); + m_upload_box.pack_start(m_upload_button); + pack_start(m_upload_box, false, false); + pack_start(m_input); show_all_children(); - - // stop the overlay from using (start) padding - signal_get_child_position().connect(sigc::mem_fun(*this, &ChatInputTextContainer::GetChildPosition), false); } void ChatInputTextContainer::ShowFileChooser() { @@ -160,39 +155,11 @@ ChatInputText &ChatInputTextContainer::Get() { } void ChatInputTextContainer::ShowChooserIcon() { - m_upload_ev.show(); + m_upload_button.show(); } void ChatInputTextContainer::HideChooserIcon() { - m_upload_ev.hide(); -} - -bool ChatInputTextContainer::GetChildPosition(Gtk::Widget *child, Gdk::Rectangle &pos) { - Gtk::Allocation main_alloc; - { - auto *grandchild = m_input.get_child(); - int x, y; - if (grandchild->translate_coordinates(m_input, 0, 0, x, y)) { - main_alloc.set_x(x); - main_alloc.set_y(y); - } else { - main_alloc.set_x(0); - main_alloc.set_y(0); - } - main_alloc.set_width(grandchild->get_allocated_width()); - main_alloc.set_height(grandchild->get_allocated_height()); - } - - Gtk::Requisition min, req; - child->get_preferred_size(min, req); - - // let css move it around - pos.set_x(0); - pos.set_y(0); - pos.set_width(std::max(min.width, std::min(main_alloc.get_width(), req.width))); - pos.set_height(std::max(min.height, std::min(main_alloc.get_height(), req.height))); - - return true; + m_upload_button.hide(); } ChatInputTextContainer::type_signal_add_attachment ChatInputTextContainer::signal_add_attachment() { diff --git a/src/components/chatinput.hpp b/src/components/chatinput.hpp index a3c9742..7ee3921 100644 --- a/src/components/chatinput.hpp +++ b/src/components/chatinput.hpp @@ -98,7 +98,7 @@ private: }; // file upload, text -class ChatInputTextContainer : public Gtk::Overlay { +class ChatInputTextContainer : public Gtk::Box { public: ChatInputTextContainer(); @@ -110,9 +110,9 @@ public: private: void ShowFileChooser(); - bool GetChildPosition(Gtk::Widget *child, Gdk::Rectangle &pos); - Gtk::EventBox m_upload_ev; + Gtk::Box m_upload_box; + Gtk::Button m_upload_button; Gtk::Image m_upload_img; ChatInputText m_input; -- cgit v1.2.3 From cf1752e42fafaf152e47d71ec67cc8bbe3cf57a6 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 18 Nov 2023 19:40:25 -0500 Subject: background inherit on message textview --- res/css/bare.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index 595fd04..5012c59 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -38,6 +38,10 @@ background-color: inherit; } +.message-text, .message-text text { + background: inherit; +} + .message-input textview { padding: 10px 5px; } -- cgit v1.2.3 From ed5fcfb28095f9ee63f86327e5edf20a59980b86 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 18 Nov 2023 19:44:03 -0500 Subject: message reply style --- res/css/bare.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index 5012c59..a09854a 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -45,3 +45,11 @@ .message-input textview { padding: 10px 5px; } + +.message-reply { + border-left: 2px solid gray; + padding-left: 10px; + padding-top: 6px; + padding-bottom: 6px; + opacity: 0.8; +} -- cgit v1.2.3 From 24b36a8b45e44613eca888c12e5b3c2480127732 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 18 Nov 2023 19:46:19 -0500 Subject: add margin to attachment box label --- res/css/bare.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index a09854a..dcbc0bd 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -18,6 +18,10 @@ padding: 2px 5px 2px 5px; } +.message-attachment-box label { + margin: 5px; +} + .status-indicator.dnd { color: #982929; } -- cgit v1.2.3 From ff01375a196bc8f2f0a61083901e3871576258d0 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 18 Nov 2023 19:55:09 -0500 Subject: profile layout --- res/css/bare.css | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index dcbc0bd..26e3844 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -57,3 +57,51 @@ padding-bottom: 6px; opacity: 0.8; } + +.profile-main-container { + padding: 20px; +} + +.profile-username { + margin-left: 10px; + font-size: 20px; +} + +.profile-username-nondisplay { + margin-left: 10px; +} + +.profile-switcher { + padding-top: 5px; +} + +.profile-stack { + padding-top: 5px; +} + +.profile-notes-label { + padding-top: 5px; + padding-bottom: 5px; +} + +.profile-badges { + padding-left: 5px; +} + +.profile-badge { + margin-right: 5px; +} + +.profile-connections { + margin-top: 10px; +} + +.profile-connection { + padding: 5px; + border-radius: 10px; + border: 1px solid black; +} + +.profile-connection-image { + padding-right: 5px; +} -- cgit v1.2.3 From b13986c68004666bca90d25222c5538b0cd8c272 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 18 Nov 2023 20:21:25 -0500 Subject: style reactions --- res/css/bare.css | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index 26e3844..e47ffd4 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -105,3 +105,14 @@ .profile-connection-image { padding-right: 5px; } + +.reaction-box { + padding: 2px 5px 2px 5px; + border-radius: 5px; + border: 1px solid black; +} + +.reaction-box.reacted { + border: 1px solid #5865f2; + background-color: rgba(89, 102, 242, 0.5); +} -- cgit v1.2.3 From df79756398e68814b3b981df1c308dfc6e9f9e8a Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 18 Nov 2023 20:28:14 -0500 Subject: darken embed bg --- res/css/bare.css | 1 + 1 file changed, 1 insertion(+) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index e47ffd4..e3d1bb1 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -1,6 +1,7 @@ .embed { border-radius: 5px; padding: 10px; + background-color: rgba(0.0, 0.0, 0.0, 0.1); } .embed-footer { -- cgit v1.2.3 From 50d99de06076a0f3ccba5c12173ff5944ebea246 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Mon, 27 Nov 2023 02:48:34 -0500 Subject: change up set status dialog --- res/css/bare.css | 8 ++++++++ src/dialogs/setstatus.cpp | 41 ++++++++++++++++++++++++++++------------- src/dialogs/setstatus.hpp | 4 +--- 3 files changed, 37 insertions(+), 16 deletions(-) (limited to 'res/css') diff --git a/res/css/bare.css b/res/css/bare.css index e3d1bb1..19c65f0 100644 --- a/res/css/bare.css +++ b/res/css/bare.css @@ -117,3 +117,11 @@ border: 1px solid #5865f2; background-color: rgba(89, 102, 242, 0.5); } + +.set-status-dialog .dialog-vbox { + padding: 5px; +} + +.set-status-dialog .dialog-action-area { + margin: 10px 5px 5px 5px; +} diff --git a/src/dialogs/setstatus.cpp b/src/dialogs/setstatus.cpp index 7a3a038..24f0b29 100644 --- a/src/dialogs/setstatus.cpp +++ b/src/dialogs/setstatus.cpp @@ -1,17 +1,31 @@ #include "setstatus.hpp" +static const std::array feelings = { + "wonderful", + "splendiferous", + "delicious", + "outstanding", + "amazing", + "great", + "marvelous", + "superb", + "out of this world", + "stupendous", + "tip-top", + "horrible", +}; + SetStatusDialog::SetStatusDialog(Gtk::Window &parent) : Gtk::Dialog("Set Status", parent, true) , m_layout(Gtk::ORIENTATION_VERTICAL) - , m_bottom(Gtk::ORIENTATION_HORIZONTAL) , m_ok("OK") - , m_cancel("Cancel") - , m_bbox(Gtk::ORIENTATION_HORIZONTAL) { - set_default_size(300, 50); + , m_cancel("Cancel") { + set_default_size(350, 200); get_style_context()->add_class("app-window"); get_style_context()->add_class("app-popup"); + get_style_context()->add_class("set-status-dialog"); - m_text.set_placeholder_text("Status text"); + m_text.set_placeholder_text("I feel " + Glib::ustring(feelings[rand() % feelings.size()]) + "!"); m_status_combo.append("online", "Online"); m_status_combo.append("dnd", "Do Not Disturb"); @@ -35,16 +49,17 @@ SetStatusDialog::SetStatusDialog(Gtk::Window &parent) response(Gtk::RESPONSE_CANCEL); }); - m_bbox.pack_start(m_ok, Gtk::PACK_SHRINK); - m_bbox.pack_start(m_cancel, Gtk::PACK_SHRINK); - m_bbox.set_layout(Gtk::BUTTONBOX_END); + m_layout.pack_start(*Gtk::make_managed("How are you, " + Abaddon::Get().GetDiscordClient().GetUserData().GetDisplayName() + "?", Gtk::ALIGN_START)); + m_layout.pack_start(m_text); + m_layout.pack_start(*Gtk::make_managed("Status", Gtk::ALIGN_START)); + m_layout.pack_start(m_status_combo); + m_layout.pack_start(*Gtk::make_managed("Activity", Gtk::ALIGN_START)); + m_layout.pack_start(m_type_combo); - m_bottom.add(m_status_combo); - m_bottom.add(m_type_combo); - m_bottom.add(m_bbox); - m_layout.add(m_text); - m_layout.add(m_bottom); get_content_area()->add(m_layout); + get_action_area()->pack_start(m_ok, Gtk::PACK_SHRINK); + get_action_area()->pack_start(m_cancel, Gtk::PACK_SHRINK); + get_action_area()->set_layout(Gtk::BUTTONBOX_START); show_all_children(); } diff --git a/src/dialogs/setstatus.hpp b/src/dialogs/setstatus.hpp index b0e6a4c..d4a015d 100644 --- a/src/dialogs/setstatus.hpp +++ b/src/dialogs/setstatus.hpp @@ -8,14 +8,12 @@ public: PresenceStatus GetStatusType() const; std::string GetActivityName() const; -protected: +private: Gtk::Box m_layout; - Gtk::Box m_bottom; Gtk::Entry m_text; Gtk::ComboBoxText m_status_combo; Gtk::ComboBoxText m_type_combo; Gtk::Button m_ok; Gtk::Button m_cancel; - Gtk::ButtonBox m_bbox; }; -- cgit v1.2.3 From 99c98efd91f58692da4ec564facf72376099f01e Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Tue, 28 Nov 2023 01:46:14 -0500 Subject: make bare.css the new main.css --- res/css/application-low-priority.css | 97 ---------- res/css/bare.css | 127 ------------- res/css/main.css | 356 ++++------------------------------- 3 files changed, 41 insertions(+), 539 deletions(-) delete mode 100644 res/css/application-low-priority.css delete mode 100644 res/css/bare.css (limited to 'res/css') diff --git a/res/css/application-low-priority.css b/res/css/application-low-priority.css deleted file mode 100644 index 130033f..0000000 --- a/res/css/application-low-priority.css +++ /dev/null @@ -1,97 +0,0 @@ -/* -application wide stuff -has to be separate to allow main.css to override certain things -*/ - -.app-window label:not(:disabled) { - color: @text_color; -} - -.app-window entry { - background: @secondary_color; - color: @text_color; - border: 1px solid #1c2e40; -} - -.app-window button { - background: @secondary_color; - color: @text_color; - text-shadow: none; - box-shadow: none; -} - -.app-window button:checked { - border-top: 0px; - border-left: 0px; - border-right: 0px; - border-bottom: 3px solid #39a2ed; - color: #ffffff; -} - -.app-window button:not(:checked) { - border: 3px #0000ff; -} - -.app-window.background { - background: @background_color; -} - -.app-window treeview { - color: @text_color; -} - -.app-window treeview:not(:selected) { - background: @secondary_color; -} - -.app-window list, .app-popup list { - background: @secondary_color; -} - -.app-window paned separator { - background: @background_color; -} - -.app-window scrollbar { - background: @background_color; - border-left: 1px solid transparent; -} - -.app-window menubar, menu { - background: @background_color; - color: #cccccc; -} - -.app-window textview text { - caret-color: #ababab; -} - -.app-window check, -.app-window radio { - background-clip: padding-box; - background: @secondary_color; - border-color: #070707; - box-shadow: 0 1px rgba(0, 0, 0, 0); - color: #dddddd; -} - -.app-window check:checked, -.app-window radio:checked { - background-clip: border-box; - background: #0b4285; - border-color: #092444; - box-shadow: 0 1px rgba(0, 0, 0, 0); - color: #dddddd; -} - -.app-window colorswatch { - box-shadow: 0 1px rgba(0, 0, 0, 0); -} - -.app-window scale { - padding-top: 0px; - padding-bottom: 0px; - margin-top: 0px; - margin-bottom: 0px; - color: @text_color; -} diff --git a/res/css/bare.css b/res/css/bare.css deleted file mode 100644 index 19c65f0..0000000 --- a/res/css/bare.css +++ /dev/null @@ -1,127 +0,0 @@ -.embed { - border-radius: 5px; - padding: 10px; - background-color: rgba(0.0, 0.0, 0.0, 0.1); -} - -.embed-footer { - margin-top: 5px; - font-size: 11px; -} - -.embed-author { - margin-bottom: 10px; - font-size: 12px; -} - -.message-attachment-box { - border: 1px solid #aaaaaa; - padding: 2px 5px 2px 5px; -} - -.message-attachment-box label { - margin: 5px; -} - -.status-indicator.dnd { - color: #982929; -} - -.status-indicator.online { - color: #43B581; -} - -.status-indicator.offline { - color: #808080; -} - -.status-indicator.idle { - color: #FAA61A; -} - -.message-input textview, .message-input textview text { - background-color: inherit; -} - -.message-text, .message-text text { - background: inherit; -} - -.message-input textview { - padding: 10px 5px; -} - -.message-reply { - border-left: 2px solid gray; - padding-left: 10px; - padding-top: 6px; - padding-bottom: 6px; - opacity: 0.8; -} - -.profile-main-container { - padding: 20px; -} - -.profile-username { - margin-left: 10px; - font-size: 20px; -} - -.profile-username-nondisplay { - margin-left: 10px; -} - -.profile-switcher { - padding-top: 5px; -} - -.profile-stack { - padding-top: 5px; -} - -.profile-notes-label { - padding-top: 5px; - padding-bottom: 5px; -} - -.profile-badges { - padding-left: 5px; -} - -.profile-badge { - margin-right: 5px; -} - -.profile-connections { - margin-top: 10px; -} - -.profile-connection { - padding: 5px; - border-radius: 10px; - border: 1px solid black; -} - -.profile-connection-image { - padding-right: 5px; -} - -.reaction-box { - padding: 2px 5px 2px 5px; - border-radius: 5px; - border: 1px solid black; -} - -.reaction-box.reacted { - border: 1px solid #5865f2; - background-color: rgba(89, 102, 242, 0.5); -} - -.set-status-dialog .dialog-vbox { - padding: 5px; -} - -.set-status-dialog .dialog-action-area { - margin: 10px 5px 5px 5px; -} diff --git a/res/css/main.css b/res/css/main.css index 2cc4727..19c65f0 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -1,12 +1,7 @@ -@define-color background_color #141414; -@define-color secondary_color #111111; -@define-color text_color #fbfbfb; - .embed { - background-color: rgba(0, 0, 0, 0.2); - color: #cbcbcb; border-radius: 5px; padding: 10px; + background-color: rgba(0.0, 0.0, 0.0, 0.1); } .embed-footer { @@ -19,140 +14,7 @@ font-size: 12px; } -.channel-list { - background-color: @secondary_color; -} - -.channel-row-label { - padding: 5px; -} - -.channel-row-label, .channel-row-label text { - color: @text_color; - background: rgba(0, 0, 0, 0); -} - -.channel-row-label.nsfw text { - color: #ed6666; -} - -.channel-row:focus { - background-color: #34495e; -} - -.channel-row-category { - padding-left: 15px; - color: #ff5370; -} - -.channel-row-channel { - padding-left: 30px; -} - -.messages, .message-container { - background-color: @background_color; -} - -.messages { - padding: 15px; -} - -.message-container-extra { - color: #78909c; -} - -.message-container-timestamp { - color: #78909c; -} - -.message-text { - /* this isnt stricly necessary but it fixes emoji clipping */ - padding-bottom: 5px; -} - -.message-text:not(.failed) text, .message-reply { - color: @text_color; -} - -.message-text.pending text { - color: shade(@text_color, 0.5); -} - -.message-text.failed text { - color: #b72d4f; -} - -.message-reply { - border-left: 2px solid gray; - padding-left: 20px; - padding-top: 6px; - padding-bottom: 6px; - opacity: 0.7; -} - -.message-text + .message-text { - padding-top: 5px; -} - -.message-text text { - background-color: @background_color; -} - -.message-input, .message-input textview, .message-input textview text { - background-color: #242424; - color: #adadad; - border-radius: 3px; - border: 1px solid transparent; -} - -.message-input { - border: 1px solid #444444; - margin-right: 15px; -} - -.message-input.replying { - border: 1px solid #026FB9; -} - -.message-input.editing { - border: 1px solid #b9026f; -} - -.message-input.bad-input { - border: 1px solid #dd3300; -} - -.message-input-browse-icon { - color: #b9bbbe; - margin-left: 5px; - margin-top: 11px; -} - -/* i dont think theres a way to circumvent having to do this to adjust around the browse icon */ -.message-input:not(.with-browser-icon) { - padding: 0px 0px 0px 5px; -} - -.message-input.with-browse-icon { - padding: 0px 0px 0px 30px; -} - -.members { - background-color: @background_color; -} - -.members-row-label { - color: @text_color; - padding: 5px; -} - -.members-row-member { - padding: 0; - padding-left: 15px; -} - .message-attachment-box { - color: #aaaaaa; border: 1px solid #aaaaaa; padding: 2px 5px 2px 5px; } @@ -161,61 +23,6 @@ margin: 5px; } -.message-component { - margin: 5px; -} - -.message-component.primary { - background: #5865F2; -} - -.message-component.secondary, .message-component.link { - background: #4F545C; -} - -.message-component.success { - background: #43B581; -} - -.message-component.danger { - background: #F04747; -} - -.reaction-box { - padding: 2px 5px 2px 5px; - margin: 0px 0px 0px 0px; - background-color: rgba(0.4, 0.4, 0.4, 0.4); - border-radius: 5px; - border: 1px solid transparent; -} - -.reaction-box.reacted { - border: 1px solid white; -} - -.reaction-count { - color: @text_color; -} - -.completer { - background-color: @secondary_color; - padding: 5px; -} - -.completer-entry { - color: @text_color; -} - -.completer-entry-image { - margin-right: 6px; -} - -.typing-indicator { - margin-top: 10px; - margin-bottom: -7px; - color: @text_color; -} - .status-indicator.dnd { color: #982929; } @@ -232,39 +39,41 @@ color: #FAA61A; } -.profile-main-container { - padding: 20px; +.message-input textview, .message-input textview text { + background-color: inherit; } -.profile-username { - margin-left: 10px; - font-size: 20px; +.message-text, .message-text text { + background: inherit; } -.profile-username-nondisplay { - margin-left: 10px; +.message-input textview { + padding: 10px 5px; } -.profile-badge { - margin-right: 10px; +.message-reply { + border-left: 2px solid gray; + padding-left: 10px; + padding-top: 6px; + padding-bottom: 6px; + opacity: 0.8; } -.profile-switcher { - padding-top: 5px; +.profile-main-container { + padding: 20px; } -.profile-connections { - margin-top: 10px; +.profile-username { + margin-left: 10px; + font-size: 20px; } -.profile-connection { - background: @secondary_color; - border-radius: 15px; - margin-right: 20px; +.profile-username-nondisplay { + margin-left: 10px; } -.profile-connection box { - padding: 5px; +.profile-switcher { + padding-top: 5px; } .profile-stack { @@ -276,126 +85,43 @@ padding-bottom: 5px; } -.profile-notes-text, .profile-notes-text text { - background: @secondary_color; -} - -.profile-notes-text text { - border-radius: 5px; - border: 1px solid #36515e; - color: @text_color; - padding-bottom: 5px; -} - .profile-badges { padding-left: 5px; } -.guild-members-pane-info { - padding: 10px; -} - -.drag-hover-top { - background: linear-gradient(to bottom, rgba(255, 66, 66, 0.65) 0%, rgba(0, 0, 0, 0) 35%); -} - -.drag-hover-bottom { - background: linear-gradient(to bottom, rgba(0, 0, 0, 0) 65%, rgba(255, 66, 66, 0.65) 100%); -} - -.friends-list list { - background: @background_color; - padding-left: 10px; +.profile-badge { + margin-right: 5px; } -.friends-list-row-bot { - color: #ff0000; +.profile-connections { + margin-top: 10px; } -.channel-tab-switcher .box { - margin: -7px -1px -7px -1px; - background: #2a2a2a; +.profile-connection { + padding: 5px; + border-radius: 10px; border: 1px solid black; } -.channel-tab-switcher tab:hover { - box-shadow: inset 0 -6px #17633e; -} - -.channel-tab-switcher tab:checked { - box-shadow: inset 0 -6px #2feb90; -} - -.channel-tab-switcher tab { - background: #1A1A1A; - border: 1px solid #808080; - min-height: 35px; -} - -.channel-tab-switcher tab.needs-attention:not(:checked) { - font-weight: bold; - animation: 150ms ease-in; - /* background-image: radial-gradient(ellipse at bottom, #FF5370, #1A1A1A 30%); */ - box-shadow: inset 0 -6px red; -} - -.channel-tab-switcher tab > button { - border: none; - padding: 0; - margin: 5px; - min-width: 16px; - min-height: 16px; - color: #FF5370; - background-color: rgba(0.21, 0.21, 0.21, 0.5); +.profile-connection-image { + padding-right: 5px; } -.channel-tab-switcher tab > button:hover { - background-color: alpha(#ff0000, 0.5); -} - -.message-progress { - border: none; - margin-bottom: -8px; -} - -.message-progress trough { - border: none; - background-color: transparent; +.reaction-box { + padding: 2px 5px 2px 5px; + border-radius: 5px; + border: 1px solid black; } -.message-progress progress { - border: none; - background-color: #dd3300; - margin-left: 1px; +.reaction-box.reacted { + border: 1px solid #5865f2; + background-color: rgba(89, 102, 242, 0.5); } -.voice-info { - background-color: #0B0B0B; +.set-status-dialog .dialog-vbox { padding: 5px; - border: 1px solid #202020; -} - -.voice-info-disconnect-image { - color: #DDDDDD; -} - -.voice-info-status { - font-weight: bold; -} - -.voice-info-location { - -} - -.voice-state-server { - color: red; -} - -spinbutton { - color: @text_color; - margin-top: 10px; } -.emoji-picker, .emoji-picker stack box { - background-color: @background_color; +.set-status-dialog .dialog-action-area { + margin: 10px 5px 5px 5px; } -- cgit v1.2.3 From 14317bb513846a57034ecd21187a81fd2e861e85 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Fri, 1 Dec 2023 02:00:08 -0500 Subject: tweak voice settings window ui --- res/css/main.css | 8 ++++++++ src/windows/voicesettingswindow.cpp | 20 ++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) (limited to 'res/css') diff --git a/res/css/main.css b/res/css/main.css index 19c65f0..95cab3e 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -125,3 +125,11 @@ .set-status-dialog .dialog-action-area { margin: 10px 5px 5px 5px; } + +.voice-settings-window > box { + padding: 5px; +} + +.voice-settings-window scale { + margin-right: 8px; +} diff --git a/src/windows/voicesettingswindow.cpp b/src/windows/voicesettingswindow.cpp index 97f77b5..1a112f5 100644 --- a/src/windows/voicesettingswindow.cpp +++ b/src/windows/voicesettingswindow.cpp @@ -12,6 +12,7 @@ VoiceSettingsWindow::VoiceSettingsWindow() : m_main(Gtk::ORIENTATION_VERTICAL) { get_style_context()->add_class("app-window"); + get_style_context()->add_class("voice-settings-window"); set_default_size(300, 300); m_encoding_mode.append("Voice"); @@ -115,10 +116,21 @@ VoiceSettingsWindow::VoiceSettingsWindow() m_signal_gain.emit(m_gain.get_value() / 100.0); }); - m_main.add(m_encoding_mode); - m_main.add(m_signal); - m_main.add(m_bitrate); - m_main.add(m_gain); + auto *layout = Gtk::make_managed(); + auto *labels = Gtk::make_managed(); + auto *widgets = Gtk::make_managed(); + layout->pack_start(*labels, false, true, 5); + layout->pack_start(*widgets); + labels->pack_start(*Gtk::make_managed("Coding Mode", Gtk::ALIGN_END)); + labels->pack_start(*Gtk::make_managed("Signal Hint", Gtk::ALIGN_END)); + labels->pack_start(*Gtk::make_managed("Bitrate", Gtk::ALIGN_END)); + labels->pack_start(*Gtk::make_managed("Gain", Gtk::ALIGN_END)); + widgets->pack_start(m_encoding_mode); + widgets->pack_start(m_signal); + widgets->pack_start(m_bitrate); + widgets->pack_start(m_gain); + + m_main.add(*layout); add(m_main); show_all_children(); -- cgit v1.2.3 From 2625f6e4207d2ec3f45629208181f49564dca9aa Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sun, 3 Dec 2023 02:58:12 -0500 Subject: override min-height for message input vscrollbar slider --- res/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'res/css') diff --git a/res/css/main.css b/res/css/main.css index 95cab3e..1025f24 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -133,3 +133,7 @@ .voice-settings-window scale { margin-right: 8px; } + +.message-input scrollbar.vertical slider { + min-height: 0px; +} -- cgit v1.2.3 From 3ed89cfd67a28e5f63b577f9a726b917c4cef977 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:23:37 -0500 Subject: reaction box colors from theme --- res/css/main.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'res/css') diff --git a/res/css/main.css b/res/css/main.css index 1025f24..9eda560 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -110,12 +110,12 @@ .reaction-box { padding: 2px 5px 2px 5px; border-radius: 5px; - border: 1px solid black; + border: 1px solid @theme_fg_color; } .reaction-box.reacted { border: 1px solid #5865f2; - background-color: rgba(89, 102, 242, 0.5); + background-color: alpha(@theme_selected_bg_color, 0.5); } .set-status-dialog .dialog-vbox { -- cgit v1.2.3 From 4bca973a21b632eaaa0af271a00f06e8860ec288 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Mon, 4 Dec 2023 21:44:35 -0500 Subject: get connection border color from theme --- res/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'res/css') diff --git a/res/css/main.css b/res/css/main.css index 9eda560..8fcca72 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -100,7 +100,7 @@ .profile-connection { padding: 5px; border-radius: 10px; - border: 1px solid black; + border: 1px solid @theme_fg_color; } .profile-connection-image { -- cgit v1.2.3 From 0963be3ec3ef5bc60b6afda35fecde7cfddd23e9 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 23 Dec 2023 20:48:50 -0500 Subject: add pending and failed css --- res/css/main.css | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'res/css') diff --git a/res/css/main.css b/res/css/main.css index 8fcca72..ae7bf60 100644 --- a/res/css/main.css +++ b/res/css/main.css @@ -137,3 +137,11 @@ .message-input scrollbar.vertical slider { min-height: 0px; } + +.message-text.pending { + color: alpha(currentColor, 0.5); +} + +.message-text.failed { + color: red; +} -- cgit v1.2.3