Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix linked buttons styling; also add styles for libhandy #22

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix linked buttons styling; also add styles for libhandy #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53f5f10
Fix .linked styling
johnfactotum Dec 4, 2020
c8f90f8
Add styles for libhandy 1.0.0
johnfactotum Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ gtk3_noconf_sources = [
'gtk3-drawing.scss',
'gtk3-common.scss',
'gtk3-apps.scss',
'gtk3-xfce.scss'
'gtk3-xfce.scss',
'gtk3-libhandy.scss'
]

# Copy sources that doesnt require configuration to builddir
Expand Down Expand Up @@ -480,7 +481,8 @@ gtk3_noconf_sources = [
'gtk3-drawing.scss',
'gtk3-common.scss',
'gtk3-apps.scss',
'gtk3-xfce.scss'
'gtk3-xfce.scss',
'gtk3-libhandy.scss'
]

gtk3_version = '3.24'
Expand Down
55 changes: 31 additions & 24 deletions src/gtk3/gtk3-common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,11 +957,11 @@ button {
toolbar.inline-toolbar toolbutton {
> button.flat { @extend %linked_middle; }

&:first-child > button.flat { @extend %linked:first-child; }
&:first-child > button.flat { @extend %linked_left; }

&:last-child > button.flat { @extend %linked:last-child; }
&:last-child > button.flat { @extend %linked_right; }

&:only-child > button.flat { @extend %linked:only-child; }
&:only-child > button.flat { @extend %linked_only_child; }
}

%linked_middle {
Expand Down Expand Up @@ -1032,17 +1032,19 @@ toolbar.inline-toolbar toolbutton {
}
}

%linked_only_child {
border-radius: $base_radius;
-gtk-outline-radius: $base_radius;
}

// .linked assumes Box, which reverses nodes in RTL, so 1st child is always left
%linked {
@extend %linked_middle;

&:first-child { @extend %linked_left; }
&:last-child { @extend %linked_right; }

&:only-child {
border-radius: $base_radius;
-gtk-outline-radius: $base_radius;
}
&:only-child { @extend %linked_only_child; }
}

%linked_flippable_middle {
Expand Down Expand Up @@ -1146,27 +1148,32 @@ toolbar.inline-toolbar toolbutton {
}
}

%linked_vertical{
@extend %linked_vertical_middle;

&:first-child {
%linked_vertical_top {
margin-top: 0;
margin-right: 0;
border-top-left-radius: $base_radius;
border-top-right-radius: $base_radius;
-gtk-outline-radius: $base_radius $base_radius 0 0;
}
}

&:last-child {
%linked_vertical_bottom {
border-bottom-left-radius: $base_radius;
border-bottom-right-radius: $base_radius;
-gtk-outline-radius: 0 0 $base_radius $base_radius;
}
}

&:only-child {
%linked_vertical_only_child {
border-radius: $base_radius;
-gtk-outline-radius: $base_radius;
}
}

%linked_vertical{
@extend %linked_vertical_middle;

&:first-child { @extend %linked_vertical_top; }
&:last-child { @extend %linked_vertical_bottom; }

&:only-child { @extend %linked_vertical_only_child; }
}

%undecorated_button {
Expand Down Expand Up @@ -1525,8 +1532,8 @@ combobox {

&.linked {
button:nth-child(2) {
&:dir(ltr) { @extend %linked:last-child; }
&:dir(rtl) { @extend %linked:first-child; }
&:dir(ltr) { @extend %linked_right; }
&:dir(rtl) { @extend %linked_left; }
}
}

Expand All @@ -1546,14 +1553,14 @@ combobox {
&:dir(rtl) { @extend %linked_middle; } // specificity bump
}

.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked:first-child; }
.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked:last-child; }
.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked:only-child; }
.linked:not(.vertical) > combobox:first-child > box > button.combo { @extend %linked_left; }
.linked:not(.vertical) > combobox:last-child > box > button.combo { @extend %linked_right; }
.linked:not(.vertical) > combobox:only-child > box > button.combo { @extend %linked_only_child; }

.linked.vertical > combobox > box > button.combo { @extend %linked_vertical_middle; }
.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical:first-child;}
.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical:last-child; }
.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical:only-child; }
.linked.vertical > combobox:first-child > box > button.combo { @extend %linked_vertical_top;}
.linked.vertical > combobox:last-child > box > button.combo { @extend %linked_vertical_bottom; }
.linked.vertical > combobox:only-child > box > button.combo { @extend %linked_vertical_only_child; }


/************
Expand Down
231 changes: 231 additions & 0 deletions src/gtk3/gtk3-libhandy.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,231 @@
/* Based on _libhandy.scss from arc-theme, which in turn was based on
_Adwaita-base.scss from libhandy */

// HdyComboRow

popover.combo {
padding: 0;

list {
background-color: transparent;

> row {
padding: 0 10px;
min-height: 50px;

&:first-child { @extend %linked_vertical_top; }
&:last-child { @extend %linked_vertical_bottom; }
}
}

overshoot.top { @extend %linked_vertical_top; }
overshoot.bottom { @extend %linked_vertical_bottom; }

scrollbar.vertical {
background-color: $popover_bg_color;

&:dir(ltr) { @extend %linked_right; }
&:dir(rtl) { @extend %linked_left; }
}
}

// HdyExpanderRow

row.expander {
padding: 0px;

&:checked image.expander-row-arrow:not(:disabled) {
color: $selected_bg_color;
}

image.expander-row-arrow:disabled {
color: $insensitive_fg_color;
}
}

// HdyKeypad

keypad {
.digit {
font-size: 200%;
font-weight: bold;
}

.letters {
font-size: 70%;
}

.symbol {
font-size: 160%;
}
}

// HdyViewSwitcher

viewswitcher {
&, & button {
margin: 0;
padding: 0;
}

button {
border-radius: 0;
border-top: 0;
border-bottom: 0;

&:not(:checked):not(:hover) {
background: transparent;
border-color: transparent;
}

&:checked, &:active {
border-color: $borders_color;
}

// View switcher button
> stack > box {
&.narrow {
font-size: 0.75rem;
padding-top: 7px;
padding-bottom: 5px;

image,
label {
padding-left: 8px;
padding-right: 8px;
}
}

&.wide {
padding: 8px 10px;

label {
&:dir(ltr) {
padding-right: 7px;
}

&:dir(rtl) {
padding-left: 7px;
}
}
}
}

&.needs-attention {
> stack > box label {
background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($selected_bg_color), to(transparent));
background-size: 6px 6px;
background-repeat: no-repeat;
background-position: right 0px;

&:dir(rtl) {
background-position: left 0px;
}
}

&:active > stack > box label {
background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to($selected_fg_color), to(transparent));
}
}
}
}

// HdyViewSwitcherBar

viewswitcherbar actionbar > revealer > box {
padding: 0;
}

// Content list

list.content {
&,
list {
background-color: transparent;
}

// Nested rows background
list.nested > row:not(:active) {
&:not(:hover):not(:selected),
&:hover:not(.activatable):not(:selected) {
background-color: mix($bg_color, $base_color);
}

&:hover.activatable:not(:selected) {
background-color: if($variant != 'dark', mix($base_color, black, 95%), mix($base_color, white, 97%));
}
}

> row {
// Regular rows and expander header rows background
&:not(.expander):not(:active):not(:hover):not(:selected),
&:not(.expander):not(:active):hover:not(.activatable):not(:selected),
&.expander row.header:not(:active):not(:hover):not(:selected),
&.expander row.header:not(:active):hover:not(.activatable):not(:selected) {
background-color: $base_color;
}

&:not(.expander):not(:active):hover.activatable:not(:selected),
&.expander row.header:not(:active):hover.activatable:not(:selected) {
background-color: if($variant != 'dark', mix($base_color, black, 95%), mix($base_color, white, 97%));
}

&,
list > row {
border-color: $borders_color;
border-style: solid;
transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
}

// Top border
&:not(:last-child) {
border-width: 1px 1px 0px 1px;
}

// Rounded top
&:first-child,
&.expander:first-child row.header,
&.expander:checked,
&.expander:checked row.header,
&.expander:checked + row,
&.expander:checked + row.expander row.header {
@extend %linked_vertical_top;
}

// Bottom border
&:last-child,
&.checked-expander-row-previous-sibling,
&.expander:checked {
border-width: 1px;
}

// Rounded bottom
&:last-child,
&.checked-expander-row-previous-sibling,
&.expander:checked,
&.expander:not(:checked):last-child row.header,
&.expander:not(:checked).checked-expander-row-previous-sibling row.header,
&.expander.empty:checked row.header,
&.expander list.nested > row:last-child {
@extend %linked_vertical_bottom;
}

// Add space around expanded rows
&.expander:checked:not(:first-child),
&.expander:checked + row {
margin-top: 5px;
}
}
}

// Unified window

window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized) {
&,
> decoration,
> decoration-overlay {
border-radius: $window_top_radius;
}
}


1 change: 1 addition & 0 deletions src/gtk3/gtk3.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ $gnome: @gnome_version@;
@import 'gtk3-common';
@import 'gtk3-apps';
@import 'gtk3-xfce';
@import 'gtk3-libhandy';