diff options
| author | Lapo Calamandrei <calamandrei@gmail.com> | 2015-06-25 19:55:51 +0200 |
|---|---|---|
| committer | Lapo Calamandrei <calamandrei@gmail.com> | 2015-06-25 19:57:07 +0200 |
| commit | 56a3fd888a83984c7ced289f2be092e6ba4fa1f9 (patch) | |
| tree | 4e90669c9ac899ed8ebacfd5d8fb36c746018d2c | |
| parent | 350d55589304fa55d83770834b392e2ee04cd906 (diff) | |
| download | gtk+-56a3fd888a83984c7ced289f2be092e6ba4fa1f9.tar.gz | |
Adwaita: rubberbands!
Darken the rubberband a bit to make it visible on the selected
color background, fix treeview rubberband border issue.
| -rw-r--r-- | gtk/theme/Adwaita/_common.scss | 6 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained-dark.css | 6 | ||||
| -rw-r--r-- | gtk/theme/Adwaita/gtk-contained.css | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index a31f712047..fbf73aa6cd 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -120,8 +120,8 @@ $asset_suffix: if($variant=='dark', '-dark', ''); } .rubberband { - border: 1px solid $selected_bg_color; - background-color: transparentize($selected_bg_color,0.8); + border: 1px solid darken($selected_bg_color, 10%); + background-color: transparentize(darken($selected_bg_color, 10%), 0.8); } .label { @@ -1304,6 +1304,8 @@ GtkTreeView.view { border-left-color: mix($fg_color, $base_color, 50%); // this is actually the tree lines color, 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 + &:selected { border-radius: 0; } // rest border radius in lists &:selected, &:backdrop:selected { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 4ad0c9160f..22d8ce7e56 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -73,9 +73,9 @@ .view:selected, GtkCalendar:selected { border-radius: 3px; } -.rubberband { - border: 1px solid #215d9c; - background-color: rgba(33, 93, 156, 0.2); } +.rubberband, GtkTreeView.view.rubberband { + border: 1px solid #184472; + background-color: rgba(24, 68, 114, 0.2); } .label.separator { color: #eeeeec; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index e3b8e2ed06..34fa96ff3b 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -73,9 +73,9 @@ .view:selected, GtkCalendar:selected { border-radius: 3px; } -.rubberband { - border: 1px solid #4a90d9; - background-color: rgba(74, 144, 217, 0.2); } +.rubberband, GtkTreeView.view.rubberband { + border: 1px solid #2a76c6; + background-color: rgba(42, 118, 198, 0.2); } .label.separator { color: #2e3436; } |