kirbylife
/
numix-gtk-theme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mix function parameters (all of them) 

(cherry picked from commit 69195f7)
pull/313/head
Dustin Falgout 2016-04-10 03:49:30 -05:00
parent 99ed561a80
commit 6f961342d9
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk-3.20/scss/widgets/_base.scss
View File

@ -133,5 +133,5 @@ assistant {
.sidebar label { padding: 6px 12px; } .sidebar label { padding: 6px 12px; }
.sidebar label.highlight { background-color: mix($bg_color, $fg_color, 80%); } .sidebar label.highlight { background-color: mix($bg_color, $fg_color, .8); }
} }

4
gtk-3.20/scss/widgets/_misc.scss
View File

@ -241,12 +241,12 @@
@if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); } @if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
&:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); } &:disabled { color: mix($selected_fg_color, $selected_bg_color, .5); }
&:backdrop { &:backdrop {
color: $backdrop_selected_fg_color; color: $backdrop_selected_fg_color;
&:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); } &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, .3); }
} }
} }
} }

16
gtk-3.20/scss/widgets/_progress.scss
View File

@ -189,7 +189,7 @@
highlight { highlight {
background-color: $selected_fg_color; background-color: $selected_fg_color;
&:disabled { background-color: mix($selected_fg_color, $selected_bg_color, 55%); } &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, .55); }
} }
&:disabled { background-color: transparentize(black, 0.9); } &:disabled { background-color: transparentize(black, 0.9); }
@ -232,7 +232,7 @@
} }
&:disabled { &:disabled {
background-color: mix($fg_color, $bg_color, 55%); background-color: mix($fg_color, $bg_color, .55);
border-color: transparentize($_slider_border, 0.2); border-color: transparentize($_slider_border, 0.2);
} }
@ -244,16 +244,16 @@
border-color: $selected_fg_color; border-color: $selected_fg_color;
&:hover { &:hover {
background-color: mix($selected_fg_color, $selected_bg_color, 85%); background-color: mix($selected_fg_color, $selected_bg_color, .85);
border-color: mix($selected_fg_color, $selected_bg_color, 85%); border-color: mix($selected_fg_color, $selected_bg_color, .85);
} }
&:active { &:active {
background-color: mix($selected_fg_color, $selected_bg_color, 50%); background-color: mix($selected_fg_color, $selected_bg_color, .5);
border-color: mix($selected_fg_color, $selected_bg_color, 50%); border-color: mix($selected_fg_color, $selected_bg_color, .5);
} }
&:disabled{ &:disabled{
background-color: mix($selected_fg_color, $selected_bg_color, 55%); background-color: mix($selected_fg_color, $selected_bg_color, .55);
border-color: mix($selected_fg_color, $selected_bg_color, 55%); border-color: mix($selected_fg_color, $selected_bg_color, .55);
} }
} }

24
gtk-3.20/scss/widgets/_view.scss
View File

@ -72,7 +72,7 @@
&:backdrop { &:backdrop {
border-color: $backdrop_bg_color; border-color: $backdrop_bg_color;
border-style: none solid solid none; border-style: none solid solid none;
color: mix($backdrop_fg_color, $backdrop_bg_color, 50%); color: mix($backdrop_fg_color, $backdrop_bg_color, .5);
background-image: none; background-image: none;
background-color: $backdrop_base_color; background-color: $backdrop_base_color;
@ -88,7 +88,7 @@
-GtkTreeView-tree-line-width: 1; -GtkTreeView-tree-line-width: 1;
-GtkTreeView-tree-line-pattern: ''; -GtkTreeView-tree-line-pattern: '';
border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color, border-left-color: mix($fg_color, $base_color, .5); // this is actually the tree lines color,
border-top-color: $bg_color; // while this is the grid lines color, better then nothing border-top-color: $bg_color; // while this is the grid lines color, better then nothing
rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
@ -100,7 +100,7 @@
} }
&:backdrop, & { &:backdrop, & {
border-left-color: mix($selected_fg_color, $selected_bg_color, 50%); border-left-color: mix($selected_fg_color, $selected_bg_color, .5);
border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly border-top-color: transparentize($fg_color, 0.9); // doesn't work unfortunatelly
} }
} }
@ -109,8 +109,8 @@
color: $insensitive_fg_color; color: $insensitive_fg_color;
&:selected { &:selected {
color: mix($selected_fg_color, $selected_bg_color, 40%); color: mix($selected_fg_color, $selected_bg_color, .4);
&:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); } &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, .3); }
} }
&:backdrop { color: $backdrop_insensitive_color; } &:backdrop { color: $backdrop_insensitive_color; }
@ -124,7 +124,7 @@
} }
&:backdrop { &:backdrop {
border-left-color: mix($backdrop_fg_color, $backdrop_bg_color, 50%); border-left-color: mix($backdrop_fg_color, $backdrop_bg_color, .5);
border-top: $backdrop_bg_color; border-top: $backdrop_bg_color;
} }
&:drop(active) { &:drop(active) {
@ -139,7 +139,7 @@
&.expander { &.expander {
-gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
color: mix($fg_color, $base_color, 70%); color: mix($fg_color, $base_color, .7);
&:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); } &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
@ -147,16 +147,16 @@
&:hover { color: $fg_color; } &:hover { color: $fg_color; }
&:selected { &:selected {
color: mix($selected_fg_color, $selected_bg_color, 70%); color: mix($selected_fg_color, $selected_bg_color, .7);
&:hover { color: $selected_fg_color; } &:hover { color: $selected_fg_color; }
&:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 70%); } &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, .7); }
} }
&:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); } &:checked { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
&:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, 70%); } &:backdrop { color: mix($backdrop_fg_color, $backdrop_base_color, .7); }
} }
&.progressbar { // progress bar in treeviews &.progressbar { // progress bar in treeviews
@ -224,7 +224,7 @@
header { header {
button { button {
$_column_header_color: mix($fg_color, $base_color, 50%); $_column_header_color: mix($fg_color, $base_color, .5);
@extend %column_header_button; @extend %column_header_button;
@ -237,7 +237,7 @@
&:hover { &:hover {
@extend %column_header_button; @extend %column_header_button;
color: mix($_column_header_color, $fg_color, 50%); color: mix($_column_header_color, $fg_color, .5);
box-shadow: none; box-shadow: none;
transition: none; //I shouldn't need this transition: none; //I shouldn't need this
} }