diff options
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/gtk/page-row.ui | 3 | ||||
| -rw-r--r-- | src/resources/gtk/pages-popover.ui | 9 | ||||
| -rw-r--r-- | src/resources/gtk/pages-view.ui | 3 | ||||
| -rw-r--r-- | src/resources/themes/_Adwaita-base.scss | 89 | ||||
| -rw-r--r-- | src/resources/themes/_shared-base.scss | 2 |
5 files changed, 67 insertions, 39 deletions
diff --git a/src/resources/gtk/page-row.ui b/src/resources/gtk/page-row.ui index 17bcb9278..43c42d92f 100644 --- a/src/resources/gtk/page-row.ui +++ b/src/resources/gtk/page-row.ui @@ -13,6 +13,7 @@ <object class="GtkBox" id="box"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin-start">6</property> <child> <object class="GtkStack" id="icon_stack"> <property name="visible">True</property> @@ -98,7 +99,7 @@ <style> <class name="flat"/> <class name="image-button"/> - <class name="page-row-close-button"/> + <class name="close-button"/> </style> </object> <packing> diff --git a/src/resources/gtk/pages-popover.ui b/src/resources/gtk/pages-popover.ui index 219ec5dcd..d1c84d8a2 100644 --- a/src/resources/gtk/pages-popover.ui +++ b/src/resources/gtk/pages-popover.ui @@ -2,6 +2,9 @@ <interface> <!-- interface-requires gtk+ 3.16 --> <template class="EphyPagesPopover" parent="GtkPopover"> + <style> + <class name="combo"/> + </style> <child> <object class="GtkScrolledWindow" id="scrolled_window"> <property name="hscrollbar_policy">never</property> @@ -10,16 +13,12 @@ <property name="visible">True</property> <child> <object class="GtkListBox" id="list_box"> - <property name="margin_bottom">12</property> - <property name="margin_end">12</property> - <property name="margin_start">12</property> - <property name="margin_top">12</property> <property name="selection_mode">single</property> <property name="visible">True</property> <property name="width_request">300</property> <signal name="row-selected" handler="row_selected_cb" swapped="true"/> <style> - <class name="transparent"/> + <class name="pages-list"/> </style> </object> </child> diff --git a/src/resources/gtk/pages-view.ui b/src/resources/gtk/pages-view.ui index cb97d1979..d9e576bcd 100644 --- a/src/resources/gtk/pages-view.ui +++ b/src/resources/gtk/pages-view.ui @@ -2,6 +2,7 @@ <interface> <!-- interface-requires gtk+ 3.16 --> <template class="EphyPagesView" parent="GtkScrolledWindow"> + <property name="name">pages-view</property> <property name="hscrollbar_policy">never</property> <property name="propagate_natural_height">True</property> <property name="visible">True</property> @@ -12,7 +13,7 @@ <property name="width_request">300</property> <signal name="row-activated" handler="row_activated_cb" swapped="true"/> <style> - <class name="transparent"/> + <class name="pages-list"/> </style> </object> </child> diff --git a/src/resources/themes/_Adwaita-base.scss b/src/resources/themes/_Adwaita-base.scss index 01a51b9e8..a533e18ff 100644 --- a/src/resources/themes/_Adwaita-base.scss +++ b/src/resources/themes/_Adwaita-base.scss @@ -13,27 +13,24 @@ @import 'drawing'; -$close_button_fg_color: if($variant == 'light', lighten($fg_color, 10%), darken($fg_color, 10%)); -@mixin close_button($bg:$bg_color, $fg:$close_button_fg_color) { +@mixin close_button($fg:$fg_color) { background: none; border: none; box-shadow: none; - - &:last-child { - image { - color: $fg; - border: 1px solid transparent; - border-radius: 5px; - } - - &:hover image { - @include button(normal, $bg, $fg); - @include button(hover, $bg, $fg); - } - - &:active image { - @include button(normal, $bg, $fg); - @include button(active, $bg, $fg); + -gtk-icon-shadow: none; + text-shadow: none; + min-width: 24px; + min-height: 24px; + border-radius: 99px; + color: inherit; + padding: 0; + margin: 2px; + + &:hover { + background: gtkalpha($fg, .15); + + &:active { + background: gtkalpha(black, .2); } } } @@ -53,19 +50,7 @@ $close_button_fg_color: if($variant == 'light', lighten($fg_color, 10%), darken( } .bookmark-tag-widget-selected button { - @include close_button($selected_bg_color, $selected_fg_color); -} - -.page-row-close-button { - @include close_button(); - - row:selected & { - @include close_button($selected_bg_color, $selected_fg_color); - } - - row.narrow & image { - padding: 6px; - } + @include close_button($selected_fg_color); } @keyframes needs_attention_keyframes { @@ -129,3 +114,45 @@ $close_button_fg_color: if($variant == 'light', lighten($fg_color, 10%), darken( } } } + +$menu_selected_color: if($variant == 'light', darken($bg_color, 6%), darken($bg_color, 8%)); + +@if $high_contrast { + $menu_selected_color: darken($bg_color,10%); +} + +.pages-list { + margin: 5px; + + row { + min-height: 36px; + padding: 3px; + border-radius: 5px; + -gtk-outline-radius: 5px; + border: none; + color: $fg_color; + transition: none; + box-shadow: none; + + &:not(:last-child) { + margin-bottom: 2px; + } + + &:selected { + background: $menu_selected_color; + } + + &:hover { + background: darken($menu_selected_color,5%); + } + + .close-button { + @include close_button(); + + #pages-view & { + min-width: 36px; + min-height: 36px; + } + } + } +} diff --git a/src/resources/themes/_shared-base.scss b/src/resources/themes/_shared-base.scss index 868e70964..c43113a12 100644 --- a/src/resources/themes/_shared-base.scss +++ b/src/resources/themes/_shared-base.scss @@ -209,7 +209,7 @@ dzlsuggestionpopover > revealer > box > elastic > scrolledwindow > viewport > li } } -.transparent { +.pages-list { background: none; } |