Adwaita: updates style for text selection

- use consistent widget style. unfortunately using assets
- light/dark variant
- new assets for text selestions, using existing slider asset for
  insertion point

https://bugzilla.gnome.org/show_bug.cgi?id=750396
This commit is contained in:
Jakub Steiner 2015-06-04 19:36:25 +02:00 committed by Matthias Clasen
parent dee0da30b6
commit 9c53f76cbd
29 changed files with 895 additions and 237 deletions

View File

@ -3,6 +3,7 @@
}
$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
$asset_suffix: if($variant=='dark', '-dark', '');
* {
padding: 0;
@ -36,7 +37,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
-GtkWidget-focus-line-width: 1; //
-GtkWidget-text-handle-width: 20;
-GtkWidget-text-handle-height: 20;
-GtkWidget-text-handle-height: 24;
-GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0;
@ -1582,8 +1583,23 @@ column-header.button.dnd { // for treeview-like derive widgets
background-image: none;
box-shadow: none;
border-style: none;
&.top { -gtk-icon-source: -gtk-icontheme('selection-start-symbolic'); }
&.bottom { -gtk-icon-source: -gtk-icontheme('selection-end-symbolic'); }
@each $s,$as in ('',''),
(':hover','-hover'),
(':active','-active') { //no need for insensitive and backdrop
&.top#{$s} {
$_url: 'assets/text-select-top#{$as}#{$asset_suffix}';
-gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
url('#{$_url}@2.png')); }
&.bottom#{$s} {
$_url: 'assets/text-select-bottom#{$as}#{$asset_suffix}';
-gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
url('#{$_url}@2.png')); }
&.insertion-cursor#{$s} {
$_url: 'assets/slider-horz-scale-has-marks-above#{$as}#{$asset_suffix}';
-gtk-icon-source: -gtk-scaled(url('#{$_url}.png'),
url('#{$_url}@2.png'));
}
}
}
/*****************
@ -2097,7 +2113,6 @@ GtkSwitch {
// draw regular check and radio items using our PNG assets
// all assets are rendered from assets.svg. never add pngs directly
$asset_suffix: if($variant=='dark', '-dark', '');
@each $w,$a in ('check', 'checkbox'),
('radio','radio') {
@ -2328,7 +2343,6 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
}
}
$asset_suffix: if($variant=='dark', '-dark', '');
@each $d,$dn in ('', 'horz'),
('.vertical', 'vert') {
@each $w,$we in ('scale-has-marks-below','scale_marks_below'),

File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 321 KiB

After

Width:  |  Height:  |  Size: 376 KiB

View File

@ -70,6 +70,18 @@ selected-radio-mixed-active
selected-radio-mixed-insensitive
selected-radio-mixed-backdrop
selected-radio-mixed-backdrop-insensitive
text-select-bottom
text-select-bottom-hover
text-select-bottom-active
text-select-top
text-select-top-hover
text-select-top-active
text-select-bottom-dark
text-select-bottom-hover-dark
text-select-bottom-active-dark
text-select-top-dark
text-select-top-hover-dark
text-select-top-active-dark
checkbox-checked-dark
checkbox-checked-hover-dark
checkbox-checked-active-dark

Binary file not shown.

After

Width:  |  Height:  |  Size: 928 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 992 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 913 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 916 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 960 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 914 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 862 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 892 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 910 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 887 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -17,7 +17,7 @@
-GtkWidget-focus-padding: 2;
-GtkWidget-focus-line-width: 1;
-GtkWidget-text-handle-width: 20;
-GtkWidget-text-handle-height: 20;
-GtkWidget-text-handle-height: 24;
-GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0;
-GtkStatusbar-shadow-type: none;
@ -2061,10 +2061,31 @@ column-header .titlebar .button.titlebutton,
border-style: none; }
.entry.cursor-handle.top,
.cursor-handle.top {
-gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
-gtk-icon-source: -gtk-scaled(url("assets/text-select-top-dark.png"), url("assets/text-select-top-dark@2.png")); }
.entry.cursor-handle.bottom,
.cursor-handle.bottom {
-gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }
-gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom-dark.png"), url("assets/text-select-bottom-dark@2.png")); }
.entry.cursor-handle.insertion-cursor,
.cursor-handle.insertion-cursor {
-gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png")); }
.entry.cursor-handle.top:hover,
.cursor-handle.top:hover {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-top-hover-dark.png"), url("assets/text-select-top-hover-dark@2.png")); }
.entry.cursor-handle.bottom:hover,
.cursor-handle.bottom:hover {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom-hover-dark.png"), url("assets/text-select-bottom-hover-dark@2.png")); }
.entry.cursor-handle.insertion-cursor:hover,
.cursor-handle.insertion-cursor:hover {
-gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png")); }
.entry.cursor-handle.top:active,
.cursor-handle.top:active {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-top-active-dark.png"), url("assets/text-select-top-active-dark@2.png")); }
.entry.cursor-handle.bottom:active,
.cursor-handle.bottom:active {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom-active-dark.png"), url("assets/text-select-bottom-active-dark@2.png")); }
.entry.cursor-handle.insertion-cursor:active,
.cursor-handle.insertion-cursor:active {
-gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png")); }
/*****************
* Notebooks and *

View File

@ -17,7 +17,7 @@
-GtkWidget-focus-padding: 2;
-GtkWidget-focus-line-width: 1;
-GtkWidget-text-handle-width: 20;
-GtkWidget-text-handle-height: 20;
-GtkWidget-text-handle-height: 24;
-GtkDialog-button-spacing: 4;
-GtkDialog-action-area-border: 0;
-GtkStatusbar-shadow-type: none;
@ -2067,10 +2067,31 @@ column-header .titlebar .button.titlebutton,
border-style: none; }
.entry.cursor-handle.top,
.cursor-handle.top {
-gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); }
-gtk-icon-source: -gtk-scaled(url("assets/text-select-top.png"), url("assets/text-select-top@2.png")); }
.entry.cursor-handle.bottom,
.cursor-handle.bottom {
-gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); }
-gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom.png"), url("assets/text-select-bottom@2.png")); }
.entry.cursor-handle.insertion-cursor,
.cursor-handle.insertion-cursor {
-gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png")); }
.entry.cursor-handle.top:hover,
.cursor-handle.top:hover {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-top-hover.png"), url("assets/text-select-top-hover@2.png")); }
.entry.cursor-handle.bottom:hover,
.cursor-handle.bottom:hover {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom-hover.png"), url("assets/text-select-bottom-hover@2.png")); }
.entry.cursor-handle.insertion-cursor:hover,
.cursor-handle.insertion-cursor:hover {
-gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png")); }
.entry.cursor-handle.top:active,
.cursor-handle.top:active {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-top-active.png"), url("assets/text-select-top-active@2.png")); }
.entry.cursor-handle.bottom:active,
.cursor-handle.bottom:active {
-gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom-active.png"), url("assets/text-select-bottom-active@2.png")); }
.entry.cursor-handle.insertion-cursor:active,
.cursor-handle.insertion-cursor:active {
-gtk-icon-source: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png")); }
/*****************
* Notebooks and *