diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 56678c27..dd5c3c10 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -2012,7 +2012,7 @@ notebook { } // colors the button like the label, overridden otherwise - button.flat { + button.flat, button.close-button { @extend %small-button; &:last-child { @@ -2025,11 +2025,6 @@ notebook { margin-right: $space-size; } } - - button.close-button { - min-width: $small-size; - min-height: $small-size; - } } &.top, diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss index 46501d54..a2e4b1ca 100644 --- a/src/sass/gtk/apps/_misc.scss +++ b/src/sass/gtk/apps/_misc.scss @@ -293,10 +293,10 @@ window.background:not(.csd) { } #Statusbar { - padding-left: 8px; + padding: 3px 0 3px 8px; - spinbutton { - margin: 6px 0; + spinbutton, box > button.flat { + margin: 3px 0; } } @@ -338,14 +338,27 @@ window.background:not(.csd) { } } -scrolledwindow#DialogNotebook { - > viewport.frame > notebook.frame { - button.close-button { - image { padding: 4px; } +window.bright.symbolic { + scrolledwindow > viewport.frame > notebook { + tabs > tab { + padding: $space-size / 2 $space-size; + + button.close-button { + margin: 4px 0; + } } } } +popover#ContextMenu { // not use ? + border-radius: $menu-radius; + background-clip: content-box; + + modelbutton.flat { + border-radius: $corner-radius; + } +} + // // Synapse diff --git a/src/sass/libadwaita/apps/_other.scss b/src/sass/libadwaita/apps/_other.scss index 71822725..0e190e7b 100644 --- a/src/sass/libadwaita/apps/_other.scss +++ b/src/sass/libadwaita/apps/_other.scss @@ -147,6 +147,234 @@ popover.menu themeswitcher { // Gnome console } } +// Sticky note +styleselector { + checkbutton { + padding: 0; + min-height: 44px; + min-width: 44px; + padding: 0; + background-clip: content-box; + border-radius: $circular_radius; + box-shadow: none; + border: none; + + &:hover { + box-shadow: inset 0 0 0 2px $border_color; + } + + &:checked { + box-shadow: inset 0 0 0 2px var(--accent-bg-color); + + > radio, > radio:checked { + &, &:hover { + -gtk-icon-size: 20px; + -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/checkbox-checked-symbolic.svg")), -gtk-recolor(url("assets/checkbox-checked-symbolic@2.svg"))); + color: var(--accent-fg-color); + background-color: var(--accent-bg-color); + box-shadow: 0 2px 3px -1px rgba(black, 0.08), 0 1px 2px 0 rgba(black, 0.1); + border: none; + } + } + } + + > radio { + min-height: 20px; + min-width: 20px; + padding: 0; + margin: 0; + + &:not(:checked):not(:indeterminate) { + &, &:hover { + color: transparent; + border: none; + background: none; + box-shadow: none; + -gtk-icon-source: none; + } + } + } + } +} + +.note-window { + &, .text-view.view, .text-view.view > text, .toolbar, .toolbar button { color: $accent_fg_color; } + + .top-bar > windowhandle:backdrop { filter: none; } + + popover { + > arrow, + > contents { + @if $rimless == 'false' { + border: 1px solid gtkalpha($accent_fg_color, 0.1); + box-shadow: 0 1px 5px 1px transparentize(black, .91), + 0 2px 14px 3px transparentize(black, .95); + } + } + } + + &.style-yellow { + &, .text-view.view, .text-view.view > text { + background-color: var(--accent-yellow); + } + + headerbar.flat, .toolbar { + &, &:backdrop { + background-color: var(--accent-yellow); + } + } + + .text-view.view > text > selection { + background-color: gtkalpha($accent_fg_color, 0.35); + } + + popover { + > arrow, + > contents { + background-color: gtkmix($accent_fg_color, var(--accent-yellow), 10%); + } + } + } + + &.style-pink { + &, .text-view.view, .text-view.view > text { + background-color: var(--accent-pink); + } + + headerbar.flat, .toolbar { + &, &:backdrop { + background-color: var(--accent-pink); + } + } + + .text-view.view > text > selection { + background-color: gtkalpha($accent_fg_color, 0.35); + } + + popover { + > arrow, + > contents { + background-color: gtkmix($accent_fg_color, var(--accent-pink), 10%); + } + } + } + + &.style-green { + &, .text-view.view, .text-view.view > text { + background-color: var(--accent-green); + } + + headerbar.flat, .toolbar { + &, &:backdrop { + background-color: var(--accent-green); + } + } + + .text-view.view > text > selection { + background-color: gtkalpha($accent_fg_color, 0.35); + } + + popover { + > arrow, + > contents { + background-color: gtkmix($accent_fg_color, var(--accent-green), 10%); + } + } + } + + &.style-purple { + &, .text-view.view, .text-view.view > text { + background-color: var(--accent-purple); + } + + headerbar.flat, .toolbar { + &, &:backdrop { + background-color: var(--accent-purple); + } + } + + .text-view.view > text > selection { + background-color: gtkalpha($accent_fg_color, 0.35); + } + + popover { + > arrow, + > contents { + background-color: gtkmix($accent_fg_color, var(--accent-purple), 10%); + } + } + } + + &.style-blue { + &, .text-view.view, .text-view.view > text { + background-color: var(--accent-blue); + } + + headerbar.flat, .toolbar { + &, &:backdrop { + background-color: var(--accent-blue); + } + } + + .text-view.view > text > selection { + background-color: gtkalpha($accent_fg_color, 0.35); + } + + popover { + > arrow, + > contents { + background-color: gtkmix($accent_fg_color, var(--accent-blue), 10%); + } + } + } + + &.style-gray { + &, .text-view.view, .text-view.view > text { + background-color: #565656; + } + + headerbar.flat, .toolbar { + &, &:backdrop { + background-color: #565656; + } + } + + .text-view.view > text > selection { + background-color: gtkalpha($accent_fg_color, 0.35); + } + + popover { + > arrow, + > contents { + background-color: gtkmix($accent_fg_color, #565656, 10%); + } + } + } + + &.style-charcoal { + &, .text-view.view, .text-view.view > text { + background-color: #2b2b2b; + } + + headerbar.flat, .toolbar { + &, &:backdrop { + background-color: #2b2b2b; + } + } + + .text-view.view > text > selection { + background-color: gtkalpha($accent_fg_color, 0.35); + } + + popover { + > arrow, + > contents { + background-color: gtkmix($accent_fg_color, #2b2b2b, 10%); + } + } + } +} + // // NG (DING) //