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.

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

Gtk4 symlink to upstream #2902

Merged
merged 3 commits into from
Jun 12, 2021
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
61 changes: 0 additions & 61 deletions gtk/src/default/gtk-4.0/_colors-public.scss

This file was deleted.

1 change: 1 addition & 0 deletions gtk/src/default/gtk-4.0/_colors-public.scss
88 changes: 0 additions & 88 deletions gtk/src/default/gtk-4.0/_common.scss

This file was deleted.

1 change: 1 addition & 0 deletions gtk/src/default/gtk-4.0/_common.scss
145 changes: 0 additions & 145 deletions gtk/src/default/gtk-4.0/_drawing.scss

This file was deleted.

1 change: 1 addition & 0 deletions gtk/src/default/gtk-4.0/_drawing.scss
15 changes: 15 additions & 0 deletions gtk/src/default/gtk-4.0/_inverted-headerbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ window.background.csd {
}

headerbar {
color: $fg_color; // reinsert fg_color

@import 'widgets/buttons';
@import 'widgets/switch';
@import 'widgets/scale';
Expand All @@ -25,6 +27,19 @@ windowhandle separator.vertical {

@import 'widgets/header-bar';

// Inverted headerbar tweaks
headerbar {
box-shadow: inset 0 1px lighten($headerbar_bg_color, 6%); // Top highlight

// Reinsert windowcontrols size tweak
windowcontrols {
button {
padding: 2px;
margin: 0 7px;
}
}
}

// Must be imported after _header-bar
headerbar {
@import 'widgets/view-switcher';
Expand Down
24 changes: 18 additions & 6 deletions gtk/src/default/gtk-4.0/_tweaks.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// Orange close button
// Smaller windowcontrols and orange close button
windowcontrols {
margin-left: 7px; // Fix windowcontrols misalignement caused by smaller windowcontrols

button {
padding: 2px;
margin: 0 7px;
&.close {
background: $selected_bg_color;

Expand All @@ -23,11 +27,6 @@ windowcontrols {
}
}

// Fix windowcontrols misalignement
windowcontrols {
margin-left: 7px;
}

// Reducing the amount of the palette's background colors to two
.sidebar { background-color: $bg_color; }

Expand All @@ -47,3 +46,16 @@ scale > trough > slider,
scale > trough > highlight {
transition: $button_transition;
}

// Use our own palette for
levelbar {
> trough {
> block {
&.high,
&:not(.empty) {
background-color: $success_color;
}
}
}
}

Loading