Skip to content

Commit

Permalink
cinnamon: Add a border around focused dialog buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
@clefebvre
clefebvre committed Dec 5, 2024
1 parent 0c8c41a commit 745fef5
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 4 deletions.
33 changes: 31 additions & 2 deletions src/Mint-Y/cinnamon/cinnamon-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1564,77 +1564,106 @@ StScrollBar {
font-size: 1.182em; }

.audio-device-selection-dialog .audio-selection-box .audio-selection-device {
border: 1px solid #222222;
color: #e1e1e1;
background-color: #222222; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:focus {
border: 1px solid #222222;
color: #e1e1e1;
background-color: #222222; }
background-color: #222222;
border: 1px solid #e1e1e1; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:hover {
border: 1px solid #222222;
color: #e1e1e1;
background-color: #3c3c3c; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:insensitive {
border: 1px solid #222222;
color: rgba(225, 225, 225, 0.5);
background-color: #222222; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:selected, .audio-device-selection-dialog .audio-selection-box .audio-selection-device:active {
border: 1px solid #222222;
color: #e1e1e1;
background-color: #2f2f2f; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:checked {
border: 1px solid #222222;
color: #e1e1e1;
background-color: #2f2f2f; }

.dialog .dialog-button, .dialog .dialog-button:destructive-action, .dialog .dialog-button:default {
font-weight: bold;
padding: 12px;
border-radius: 18px;
border: 1px solid #303030;
color: #e1e1e1;
background-color: #303030; }
.dialog .dialog-button:focus {
border: 1px solid #303030;
color: #e1e1e1;
background-color: #303030; }
background-color: #303030;
border: 1px solid #e1e1e1; }
.dialog .dialog-button:hover {
border: 1px solid #303030;
color: #e1e1e1;
background-color: #4a4a4a; }
.dialog .dialog-button:active {
border: 1px solid #303030;
color: #e1e1e1;
background-color: #3d3d3d; }
.dialog .dialog-button:checked {
border: 1px solid #303030;
color: #e1e1e1;
background-color: #3d3d3d; }
.dialog .dialog-button:insensitive {
border: 1px solid #303030;
color: rgba(225, 225, 225, 0.5);
background-color: #282828; }

.dialog .dialog-button:default {
border: 1px solid #35a854;
color: #e1e1e1;
background-color: #35a854; }
.dialog .dialog-button:hover:default {
border: 1px solid #35a854;
color: #e1e1e1;
background-color: #4ac66b; }
.dialog .dialog-button:active:default {
border: 1px solid #35a854;
color: #e1e1e1;
background-color: #3bbb5e; }
.dialog .dialog-button:checked:default {
border: 1px solid #35a854;
color: #e1e1e1;
background-color: #3bbb5e; }
.dialog .dialog-button:insensitive:default {
border-color: #303030;
border: 1px solid #303030;
color: rgba(225, 225, 225, 0.5);
background-color: #282828; }

.dialog .dialog-button:destructive-action {
border: 1px solid #c01c28;
color: #e1e1e1;
background-color: #c01c28; }
.dialog .dialog-button:hover:destructive-action {
border: 1px solid #c01c28;
color: #e1e1e1;
background-color: #e12e3b; }
.dialog .dialog-button:focus:destructive-action {
border: 1px solid #c01c28;
color: #e1e1e1;
background-color: #c01c28;
border: 1px solid #e1e1e1; }
.dialog .dialog-button:active:destructive-action {
border: 1px solid #c01c28;
color: #e1e1e1;
background-color: #d61f2d; }
.dialog .dialog-button:checked:destructive-action {
border: 1px solid #c01c28;
color: #e1e1e1;
background-color: #d61f2d; }
.dialog .dialog-button:insensitive:destructive-action {
border-color: #303030;
border: 1px solid #303030;
color: rgba(225, 225, 225, 0.5);
background-color: #282828; }

Expand Down
33 changes: 31 additions & 2 deletions src/Mint-Y/cinnamon/cinnamon.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1564,77 +1564,106 @@ StScrollBar {
font-size: 1.182em; }

.audio-device-selection-dialog .audio-selection-box .audio-selection-device {
border: 1px solid #e8e8e8;
color: #303030;
background-color: #e8e8e8; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:focus {
border: 1px solid #e8e8e8;
color: #303030;
background-color: #e8e8e8; }
background-color: #e8e8e8;
border: 1px solid #303030; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:hover {
border: 1px solid #e8e8e8;
color: #303030;
background-color: white; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:insensitive {
border: 1px solid #e8e8e8;
color: rgba(48, 48, 48, 0.5);
background-color: #e8e8e8; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:selected, .audio-device-selection-dialog .audio-selection-box .audio-selection-device:active {
border: 1px solid #e8e8e8;
color: #303030;
background-color: #f2f2f2; }
.audio-device-selection-dialog .audio-selection-box .audio-selection-device:checked {
border: 1px solid #e8e8e8;
color: #303030;
background-color: #f2f2f2; }

.dialog .dialog-button, .dialog .dialog-button:destructive-action, .dialog .dialog-button:default {
font-weight: bold;
padding: 12px;
border-radius: 18px;
border: 1px solid #b0b0b0;
color: #303030;
background-color: #b0b0b0; }
.dialog .dialog-button:focus {
border: 1px solid #b0b0b0;
color: #303030;
background-color: #b0b0b0; }
background-color: #b0b0b0;
border: 1px solid #303030; }
.dialog .dialog-button:hover {
border: 1px solid #b0b0b0;
color: #303030;
background-color: #cacaca; }
.dialog .dialog-button:active {
border: 1px solid #b0b0b0;
color: #303030;
background-color: #bdbdbd; }
.dialog .dialog-button:checked {
border: 1px solid #b0b0b0;
color: #303030;
background-color: #bdbdbd; }
.dialog .dialog-button:insensitive {
border: 1px solid #b0b0b0;
color: rgba(48, 48, 48, 0.5);
background-color: #a8a8a8; }

.dialog .dialog-button:default {
border: 1px solid #35a854;
color: #303030;
background-color: #35a854; }
.dialog .dialog-button:hover:default {
border: 1px solid #35a854;
color: #303030;
background-color: #4ac66b; }
.dialog .dialog-button:active:default {
border: 1px solid #35a854;
color: #303030;
background-color: #3bbb5e; }
.dialog .dialog-button:checked:default {
border: 1px solid #35a854;
color: #303030;
background-color: #3bbb5e; }
.dialog .dialog-button:insensitive:default {
border-color: #b5b5b5;
border: 1px solid #b0b0b0;
color: rgba(48, 48, 48, 0.5);
background-color: #a8a8a8; }

.dialog .dialog-button:destructive-action {
border: 1px solid #F04A50;
color: #303030;
background-color: #F04A50; }
.dialog .dialog-button:hover:destructive-action {
border: 1px solid #F04A50;
color: #303030;
background-color: #f4797e; }
.dialog .dialog-button:focus:destructive-action {
border: 1px solid #F04A50;
color: #303030;
background-color: #F04A50;
border: 1px solid #303030; }
.dialog .dialog-button:active:destructive-action {
border: 1px solid #F04A50;
color: #303030;
background-color: #f26267; }
.dialog .dialog-button:checked:destructive-action {
border: 1px solid #F04A50;
color: #303030;
background-color: #f26267; }
.dialog .dialog-button:insensitive:destructive-action {
border-color: #b5b5b5;
border: 1px solid #b0b0b0;
color: rgba(48, 48, 48, 0.5);
background-color: #a8a8a8; }

Expand Down
4 changes: 4 additions & 0 deletions src/Mint-Y/cinnamon/sass/_dialogs.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ $osd_radius: 20px;
$checked_button_bg_color: darken($hover_button_bg_color, 5%);
$insensitive_button_bg_color: darken($button_bg_color, 3%);

border: 1px solid $button_bg_color;

// flat style overrides
@if $style == 'flat' {
$insensitive_button_bg_color: $button_bg_color;
Expand All @@ -51,6 +53,7 @@ $osd_radius: 20px;
@if $type == 'focus' {
color: $tc;
background-color: $button_bg_color;
border: 1px solid $fg_color;
}

// hover button
Expand Down Expand Up @@ -152,6 +155,7 @@ $osd_radius: 20px;

@include styled_button(normal, $c: $osd_destructive_color, $style: default);
&:hover { @include styled_button(hover, $c: $osd_destructive_color, $style: default); }
&:focus { @include styled_button(focus, $c: $osd_destructive_color, $style: default); }
&:active { @include styled_button(active, $c: $osd_destructive_color, $style: default); }
&:checked { @include styled_button(checked, $c: $osd_destructive_color, $style: default); }
&:insensitive {
Expand Down

0 comments on commit 745fef5

Please sign in to comment.