diff options
Diffstat (limited to 'main/data')
| -rw-r--r-- | main/data/main_window.ui | 50 | ||||
| -rw-r--r-- | main/data/style.css | 54 |
2 files changed, 65 insertions, 39 deletions
diff --git a/main/data/main_window.ui b/main/data/main_window.ui index e62c952b..ee094714 100644 --- a/main/data/main_window.ui +++ b/main/data/main_window.ui @@ -28,32 +28,44 @@ <property name="child"> <object class="AdwToolbarView"> <child type="top"> - <object class="GtkBox" id="conversation_list_toolbar"> - <property name="spacing">6</property> - <style> - <class name="toolbar"/> - <class name="dino-conversation-list-toolbar"/> - </style> + <object class="GtkOverlay"> <child> - <object class="GtkMenuButton" id="menu_button"> - <property name="has-frame">False</property> - <property name="valign">center</property> + <object class="GtkBox" id="conversation_list_toolbar"> + <property name="spacing">6</property> + <property name="margin-start">6</property> + <property name="margin-end">6</property> + <style> + <class name="toolbar"/> + <class name="dino-conversation-list-toolbar"/> + </style> <child> - <object class="GtkImage"> - <property name="icon-name">dino-open-menu-symbolic</property> - <property name="icon-size">normal</property> + <object class="GtkMenuButton" id="menu_button"> + <property name="has-frame">False</property> + <property name="valign">center</property> + <child> + <object class="GtkImage"> + <property name="icon-name">dino-open-menu-symbolic</property> + <property name="icon-size">normal</property> + </object> + </child> + </object> + </child> + <child> + <object class="GtkSearchEntry" id="conversation_search_entry"> + <property name="hexpand">True</property> + <property name="valign">center</property> + <property name="placeholder-text" translatable="yes">Search conversations</property> + <style> + <class name="dino-conversation-search-entry"/> + </style> </object> </child> </object> </child> - <child> - <object class="GtkSearchEntry" id="conversation_search_entry"> + <child type="overlay"> + <object class="DinoUiAccountSwitcher" id="account_switcher"> + <property name="valign">end</property> <property name="hexpand">True</property> - <property name="valign">center</property> - <property name="placeholder-text" translatable="yes">Search conversations</property> - <style> - <class name="dino-conversation-search-entry"/> - </style> </object> </child> </object> diff --git a/main/data/style.css b/main/data/style.css index 7038f901..12000b12 100644 --- a/main/data/style.css +++ b/main/data/style.css @@ -30,6 +30,7 @@ window.dino-main .dino-conversation-list-toolbar { margin: 0; background-color: @window_bg_color; background-image: none; + padding: 0; } window.dino-main .dino-conversation-list-toolbar { @@ -37,26 +38,6 @@ window.dino-main .dino-conversation-list-toolbar { box-shadow: 0 3px 12px alpha(black, 0.18); } -window.dino-main headerbar.dino-chat-headerbar { - border-bottom: none; - box-shadow: 0 3px 12px alpha(black, 0.18); -} - -window.dino-main headerbar.dino-chat-headerbar windowtitle { - min-height: 2.5em; -} - -window.dino-main headerbar.dino-chat-headerbar > windowhandle > box, -window.dino-main .dino-conversation-list-toolbar { - padding-top: 0; - padding-bottom: 0; -} - -window.dino-main .dino-conversation-list-toolbar { - padding-left: 6px; - padding-right: 6px; -} - window.dino-main headerbar button, window.dino-main .dino-conversation-list-toolbar entry, window.dino-main .dino-conversation-list-toolbar button, @@ -70,6 +51,39 @@ window.dino-main popover row { window.dino-main .dino-conversation-list-toolbar entry.dino-conversation-search-entry { border-radius: 6px; + min-height: 28px; +} + +window.dino-main .dino-conversation-list-toolbar menubutton, +window.dino-main .dino-conversation-list-toolbar menubutton > button { + min-height: 28px; +} + +window.dino-main .dino-account-switcher { + min-height: 6px; + background-color: transparent; + margin: 0; + padding: 0; +} + +window.dino-main .dino-account-switcher-box, +window.dino-main .dino-account-switcher-bars { + margin: 0; + padding: 0; +} + +window.dino-main .dino-account-color-bar { + min-height: 6px; + margin: 0; + padding: 0; +} + +window.dino-main .dino-account-all-bar { + min-width: 44px; +} + +window.dino-main .dino-account-all-bar.dimmed { + opacity: 0.4; } window.dino-main button.circular, |