Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 15 additions & 3 deletions lib/Styles/Gtk/Button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,19 @@ button {
@extend .circular;

padding: rem(4px);
min-height: rem(16px);
min-width: rem(16px);
min-height: 16px;
min-width: 16px;
transition:
background duration("expand") easing(),
transform duration("expand") easing("ease-out-back");

&:active {
background: rgba($fg-color, 0.15);
transform: scale(0.8);
transition:
background duration("collapse") easing(),
transform duration("collapse") easing();
}

&.toggle {
@include border-interactive-roundrect;
Expand All @@ -21,6 +32,7 @@ button {
}

.linked &,
.linked &.image-button,
.linked &.image-button.toggle,
&.text-button {
@include control;
Expand All @@ -29,6 +41,7 @@ button {
&:active,
&:checked {
@include control-active;
transform: none;
}

&:active {
Expand Down Expand Up @@ -109,7 +122,6 @@ button {
transform duration("expand") easing("ease-out-back");

&:active {
transform: scale(0.95);
transition:
background duration("collapse") easing(),
transform duration("collapse") easing();
Expand Down
13 changes: 2 additions & 11 deletions lib/Styles/Gtk/WindowControls.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,9 @@ windowcontrols {
}

button {
@extend .image-button;

border-radius: rem($window_radius / 2);
padding: rem(4px);
transition:
background duration("expand") easing(),
transform duration("expand") easing("ease-out-back");

&:active {
background: rgba($fg-color, 0.15);
transform: scale(0.8);
transition:
background duration("collapse") easing(),
transform duration("collapse") easing();
}
}
}