diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 04ab02dcc5..d8045d3e36 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1587,13 +1587,13 @@ column-header.button.dnd { // for treeview-like derive widgets (':hover','-hover'), (':active','-active') { //no need for insensitive and backdrop &.top#{$s} { - $_url: 'assets/text-select-top#{$as}#{$asset_suffix}'; + $_url: 'assets/text-select-start#{$as}#{$asset_suffix}'; -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'), url('#{$_url}@2.png')); padding-left: 10px; } &.bottom#{$s} { - $_url: 'assets/text-select-bottom#{$as}#{$asset_suffix}'; + $_url: 'assets/text-select-end#{$as}#{$asset_suffix}'; -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'), url('#{$_url}@2.png')); padding-right: 10px; diff --git a/gtk/theme/Adwaita/assets.svg b/gtk/theme/Adwaita/assets.svg index be5b306dcc..63d920eb53 100644 --- a/gtk/theme/Adwaita/assets.svg +++ b/gtk/theme/Adwaita/assets.svg @@ -1032,16 +1032,6 @@ offset="1" style="stop-color:#d3d3d3;stop-opacity:1;" /> - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + id="text-select-end-active"> - - - - - - - - - - - - - - - - - - - - - - - - - + id="text-select-end-dark"> + id="text-select-end-hover-dark"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gtk/theme/Adwaita/assets.txt b/gtk/theme/Adwaita/assets.txt index 8db96b3293..fbff435095 100644 --- a/gtk/theme/Adwaita/assets.txt +++ b/gtk/theme/Adwaita/assets.txt @@ -70,18 +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 +text-select-end +text-select-end-hover +text-select-end-active +text-select-start +text-select-start-hover +text-select-start-active +text-select-end-dark +text-select-end-hover-dark +text-select-end-active-dark +text-select-start-dark +text-select-start-hover-dark +text-select-start-active-dark checkbox-checked-dark checkbox-checked-hover-dark checkbox-checked-active-dark diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-active-dark.png b/gtk/theme/Adwaita/assets/text-select-end-active-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-active-dark.png rename to gtk/theme/Adwaita/assets/text-select-end-active-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-active-dark@2.png b/gtk/theme/Adwaita/assets/text-select-end-active-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-active-dark@2.png rename to gtk/theme/Adwaita/assets/text-select-end-active-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-active.png b/gtk/theme/Adwaita/assets/text-select-end-active.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-active.png rename to gtk/theme/Adwaita/assets/text-select-end-active.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-active@2.png b/gtk/theme/Adwaita/assets/text-select-end-active@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-active@2.png rename to gtk/theme/Adwaita/assets/text-select-end-active@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-dark.png b/gtk/theme/Adwaita/assets/text-select-end-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-dark.png rename to gtk/theme/Adwaita/assets/text-select-end-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-dark@2.png b/gtk/theme/Adwaita/assets/text-select-end-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-dark@2.png rename to gtk/theme/Adwaita/assets/text-select-end-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-hover-dark.png b/gtk/theme/Adwaita/assets/text-select-end-hover-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-hover-dark.png rename to gtk/theme/Adwaita/assets/text-select-end-hover-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-hover-dark@2.png b/gtk/theme/Adwaita/assets/text-select-end-hover-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-hover-dark@2.png rename to gtk/theme/Adwaita/assets/text-select-end-hover-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-hover.png b/gtk/theme/Adwaita/assets/text-select-end-hover.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-hover.png rename to gtk/theme/Adwaita/assets/text-select-end-hover.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom-hover@2.png b/gtk/theme/Adwaita/assets/text-select-end-hover@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom-hover@2.png rename to gtk/theme/Adwaita/assets/text-select-end-hover@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom.png b/gtk/theme/Adwaita/assets/text-select-end.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom.png rename to gtk/theme/Adwaita/assets/text-select-end.png diff --git a/gtk/theme/Adwaita/assets/text-select-bottom@2.png b/gtk/theme/Adwaita/assets/text-select-end@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-bottom@2.png rename to gtk/theme/Adwaita/assets/text-select-end@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-active-dark.png b/gtk/theme/Adwaita/assets/text-select-start-active-dark.png new file mode 100644 index 0000000000..dee6098be7 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-active-dark.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-active-dark@2.png b/gtk/theme/Adwaita/assets/text-select-start-active-dark@2.png new file mode 100644 index 0000000000..7afc345a47 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-active-dark@2.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-active.png b/gtk/theme/Adwaita/assets/text-select-start-active.png new file mode 100644 index 0000000000..eea10d84a9 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-active.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-active@2.png b/gtk/theme/Adwaita/assets/text-select-start-active@2.png new file mode 100644 index 0000000000..e9942da108 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-active@2.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-dark.png b/gtk/theme/Adwaita/assets/text-select-start-dark.png new file mode 100644 index 0000000000..874c51b2d1 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-dark.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-dark@2.png b/gtk/theme/Adwaita/assets/text-select-start-dark@2.png new file mode 100644 index 0000000000..b6e29284ac Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-dark@2.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover-dark.png b/gtk/theme/Adwaita/assets/text-select-start-hover-dark.png new file mode 100644 index 0000000000..f6fb58862d Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-hover-dark.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover-dark@2.png b/gtk/theme/Adwaita/assets/text-select-start-hover-dark@2.png new file mode 100644 index 0000000000..2c5f6c4ba6 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-hover-dark@2.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover.png b/gtk/theme/Adwaita/assets/text-select-start-hover.png new file mode 100644 index 0000000000..bf23bfb022 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-hover.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover@2.png b/gtk/theme/Adwaita/assets/text-select-start-hover@2.png new file mode 100644 index 0000000000..7853fbc79e Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start-hover@2.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start.png b/gtk/theme/Adwaita/assets/text-select-start.png new file mode 100644 index 0000000000..1d9628c082 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-start@2.png b/gtk/theme/Adwaita/assets/text-select-start@2.png new file mode 100644 index 0000000000..2394c88366 Binary files /dev/null and b/gtk/theme/Adwaita/assets/text-select-start@2.png differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-active-dark.png b/gtk/theme/Adwaita/assets/text-select-top-active-dark.png deleted file mode 100644 index c052f19fd5..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-active-dark.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-active-dark@2.png b/gtk/theme/Adwaita/assets/text-select-top-active-dark@2.png deleted file mode 100644 index 74a03aa8d8..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-active-dark@2.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-active.png b/gtk/theme/Adwaita/assets/text-select-top-active.png deleted file mode 100644 index 08bcd3b4d7..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-active.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-active@2.png b/gtk/theme/Adwaita/assets/text-select-top-active@2.png deleted file mode 100644 index 9d32270287..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-active@2.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-dark.png b/gtk/theme/Adwaita/assets/text-select-top-dark.png deleted file mode 100644 index bad5ed887e..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-dark.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-dark@2.png b/gtk/theme/Adwaita/assets/text-select-top-dark@2.png deleted file mode 100644 index 5ac0359413..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-dark@2.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-hover-dark.png b/gtk/theme/Adwaita/assets/text-select-top-hover-dark.png deleted file mode 100644 index 98ba82fd91..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-hover-dark.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-hover-dark@2.png b/gtk/theme/Adwaita/assets/text-select-top-hover-dark@2.png deleted file mode 100644 index 16ee5f65c9..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-hover-dark@2.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-hover.png b/gtk/theme/Adwaita/assets/text-select-top-hover.png deleted file mode 100644 index 4b5c578b68..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-hover.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top-hover@2.png b/gtk/theme/Adwaita/assets/text-select-top-hover@2.png deleted file mode 100644 index 987b6945e0..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top-hover@2.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top.png b/gtk/theme/Adwaita/assets/text-select-top.png deleted file mode 100644 index 8340754629..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top.png and /dev/null differ diff --git a/gtk/theme/Adwaita/assets/text-select-top@2.png b/gtk/theme/Adwaita/assets/text-select-top@2.png deleted file mode 100644 index 001fca850b..0000000000 Binary files a/gtk/theme/Adwaita/assets/text-select-top@2.png and /dev/null differ diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 0c9bad4755..e136904f76 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2061,33 +2061,33 @@ column-header .titlebar .button.titlebutton, border-style: none; } .entry.cursor-handle.top, .cursor-handle.top { - -gtk-icon-source: -gtk-scaled(url("assets/text-select-top-dark.png"), url("assets/text-select-top-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-dark.png"), url("assets/text-select-start-dark@2.png")); padding-left: 10px; } .entry.cursor-handle.bottom, .cursor-handle.bottom { - -gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom-dark.png"), url("assets/text-select-bottom-dark@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-dark.png"), url("assets/text-select-end-dark@2.png")); padding-right: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-hover-dark.png"), url("assets/text-select-start-hover-dark@2.png")); padding-left: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-hover-dark.png"), url("assets/text-select-end-hover-dark@2.png")); padding-right: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-active-dark.png"), url("assets/text-select-start-active-dark@2.png")); padding-left: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-active-dark.png"), url("assets/text-select-end-active-dark@2.png")); padding-right: 10px; } .entry.cursor-handle.insertion-cursor:active, .cursor-handle.insertion-cursor:active { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 8c16c74c27..96db84763e 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2067,33 +2067,33 @@ column-header .titlebar .button.titlebutton, border-style: none; } .entry.cursor-handle.top, .cursor-handle.top { - -gtk-icon-source: -gtk-scaled(url("assets/text-select-top.png"), url("assets/text-select-top@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-start.png"), url("assets/text-select-start@2.png")); padding-left: 10px; } .entry.cursor-handle.bottom, .cursor-handle.bottom { - -gtk-icon-source: -gtk-scaled(url("assets/text-select-bottom.png"), url("assets/text-select-bottom@2.png")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-end.png"), url("assets/text-select-end@2.png")); padding-right: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-hover.png"), url("assets/text-select-start-hover@2.png")); padding-left: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-hover.png"), url("assets/text-select-end-hover@2.png")); padding-right: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-start-active.png"), url("assets/text-select-start-active@2.png")); padding-left: 10px; } .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")); + -gtk-icon-source: -gtk-scaled(url("assets/text-select-end-active.png"), url("assets/text-select-end-active@2.png")); padding-right: 10px; } .entry.cursor-handle.insertion-cursor:active, .cursor-handle.insertion-cursor:active {