Skip to content

Commit 2af22ea

Browse files
author
raveit65
committed
Gtk3: fix padding issue with link buttons in osd-toolbar +
- make the toolbar more transparent
1 parent 4d19707 commit 2af22ea

File tree

2 files changed

+58
-12
lines changed

2 files changed

+58
-12
lines changed

Zukitwo/gtk-3.0/gtk-main-common.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
@define-color osd_text_shadow alpha(black, 0.75);
2525

26-
@define-color osd_toolbar_bg_a alpha(@osd_base, 0.80);
27-
@define-color osd_toolbar_bg_b alpha(#101010, 0.80);
28-
@define-color osd_toolbar_bg_c alpha(shade(@osd_base, 1.02), 0.80);
26+
@define-color osd_toolbar_bg_a alpha(@osd_base, 0.50);
27+
@define-color osd_toolbar_bg_b alpha(#101010, 0.50);
28+
@define-color osd_toolbar_bg_c alpha(shade(@osd_base, 1.02), 0.50);
2929

3030
@define-color osd_button_bg_a alpha(@osd_highlight, 0.16);
3131
@define-color osd_button_bg_b alpha(@osd_lowlight, 0.05);

Zukitwo/gtk-3.0/gtk-widgets.css

Lines changed: 55 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2948,29 +2948,26 @@ GtkOverlay.osd {
29482948
}
29492949

29502950
.osd .button {
2951-
border-color: @osd_button_border;
2951+
border-color: shade (@theme_selected_bg_color, 0.3);
29522952
}
29532953
.osd .button:insensitive {
29542954
border-color: alpha(@osd_button_border,0.5);
29552955
}
29562956

29572957
.osd .button:active,
29582958
.osd .button:checked {
2959-
border-color: @osd_button_border_active;
2959+
border-color: shade (@theme_selected_bg_color, 0.5);
29602960
}
29612961

29622962
.osd.button,
29632963
.osd .button {
29642964
padding: 4px;
2965-
29662965
background-image: linear-gradient(to bottom,
29672966
@osd_button_bg_a,
29682967
@osd_button_bg_b 68%,
29692968
@osd_button_bg_c
29702969
);
2971-
29722970
color: @osd_button_fg;
2973-
29742971
text-shadow: 0 -1px @osd_button_shadow;
29752972
icon-shadow: 0 -1px @osd_button_shadow;
29762973
}
@@ -3066,6 +3063,28 @@ GtkOverlay.osd {
30663063
);
30673064
}
30683065

3066+
/* left/right button box */
3067+
.osd.toolbar .horizontal.linked {
3068+
background-image: linear-gradient(to bottom,
3069+
@osd_button_bg_a,
3070+
@osd_button_bg_b 68%,
3071+
@osd_button_bg_c);
3072+
border-radius: 5px;
3073+
}
3074+
3075+
/* button in osd-toolbar */
3076+
.osd .linked .button:active:first-child {
3077+
border-left-width: 1px;
3078+
}
3079+
3080+
.osd .linked .button:active:last-child {
3081+
border-right-width: 1px;
3082+
}
3083+
3084+
.osd.toolbar .flat.button.image-button {
3085+
box-shadow: none;
3086+
}
3087+
30693088
.osd GtkMenuButton.menu-button:active {
30703089
background-color: transparent;
30713090
border-color: @osd_button_border;
@@ -3079,17 +3098,17 @@ GtkOverlay.osd {
30793098
.osd.toolbar {
30803099
color: @osd_fg;
30813100
text-shadow: 0 1px @osd_text_shadow;
3082-
30833101
padding: 10px;
3084-
border-style: none;
3102+
border-style: solid;
3103+
border-width: 1px;
3104+
border-color: shade (@theme_selected_bg_color, 0.5);
30853105
border-radius: 7px;
30863106
background-image: linear-gradient(to bottom,
30873107
@osd_toolbar_bg_a,
30883108
@osd_toolbar_bg_b 63%,
30893109
@osd_toolbar_bg_c
30903110
);
30913111
background-color: transparent;
3092-
30933112
-GtkToolbar-button-relief: normal;
30943113
}
30953114

@@ -3120,7 +3139,6 @@ GtkOverlay.osd {
31203139
border-width: 1px;
31213140
border-radius: 5px;
31223141
border-style: solid;
3123-
31243142
box-shadow: none;
31253143
}
31263144

@@ -3156,6 +3174,34 @@ GtkOverlay.osd {
31563174
background-color: transparent;
31573175
}
31583176

3177+
.osd .scale-popup.popover.background {
3178+
color: @osd_fg;
3179+
border-style: solid;
3180+
border-width: 1px;
3181+
border-color: shade (@theme_selected_bg_color, 0.5);
3182+
border-radius: 4px;
3183+
background-image: linear-gradient(to bottom,
3184+
@osd_toolbar_bg_a,
3185+
@osd_toolbar_bg_b 63%,
3186+
@osd_toolbar_bg_c);
3187+
background-color: transparent;
3188+
}
3189+
3190+
.osd .scale-popup.popover.background .button.flat.image-button {
3191+
background-image: linear-gradient(to bottom,
3192+
@osd_button_bg_a,
3193+
@osd_button_bg_b 68%,
3194+
@osd_button_bg_c);
3195+
border-radius: 5px;
3196+
border-width: 1px;
3197+
padding: 2px;
3198+
}
3199+
3200+
.osd .scale-popup.popover.background .button.flat.image-button:insensitive {
3201+
background-color: alpha (@osd_button_bg_insensitive, 0.5);
3202+
background-image: none;
3203+
}
3204+
31593205
.osd GtkProgressBar,
31603206
GtkProgressBar.osd {
31613207
padding: 0;

0 commit comments

Comments
 (0)