diff --git a/demo/adw-demo-preferences-dialog.ui b/demo/adw-demo-preferences-dialog.ui index 27cba46d28034667afcc151e98731d265469016e..3dfb6bec1d2ff07c8b75d53d0775daa0aaf0d401 100644 --- a/demo/adw-demo-preferences-dialog.ui +++ b/demo/adw-demo-preferences-dialog.ui @@ -77,7 +77,7 @@ 12 0 diff --git a/demo/pages/styles/adw-style-demo-dialog.ui b/demo/pages/styles/adw-style-demo-dialog.ui index 69596030651c361ba8e80133af3c4197daa0b46b..e635c980f97c24dbc227505cd674168bb3780bed 100644 --- a/demo/pages/styles/adw-style-demo-dialog.ui +++ b/demo/pages/styles/adw-style-demo-dialog.ui @@ -594,6 +594,19 @@ The "opaque" style class allows to create buttons with custom colors that look s + + + This is a dimmed paragraph, mostly used for secondary labels or descriptions. + 0 + True + word-char + 25 + dimmed + + + @@ -1043,7 +1056,7 @@ audio-volume-medium go-next-symbolic @@ -1058,7 +1071,7 @@ audio-volume-medium go-next-symbolic diff --git a/doc/css-variables.md b/doc/css-variables.md index f90e94e2cedc24caa0bf3aa9b26d70b730245075..216cb31d917b1dc28c55353b89e6a1dbeb9e4134 100644 --- a/doc/css-variables.md +++ b/doc/css-variables.md @@ -962,7 +962,7 @@ These variables represent the commonly used opacity values. `--border-opacity` is used for borders. (see [`--border-color`](#border-color)) -`--dim-opacity` is used for the [`.dim-label`](style-classes.html#dim-labels) +`--dim-opacity` is used for the [`.dim`](style-classes.html#dimmed) style class and other similar contexts, like window and row subtitles. `--disabled-opacity` is used for disabled widgets. diff --git a/doc/images/dim-label-dark.png b/doc/images/dimmed-dark.png similarity index 100% rename from doc/images/dim-label-dark.png rename to doc/images/dimmed-dark.png diff --git a/doc/images/dim-label.png b/doc/images/dimmed.png similarity index 100% rename from doc/images/dim-label.png rename to doc/images/dimmed.png diff --git a/doc/libadwaita.toml.in b/doc/libadwaita.toml.in index 6201f0c9f34e6ccd90403234b2b6d8532dbc5639..2fcd98a06eb797f5f7004ef5bafd42ce2257eef0 100644 --- a/doc/libadwaita.toml.in +++ b/doc/libadwaita.toml.in @@ -180,8 +180,8 @@ content_images = [ "images/dialog-bottom-dark.png", "images/dialog-floating.png", "images/dialog-floating-dark.png", - "images/dim-label.png", - "images/dim-label-dark.png", + "images/dimmed.png", + "images/dimmed-dark.png", "images/entry-row.png", "images/entry-row-dark.png", "images/expander-row.png", diff --git a/doc/style-classes.md b/doc/style-classes.md index f51caacefbbbd11e76e319d6247a00f0d73d6f4f..fe3e7a84dd9ba750961108ac2ab9db1732623cfd 100644 --- a/doc/style-classes.md +++ b/doc/style-classes.md @@ -245,15 +245,14 @@ The `.spacer` style class can be applied to a [class@Gtk.Separator] to make it appear invisible and act as whitespace. This can be useful with [toolbars and similar widgets](#toolbars) to separate groups of widgets from each other. -# Dim Labels +# Dimmed - - dim-label + + dimmed -The `.dim-label` style class makes the widget it's applied to partially -transparent. +The `.dimmed` style class make the widget it's applied to partially transparent. The opacity changes between regular and high contrast styles and is represented by the [`--dim-opacity`](css-variables.html#opacity) variable. Use that variable @@ -752,3 +751,22 @@ color, for example: ``` Deprecated since: 1.6 + +## `.dim-label` + + + + dim-label + + +The `.dim-label` style class makes the widget it's applied to partially +transparent. + +The opacity changes between regular and high contrast styles and is represented +by the [`--dim-opacity`](css-variables.html#opacity) variable. Use that variable +if the style class cannot be used directly. + +The [`.dimmed`](#dimmed) style class is completely equivalent to it and should +be used instead. + +Deprecated since: 1.7 diff --git a/doc/styles-and-appearance.md b/doc/styles-and-appearance.md index 4d53c56411c7888f842562184c251bf567043163..0cfec798a28e7f8de96de57134f10a9fbdd484e6 100644 --- a/doc/styles-and-appearance.md +++ b/doc/styles-and-appearance.md @@ -144,7 +144,7 @@ All standard GTK and Libadwaita widgets automatically support the high contrast appearance. Applications that use custom drawing or styles may need to support it manually. -* Use style classes such as [`.dim-label`](style-classes.html#dim-labels) instead +* Use style classes such as [`.dimmed`](style-classes.html#dimmed) instead of changing widget opacity manually. * Use the [helper variables](css-variables.html#helpers) when possible, instead diff --git a/doc/tools/data/dim-label.ui b/doc/tools/data/dimmed.ui similarity index 95% rename from doc/tools/data/dim-label.ui rename to doc/tools/data/dimmed.ui index 20235d00175b1e6b10e807212acf02dc14553663..dccf47c8ab53c109e732e0728c406162d5ee56e9 100644 --- a/doc/tools/data/dim-label.ui +++ b/doc/tools/data/dimmed.ui @@ -16,7 +16,7 @@ 12 12 diff --git a/src/adw-entry-row.ui b/src/adw-entry-row.ui index 9ce4f4c15b9a274e616e2ea33876edfd9683df6f..a03c033488c2a392bc7485e223af45d7161119ea 100644 --- a/src/adw-entry-row.ui +++ b/src/adw-entry-row.ui @@ -42,7 +42,7 @@ False diff --git a/src/adw-preferences-group.ui b/src/adw-preferences-group.ui index 63979f4db4d4fce5686615add8c877bacdab7cf0..7cdab57e644e8d4b6379c564f5d3bce6fb1d3182 100644 --- a/src/adw-preferences-group.ui +++ b/src/adw-preferences-group.ui @@ -33,7 +33,7 @@ word-char 0 diff --git a/src/adw-preferences-page.ui b/src/adw-preferences-page.ui index 51959d6d2804690196aeebf7664dad67a9e9a12b..77b3b777043af3cb686c5450511adfe8d03535e7 100644 --- a/src/adw-preferences-page.ui +++ b/src/adw-preferences-page.ui @@ -22,7 +22,7 @@ word-char 0 diff --git a/src/stylesheet/widgets/_deprecated.scss b/src/stylesheet/widgets/_deprecated.scss index b79e1d660977b910f9b7abf59985d42e6d7da6fc..b75e3a6f9a430dd6724866f0c3c6e74bbdacedd8 100644 --- a/src/stylesheet/widgets/_deprecated.scss +++ b/src/stylesheet/widgets/_deprecated.scss @@ -375,3 +375,9 @@ headerbar.flat { border { border: none; } } + +// Deprecated: Use .dimmed + +.dim-label { + @extend .dimmed; +} diff --git a/src/stylesheet/widgets/_entries.scss b/src/stylesheet/widgets/_entries.scss index 458d62e34fc082d82ee5ee768c5ae1f193368a4c..7fbd36c99dd68449b0e8a2f3814493e27fd20365 100644 --- a/src/stylesheet/widgets/_entries.scss +++ b/src/stylesheet/widgets/_entries.scss @@ -18,7 +18,7 @@ entry { > text { > placeholder { - @extend .dim-label; + @extend .dimmed; } > block-cursor { diff --git a/src/stylesheet/widgets/_header-bar.scss b/src/stylesheet/widgets/_header-bar.scss index f95c9f8667c954ed737c8c9a64cb296e0030115c..a44af21ebde92538bc1f63c7dc1d00207c55f1ef 100644 --- a/src/stylesheet/widgets/_header-bar.scss +++ b/src/stylesheet/widgets/_header-bar.scss @@ -204,7 +204,7 @@ windowtitle { font-size: smaller; padding-left: 12px; padding-right: 12px; - @extend .dim-label; + @extend .dimmed; } } diff --git a/src/stylesheet/widgets/_labels.scss b/src/stylesheet/widgets/_labels.scss index 785c770bb7ccd9295753f7ed559c5c1905f66cab..3e55f07affb47fb28534f68a91767eb5a604f25d 100644 --- a/src/stylesheet/widgets/_labels.scss +++ b/src/stylesheet/widgets/_labels.scss @@ -2,7 +2,7 @@ label { caret-color: currentColor; &.separator { - @extend .dim-label; + @extend .dimmed; } &:disabled { @@ -10,7 +10,7 @@ label { } } -.dim-label { +.dimmed { opacity: var(--dim-opacity); } diff --git a/src/stylesheet/widgets/_lists.scss b/src/stylesheet/widgets/_lists.scss index d5503d1442118617fddbfb06221e441768b316c8..452bc520a0c9bb3fd730f866651252f0e58f41d2 100644 --- a/src/stylesheet/widgets/_lists.scss +++ b/src/stylesheet/widgets/_lists.scss @@ -114,7 +114,7 @@ row { row { label.subtitle { font-size: smaller; - @extend .dim-label; + @extend .dimmed; } > box.header { @@ -161,7 +161,7 @@ row { &.property > box.header > box.title > { .title { font-size: smaller; - @extend .dim-label; + @extend .dimmed; } .subtitle { @@ -189,7 +189,7 @@ row.entry { opacity: var(--disabled-opacity); } - .dim-label, .subtitle { + .dimmed, .dim-label, .subtitle { opacity: 1; } } @@ -290,7 +290,7 @@ row.spin { &.#{$e_type} { color: var(--accent-color); - .dim-label, .subtitle { + .dimmed, .dim-label, .subtitle { opacity: 1; } } @@ -388,7 +388,7 @@ row.expander { // AdwExpanderRow arrow rotation image.expander-row-arrow { - @extend .dim-label; + @extend .dimmed; transition: -gtk-icon-transform 200ms $ease-out-quad; @include margin-start(3px); diff --git a/src/stylesheet/widgets/_progress-bar.scss b/src/stylesheet/widgets/_progress-bar.scss index a9a0f9f27c70a292a465fd0a5f10c501e8380b6a..4de78f97781cb2a1b0bd63c7426e22cd12a1a392 100644 --- a/src/stylesheet/widgets/_progress-bar.scss +++ b/src/stylesheet/widgets/_progress-bar.scss @@ -15,7 +15,7 @@ progressbar { } > text { - @extend .dim-label; + @extend .dimmed; @extend .numeric; font-size: smaller; } diff --git a/src/stylesheet/widgets/_scale.scss b/src/stylesheet/widgets/_scale.scss index 895cb235f85d1ce36b293607ae1bf7e198425b43..0abd94b10907928ae3c23119cfcdaba5cecc6c36 100644 --- a/src/stylesheet/widgets/_scale.scss +++ b/src/stylesheet/widgets/_scale.scss @@ -78,7 +78,7 @@ scale { } > value { - @extend .dim-label; + @extend .dimmed; @extend .numeric; }