Skip to content

Commit

Permalink
BUGfix: Gtk-4.0 - fix extra gap in search bars
Browse files Browse the repository at this point in the history
  • Loading branch information
@thekomer
thekomer committed Dec 20, 2021
1 parent 437ae2e commit 4603eda
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 45 deletions.
36 changes: 16 additions & 20 deletions cinnamon/cinnamon.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,37 +19,37 @@ stage {
/* * * * * *
* Buttons *
* * * * * */
.popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .notification-button, .notification-icon-button, .modal-dialog-button-box .modal-dialog-button, .sound-button {
.sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button {
min-height: 20px;
padding: 5px 32px;
transition-duration: 0;
color: #BFC3CD;
background-color: #161b2e;
border: 1px solid #040508;
box-shadow: inset 0 2px 4px rgba(22, 27, 46, 0.05); }
.popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button, .notification-button, .notification-icon-button, .modal-dialog-button-box .modal-dialog-button, .sound-button, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .sound-button:focus, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .sound-button:hover, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .sound-button:hover:focus, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .notification-button:active:focus, .notification-icon-button:active:focus, .modal-dialog-button-box .modal-dialog-button:active:focus, .sound-button:active:focus, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .sound-button:insensitive {
.sound-button, .modal-dialog-button-box .modal-dialog-button, .notification-button, .notification-icon-button, .popup-menu #notification .notification-button, .popup-menu #notification .notification-icon-button {
border-radius: 0.5em; }
.popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus, .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .sound-button:focus {
.sound-button:focus, .modal-dialog-button-box .modal-dialog-button:focus, .notification-button:focus, .notification-icon-button:focus, .popup-menu #notification .notification-button:focus, .popup-menu #notification .notification-icon-button:focus {
color: #BFC3CD;
background-color: #161b2e;
border: 1px solid #ff6a00;
box-shadow: inset 0 2px 4px rgba(22, 27, 46, 0.05); }
.popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .notification-button:hover, .notification-icon-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .sound-button:hover {
.sound-button:hover, .modal-dialog-button-box .modal-dialog-button:hover, .notification-button:hover, .notification-icon-button:hover, .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover {
color: #BFC3CD;
background-color: #1f253f;
border: 1px solid #040508;
box-shadow: inset 0 2px 4px rgba(31, 37, 63, 0.05); }
.popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .sound-button:hover:focus {
.sound-button:hover:focus, .modal-dialog-button-box .modal-dialog-button:hover:focus, .notification-button:hover:focus, .notification-icon-button:hover:focus, .popup-menu #notification .notification-button:hover:focus, .popup-menu #notification .notification-icon-button:hover:focus {
color: #BFC3CD;
background-color: #1f253f;
border: 1px solid #ff6a00;
box-shadow: inset 0 2px 4px rgba(22, 27, 46, 0.05); }
.popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .notification-button:active:focus, .notification-icon-button:active:focus, .modal-dialog-button-box .modal-dialog-button:active:focus, .sound-button:active:focus {
.sound-button:active, .modal-dialog-button-box .modal-dialog-button:active, .notification-button:active, .notification-icon-button:active, .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active {
color: #fefefe;
background-color: #ff6a00;
border: 1px solid #ff6a00;
box-shadow: inset 0 2px 4px #ff6a00; }
.popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .sound-button:insensitive {
.sound-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive, .notification-button:insensitive, .notification-icon-button:insensitive, .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive {
color: rgba(191, 195, 205, 0.45);
border: 1px solid rgba(4, 5, 8, 0.55);
background-color: rgba(22, 27, 46, 0.55);
Expand All @@ -58,7 +58,7 @@ stage {
/* * * * * *
* Entries *
* * * * * */
.popup-menu #notification StEntry, #menu-search-entry {
#menu-search-entry, .popup-menu #notification StEntry {
padding: 7px;
caret-size: 1px;
selection-background-color: #ff6a00;
Expand All @@ -69,17 +69,17 @@ stage {
background-color: #131727;
border: 1px solid #040508;
box-shadow: inset 0 2px 4px rgba(19, 23, 39, 0.05); }
.popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
#menu-search-entry:focus, .popup-menu #notification StEntry:focus, #menu-search-entry:hover, .popup-menu #notification StEntry:hover {
color: #BFC3CD;
background-color: #131727;
border: 1px solid #ff6a00;
box-shadow: inset 0 2px 4px rgba(19, 23, 39, 0.05); }
.popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive {
#menu-search-entry:insensitive, .popup-menu #notification StEntry:insensitive {
color: rgba(191, 195, 205, 0.45);
background-color: #111423;
border-color: 1px solid #090a12;
box-shadow: inset 0 2px 4px rgba(17, 20, 35, 0.05); }
.popup-menu #notification StEntry StIcon.capslock-warning, #menu-search-entry StIcon.capslock-warning {
#menu-search-entry StIcon.capslock-warning, .popup-menu #notification StEntry StIcon.capslock-warning {
icon-size: 16px;
warning-color: #cc5500;
padding: 0 4px; }
Expand Down Expand Up @@ -841,7 +841,8 @@ StScrollBar {
.calendar-today {
color: #BFC3CD;
background-color: rgba(255, 106, 0, 0.4);
border: 1px solid #ff6a00; }
border: 1px solid #ff6a00;
border-radius: 0.5em; }
.calendar-today:selected {
color: #fefefe; }

Expand Down Expand Up @@ -1630,8 +1631,7 @@ StScrollBar {
.workspace-switcher {
padding-left: 3px;
padding-right: 3px; }
.panel-left .workspace-switcher,
.panel-right .workspace-switcher {
.panel-left .workspace-switcher, .panel-right .workspace-switcher {
padding: 0; }

.workspace-button {
Expand Down Expand Up @@ -1770,18 +1770,14 @@ StScrollBar {
.applet-label {
font-weight: bold;
color: #BFC3CD; }
.applet-label:hover, .applet-label:checked,
.applet-box:hover > .applet-label,
.applet-box:checked > .applet-label {
.applet-label:hover, .applet-label:checked, .applet-box:hover > .applet-label, .applet-box:checked > .applet-label {
color: #fefefe;
text-shadow: none; }

.applet-icon {
color: #BFC3CD;
icon-size: 22px; }
.applet-icon:hover, .applet-icon:checked,
.applet-box:hover > .applet-icon,
.applet-box:checked > .applet-icon {
.applet-icon:hover, .applet-icon:checked, .applet-box:hover > .applet-icon, .applet-box:checked > .applet-icon {
color: #fefefe;
text-shadow: none; }

Expand Down
1 change: 1 addition & 0 deletions cinnamon/sass/_common.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,7 @@ StScrollBar {
background-color: if($variant == 'light', transparentize($selected_bg_color, 0.6), transparentize($selected_bg_color, 0.6));
//border-width: 0;
border: 1px solid $orange;
border-radius: 0.5em;
&:selected {
color: $selected_fg_color;
//@include bg_gradient(horizontal, $orange_gradient_start, $orange_gradient_end, 1);
Expand Down
2 changes: 1 addition & 1 deletion gtk-3.0/gtk-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4707,7 +4707,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
* Window Decorations *
*********************/
decoration {
border-radius: 4px 4px 0 0;
border-radius: 4px 4px 4px 4px;
border-width: 0px;
border-width: 0px;
box-shadow: 0 4px 10px 2px rgba(255, 255, 255, 0);
Expand Down
2 changes: 1 addition & 1 deletion gtk-3.0/gtk.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4707,7 +4707,7 @@ treeview.view header button, treeview.view header button:hover, treeview.view he
* Window Decorations *
*********************/
decoration {
border-radius: 4px 4px 0 0;
border-radius: 4px 4px 4px 4px;
border-width: 0px;
border-width: 0px;
box-shadow: 0 4px 10px 2px rgba(255, 255, 255, 0);
Expand Down
5 changes: 3 additions & 2 deletions gtk-3.0/widgets/_windows.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
* Window Decorations *
*********************/
decoration {
border-radius: 4px 4px 0 0;
border-radius: 4px 4px 4px 4px;


// lamefun trick to get rounded borders regardless of CSD use
border-width: 0px;
Expand All @@ -12,7 +13,7 @@ decoration {
$_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
$_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize($borders_color, 0.1));

// lamefun trick to get rounded borders regardless of CSD use
// lamefun trick to get rounded borders regardless of CSD use
border-width: 0px;

box-shadow: 0 4px 10px 2px transparentize($borders_color, 0.2);
Expand Down
14 changes: 5 additions & 9 deletions gtk-4.0/gtk-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4473,8 +4473,7 @@ switch {
/************
* Toolbars *
************/
toolbar, .inline-toolbar, searchbar,
.location-bar {
toolbar, .inline-toolbar, searchbar > revealer > box {
padding: 4px;
background-color: #06070c; }

Expand Down Expand Up @@ -4506,18 +4505,15 @@ toolbar {
border-width: 0 1px 1px;
border-radius: 0 0 5px 5px; }

searchbar,
.location-bar {
searchbar > revealer > box {
border-width: 0 0 1px;
padding: 3px; }
padding: 5px; }

.inline-toolbar, searchbar,
.location-bar {
.inline-toolbar, searchbar > revealer > box {
border-style: solid;
border-color: rgba(255, 255, 255, 0.05);
background-color: rgba(17, 20, 31, 0.715); }
.inline-toolbar:backdrop, searchbar:backdrop,
.location-bar:backdrop {
.inline-toolbar:backdrop, searchbar > revealer > box:backdrop {
border-color: rgba(59, 62, 71, 0.145);
background-color: rgba(16, 19, 31, 0.70075);
box-shadow: none;
Expand Down
14 changes: 5 additions & 9 deletions gtk-4.0/gtk.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4473,8 +4473,7 @@ switch {
/************
* Toolbars *
************/
toolbar, .inline-toolbar, searchbar,
.location-bar {
toolbar, .inline-toolbar, searchbar > revealer > box {
padding: 4px;
background-color: #06070c; }

Expand Down Expand Up @@ -4506,18 +4505,15 @@ toolbar {
border-width: 0 1px 1px;
border-radius: 0 0 5px 5px; }

searchbar,
.location-bar {
searchbar > revealer > box {
border-width: 0 0 1px;
padding: 3px; }
padding: 5px; }

.inline-toolbar, searchbar,
.location-bar {
.inline-toolbar, searchbar > revealer > box {
border-style: solid;
border-color: rgba(255, 255, 255, 0.05);
background-color: rgba(17, 20, 31, 0.715); }
.inline-toolbar:backdrop, searchbar:backdrop,
.location-bar:backdrop {
.inline-toolbar:backdrop, searchbar > revealer > box:backdrop {
border-color: rgba(59, 62, 71, 0.145);
background-color: rgba(16, 19, 31, 0.70075);
box-shadow: none;
Expand Down
5 changes: 2 additions & 3 deletions gtk-4.0/widgets/_toolbars.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,13 @@ toolbar {
border-radius: 0 0 5px 5px;
}

searchbar,
.location-bar {
searchbar > revealer > box {
@extend %toolbar;

@extend %darkbar;

border-width: 0 0 1px;
padding: 3px;
padding: 5px;
}

%darkbar {
Expand Down

0 comments on commit 4603eda

Please sign in to comment.