Commit dca25cb4 authored by Carson Black's avatar Carson Black 🍿

[GTK3] Rename colour definitions

Summary:
Colour definitions are now suffixed with _breeze, and public API colours
are now reexported variables.

CCBUG: 417461

Test Plan:
In tandem with D27426, no visual effect should
be noticeable on Breeze GTK.

Other themes should display an improvement:

Before: {F8105241}
After: {F8105244}

Reviewers: #breeze, ngraham

Reviewed By: #breeze, ngraham

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D27425
parent 7f9e4fb1
This diff is collapsed.
......@@ -4,7 +4,7 @@
// escape string entirely
@function gtk ($str) {
@return unquote($str);
@return unquote("#{$str}_breeze");
}
// alpha function
......@@ -14,7 +14,7 @@
// shade function
@function gtkshade($c, $a) {
@return unquote("shade(#{$c},#{$a})");
@return unquote("shade(#{$c}_breeze,#{$a})");
}
// mix function
......
......@@ -143,10 +143,10 @@ textview border {
.rubberband,
rubberband {
border: 1px solid gtk("@theme_selected_bg_color");
background-color: gtkalpha("@theme_selected_bg_color", 0.8);
background-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.8);
&:backdrop {
border-color: gtk("@theme_unfocused_selected_bg_color");
background-color: gtkalpha("@theme_unfocused_selected_bg_color", 0.8);
background-color: gtkalpha(gtk("@theme_unfocused_selected_bg_color"), 0.8);
}
}
......@@ -213,7 +213,7 @@ assistant {
padding: 6px 12px;
}
.sidebar label.highlight {
background-color: gtkmix("@theme_base_color", "@theme_text_color", 0.8);
background-color: gtkmix(gtk("@theme_base_color"), gtk("@theme_text_color"), 0.8);
}
}
......@@ -221,14 +221,14 @@ assistant {
.osd {
color: gtk("@theme_fg_color");
border: 1px solid gtk("@borders");
background-color: gtkalpha("@theme_bg_color",0.8);
background-color: gtkalpha(gtk("@theme_bg_color"),0.8);
background-clip: padding-box;
box-shadow: none;
text-shadow: none;
-gtk-icon-shadow: none;
&:backdrop {
color: gtk("@theme_unfocused_text_color");
background-color: gtkalpha("@theme_unfocused_bg_color", 0.8);
background-color: gtkalpha(gtk("@theme_unfocused_bg_color"), 0.8);
-gtk-icon-shadow: none;
}
}
......
......@@ -97,11 +97,11 @@ entry {
@if $e_color == gtk("@error_color") {
color: gtk("@error_color_backdrop");
border-color: gtk("@error_color_backdrop");
background-color: gtkalpha("@error_color_backdrop", 0.5);
background-color: gtkalpha(gtk("@error_color_backdrop"), 0.5);
} @else if $e_color == gtk("@warning_color") {
color: gtk("@warning_color_backdrop");
border-color: gtk("@warning_color_backdrop");
background-color: gtkalpha("@warning_color_backdrop", 0.5);
background-color: gtkalpha(gtk("@warning_color_backdrop"), 0.5);
}
}
}
......
......@@ -127,7 +127,7 @@ headerbar {
background-color: gtk("@theme_button_decoration_focus");
}
button:not(.titlebutton) {
background-color: gtkalpha("@theme_button_decoration_focus", 0.5);
background-color: gtkalpha(gtk("@theme_button_decoration_focus"), 0.5);
&:active, &:focus {
background-color: gtk("@theme_button_decoration_focus");
}
......
......@@ -28,11 +28,11 @@ infobar {
button {
box-shadow: none;
background-image:none;
background-color: gtkalpha("@warning_color", 0.5);
border-color: gtkalpha("@warning_color", 0.5);
background-color: gtkalpha(gtk("@warning_color"), 0.5);
border-color: gtkalpha(gtk("@warning_color"), 0.5);
color: gtk("@theme_button_foreground_normal");
&:hover {
background-color: gtkalpha("@warning_color", 0.25);
background-color: gtkalpha(gtk("@warning_color"), 0.25);
border-color: gtk("@warning_color");
}
&:active, &:checked {
......@@ -41,13 +41,13 @@ infobar {
border-color: gtk("@warning_color");
}
&:disabled {
background-color: gtkalpha("@warning_color_insensitive", 0.5);
border-color: gtkalpha("@warning_color_insensitive", 0.5);
background-color: gtkalpha(gtk("@warning_color_insensitive"), 0.5);
border-color: gtkalpha(gtk("@warning_color_insensitive"), 0.5);
color: gtk("@theme_button_foreground_insensitive");
}
&:backdrop {
background-color: gtkalpha("@warning_color_backdrop", 0.5);
border-color: gtkalpha("@warning_color_backdrop", 0.5);
background-color: gtkalpha(gtk("@warning_color_backdrop"), 0.5);
border-color: gtkalpha(gtk("@warning_color_backdrop"), 0.5);
color: gtk("@theme_button_foreground_backdrop");
&:active, &:checked {
background-color: gtk("@warning_color_backdrop");
......@@ -55,8 +55,8 @@ infobar {
border-color: gtk("@warning_color_backdrop");
}
&:disabled {
background-color: gtkalpha("@warning_color_insensitive_backdrop", 0.5);
border-color: gtkalpha("@warning_color_insensitive_backdrop", 0.5);
background-color: gtkalpha(gtk("@warning_color_insensitive_backdrop"), 0.5);
border-color: gtkalpha(gtk("@warning_color_insensitive_backdrop"), 0.5);
color: gtk("@theme_button_foreground_backdrop_insensitive");
}
&:disabled:active,
......
......@@ -29,7 +29,7 @@
}
@at-root %link_selected,
&:selected, *:selected & {
color: gtkmix("@theme_selected_fg_color", "@theme_selected_bg_color", 0.8);
color: gtkmix(gtk("@theme_selected_fg_color"), gtk("@theme_selected_bg_color"), 0.8);
}
}
......
......@@ -53,13 +53,13 @@
> tabs {
> tab {
padding: 4px 6px;
border: 1px solid gtkalpha("@theme_fg_color", 0.2);
background-color: gtkalpha("@theme_fg_color", 0.2);
border: 1px solid gtkalpha(gtk("@theme_fg_color"), 0.2);
background-color: gtkalpha(gtk("@theme_fg_color"), 0.2);
border-radius: #{$_radius};
border-#{$_border}-color: transparent;
&:hover, &.prelight-page {
background-color: gtkalpha("@theme_selected_bg_color", 0.2);
border-color: gtkalpha("@theme_selected_bg_color", 0.2);
background-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.2);
border-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.2);
}
&:checked {
border-color: gtk("@borders");
......@@ -93,7 +93,7 @@
border-#{$_border}-color: gtk("@borders");
box-shadow: inset #{$_shadow1} gtk("@theme_bg_color");
&:hover, &.prelight-page {
box-shadow: inset 0px -3px 0px 0px gtkalpha("@theme_selected_bg_color",0.2), inset $_shadow1 gtk("@theme_bg_color");
box-shadow: inset 0px -3px 0px 0px gtkalpha(gtk("@theme_selected_bg_color"),0.2), inset $_shadow1 gtk("@theme_bg_color");
}
&:checked {
box-shadow: inset 0px -3px 0px 0px gtk("@theme_selected_bg_color"), inset $_shadow1 gtk("@theme_bg_color");
......
......@@ -25,7 +25,7 @@ progressbar {
background-color: gtkalpha(gtk("@theme_button_foreground_normal"),0.3);
}
&:backdrop trough { background-color: gtkalpha("@theme_button_foreground_backdrop",0.3); } // looks like states are not passed to the trough component here
&:backdrop trough { background-color: gtkalpha(gtk("@theme_button_foreground_backdrop"),0.3); } // looks like states are not passed to the trough component here
progress {
background-color: gtk("@theme_selected_bg_color");
......@@ -60,7 +60,7 @@ treeview.view {
background-color: $trough_color;
&:selected {
&:focus, & {
background-color: gtkalpha("@theme_selected_fg_color",0.3);
background-color: gtkalpha(gtk("@theme_selected_fg_color"),0.3);
}
}
}
......@@ -138,7 +138,7 @@ levelbar {
border-color: transparent;
box-shadow: none;
&:backdrop {
background-color: gtkalpha("@theme_button_foreground_insensitive",0.3);
background-color: gtkalpha(gtk("@theme_button_foreground_insensitive"),0.3);
}
}
}
......
......@@ -33,11 +33,11 @@ scale {
&:disabled {
border-style: solid; // needed for double marks scales or they'll get
border-radius: 50%; // overridden
background-color: gtkalpha("@theme_button_background_insensitive", 100.0);
background-color: gtkalpha(gtk("@theme_button_background_insensitive"), 100.0);
opacity: 1.0;
border-color: gtk("@insensitive_borders");
&:backdrop {
background-color: gtkalpha("@theme_button_background_backdrop_insensitive", 100.0);
background-color: gtkalpha(gtk("@theme_button_background_backdrop_insensitive"), 100.0);
border-color: gtk("@unfocused_insensitive_borders");
}
}
......
......@@ -110,7 +110,7 @@ scrollbar {
min-height: 30px;
border-radius: 8px;
background-clip: padding-box;
background-color: gtkalpha("@theme_fg_color", 0.5);
background-color: gtkalpha(gtk("@theme_fg_color"), 0.5);
&:hover {
min-width: 6px;
background-color: gtk("@theme_button_decoration_hover");
......@@ -123,7 +123,7 @@ scrollbar {
min-height: 3px;
border-radius: 8px;
background-clip: padding-box;
background-color: gtkalpha("@theme_fg_color", 0.5);
background-color: gtkalpha(gtk("@theme_fg_color"), 0.5);
&:hover {
min-height: 6px;
background-color: gtk("@theme_button_decoration_hover");
......
......@@ -13,7 +13,7 @@ switch {
border: 0px solid;
border-radius: 12px;
color: transparent;
background-color: gtkalpha("@theme_button_foreground_normal",0.3);
background-color: gtkalpha(gtk("@theme_button_foreground_normal"),0.3);
text-shadow: none;
&:checked {
......@@ -21,7 +21,7 @@ switch {
}
&:backdrop {
background-color: gtkalpha("@theme_button_foreground_backdrop", 0.3);
background-color: gtkalpha(gtk("@theme_button_foreground_backdrop"), 0.3);
text-shadow: none;
&:checked {
......
......@@ -6,7 +6,7 @@
border-left-color: gtk("@theme_selected_fg_color");
border-top-color: gtk("@theme_selected_fg_color");
} @else {
background-color: gtkalpha("@theme_selected_bg_color", 0.3);
background-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.3);
border-left-color: gtk("@theme_fg_color");
border-top-color: gtk("@theme_fg_color");
}
......@@ -123,14 +123,14 @@ treeview.view {
&:hover {
@extend %column_header_button;
color: gtk("@theme_button_foreground_normal");
background-color: gtkalpha("@theme_button_decoration_hover", 0.5);
background-color: gtkalpha(gtk("@theme_button_decoration_hover"), 0.5);
box-shadow: none;
transition: none; //I shouldn't need this
}
&:active {
@extend %column_header_button;
color: gtk("@theme_button_foreground_normal");
background-color: gtkalpha("@theme_button_decoration_hover", 0.5);
background-color: gtkalpha(gtk("@theme_button_decoration_hover"), 0.5);
transition: none; //I shouldn't need this
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment