diff options
Diffstat (limited to 'main/data')
-rw-r--r-- | main/data/add_conversation/list_row.ui | 7 | ||||
-rw-r--r-- | main/data/contact_details_dialog.ui | 8 | ||||
-rw-r--r-- | main/data/conversation_item_widget.ui | 6 | ||||
-rw-r--r-- | main/data/conversation_row.ui | 6 | ||||
-rw-r--r-- | main/data/manage_accounts/account_row.ui | 6 | ||||
-rw-r--r-- | main/data/manage_accounts/dialog.ui | 8 | ||||
-rw-r--r-- | main/data/occupant_list_item.ui | 6 | ||||
-rw-r--r-- | main/data/quote.ui | 7 | ||||
-rw-r--r-- | main/data/search_autocomplete.ui | 7 | ||||
-rw-r--r-- | main/data/style.css | 10 |
10 files changed, 35 insertions, 36 deletions
diff --git a/main/data/add_conversation/list_row.ui b/main/data/add_conversation/list_row.ui index c0d7e517..b8a97174 100644 --- a/main/data/add_conversation/list_row.ui +++ b/main/data/add_conversation/list_row.ui @@ -8,10 +8,9 @@ <property name="margin-bottom">3</property> <property name="column-spacing">10</property> <child> - <object class="DinoUiAvatarImage" id="image"> - <property name="allow_gray">False</property> - <property name="height">30</property> - <property name="width">30</property> + <object class="DinoUiAvatarPicture" id="picture"> + <property name="height-request">30</property> + <property name="width-request">30</property> <property name="valign">center</property> </object> </child> diff --git a/main/data/contact_details_dialog.ui b/main/data/contact_details_dialog.ui index 64a0e5fc..4802ae9a 100644 --- a/main/data/contact_details_dialog.ui +++ b/main/data/contact_details_dialog.ui @@ -30,10 +30,10 @@ <property name="margin-start">100</property> <property name="column-spacing">10</property> <child> - <object class="DinoUiAvatarImage" id="avatar"> - <property name="height">50</property> - <property name="width">50</property> - <property name="allow_gray">False</property> + <object class="DinoUiAvatarPicture" id="avatar"> + <property name="height-request">50</property> + <property name="width-request">50</property> + <property name="valign">center</property> <layout> <property name="column">0</property> <property name="row">0</property> diff --git a/main/data/conversation_item_widget.ui b/main/data/conversation_item_widget.ui index cd6c9269..3216232d 100644 --- a/main/data/conversation_item_widget.ui +++ b/main/data/conversation_item_widget.ui @@ -5,9 +5,9 @@ <property name="column-spacing">7</property> <property name="row-spacing">2</property> <child> - <object class="DinoUiAvatarImage" id="avatar_image"> - <property name="height">35</property> - <property name="width">35</property> + <object class="DinoUiAvatarPicture" id="avatar_picture"> + <property name="height-request">35</property> + <property name="width-request">35</property> <property name="valign">start</property> <property name="margin-top">2</property> <layout> diff --git a/main/data/conversation_row.ui b/main/data/conversation_row.ui index 2eb9071b..3bd5527d 100644 --- a/main/data/conversation_row.ui +++ b/main/data/conversation_row.ui @@ -14,9 +14,9 @@ <property name="margin-start">7</property> <property name="margin-end">14</property> <child> - <object class="DinoUiAvatarImage" id="image"> - <property name="height">35</property> - <property name="width">35</property> + <object class="DinoUiAvatarPicture" id="picture"> + <property name="height-request">35</property> + <property name="width-request">35</property> <property name="valign">center</property> </object> </child> diff --git a/main/data/manage_accounts/account_row.ui b/main/data/manage_accounts/account_row.ui index 845010a2..91891b91 100644 --- a/main/data/manage_accounts/account_row.ui +++ b/main/data/manage_accounts/account_row.ui @@ -10,9 +10,9 @@ <property name="margin-bottom">6</property> <property name="column-spacing">6</property> <child> - <object class="DinoUiAvatarImage" id="image"> - <property name="height">40</property> - <property name="width">40</property> + <object class="DinoUiAvatarPicture" id="picture"> + <property name="height-request">40</property> + <property name="width-request">40</property> </object> </child> <child> diff --git a/main/data/manage_accounts/dialog.ui b/main/data/manage_accounts/dialog.ui index 90a36b83..4931507c 100644 --- a/main/data/manage_accounts/dialog.ui +++ b/main/data/manage_accounts/dialog.ui @@ -93,11 +93,9 @@ <class name="image-button"/> </style> <child> - <object class="DinoUiAvatarImage" id="image"> - <property name="height">50</property> - <property name="width">50</property> -<!-- <property name="xalign">1</property>--> - <property name="allow_gray">False</property> + <object class="DinoUiAvatarPicture" id="picture"> + <property name="height-request">50</property> + <property name="width-request">50</property> </object> </child> </object> diff --git a/main/data/occupant_list_item.ui b/main/data/occupant_list_item.ui index 1915aee6..47e63bc9 100644 --- a/main/data/occupant_list_item.ui +++ b/main/data/occupant_list_item.ui @@ -8,9 +8,9 @@ <property name="margin-end">7</property> <property name="column-spacing">10</property> <child> - <object class="DinoUiAvatarImage" id="image"> - <property name="height">30</property> - <property name="width">30</property> + <object class="DinoUiAvatarPicture" id="picture"> + <property name="height-request">30</property> + <property name="width-request">30</property> </object> </child> <child> diff --git a/main/data/quote.ui b/main/data/quote.ui index a7c32ed8..277fc374 100644 --- a/main/data/quote.ui +++ b/main/data/quote.ui @@ -7,10 +7,9 @@ <class name="dino-quote"/> </style> <child> - <object class="DinoUiAvatarImage" id="avatar"> - <property name="allow_gray">False</property> - <property name="height">15</property> - <property name="width">15</property> + <object class="DinoUiAvatarPicture" id="avatar"> + <property name="height-request">15</property> + <property name="width-request">15</property> <property name="valign">center</property> <layout> <property name="column">0</property> diff --git a/main/data/search_autocomplete.ui b/main/data/search_autocomplete.ui index a63bdce9..d607b192 100644 --- a/main/data/search_autocomplete.ui +++ b/main/data/search_autocomplete.ui @@ -3,14 +3,13 @@ <object class="GtkBox" id="root"> <property name="orientation">horizontal</property> <child> - <object class="DinoUiAvatarImage" id="image"> + <object class="DinoUiAvatarPicture" id="picture"> <property name="margin-top">4</property> <property name="margin-bottom">4</property> <property name="margin-start">6</property> <property name="margin-end">6</property> - <property name="height">24</property> - <property name="width">24</property> - <property name="allow_gray">False</property> + <property name="height-request">24</property> + <property name="width-request">24</property> </object> </child> <child> diff --git a/main/data/style.css b/main/data/style.css index fffee8a3..deac24fe 100644 --- a/main/data/style.css +++ b/main/data/style.css @@ -31,8 +31,8 @@ window.dino-main .dino-conversation viewport /* Some themes set this */ { } @keyframes highlight { - from { background: alpha(@warning_color, 0.5); } - to { background: transparent; } + from { background-color: alpha(@accent_color, 0.5); } + to { background-color: transparent; } } window.dino-main .dino-conversation .highlight-once { @@ -42,7 +42,7 @@ window.dino-main .dino-conversation .highlight-once { animation-name: highlight; } -window.dino-main .dino-conversation .message-box.highlight { +window.dino-main .dino-conversation .message-box.highlight:not(.highlight-once) { background: @window_bg_color; } @@ -119,6 +119,10 @@ window.dino-main .dino-quote:hover { background: alpha(@theme_fg_color, 0.08); } +picture.avatar { + border-radius: 3px; +} + /* Overlay Toolbar */ .dino-main .overlay-toolbar { |