Skip to content

Commit

Permalink
GNOME 43 compatibility, gtk4 improved, cinnamon minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@madmaxms
madmaxms committed Feb 11, 2023
1 parent 5da6c3a commit ed5e9cd
Show file tree
Hide file tree
Showing 9 changed files with 15,262 additions and 11,724 deletions.
239 changes: 120 additions & 119 deletions Obsidian-2/cinnamon/cinnamon.css
View file

Large diffs are not rendered by default.

660 changes: 539 additions & 121 deletions Obsidian-2/gnome-shell/gnome-shell.css
View file

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Obsidian-2/gtk-3.0/colAccents.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
@define-color entry_tag_c #0055b3;
@define-color entry_tag_border #003399;

/* scale */
@define-color scale_fill_a shade(@theme_selected_bg_color, 1.1);
@define-color scale_fill_b shade(@theme_selected_bg_color, 0.94);

/* buttons */
@define-color button_fg_sugg_color #f7f7f7;
@define-color button_bg_sugg_a #256ab1;
Expand Down
3 changes: 1 addition & 2 deletions Obsidian-2/gtk-3.0/colCommon.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@
@define-color button_bgcirc_c_hov #191f23;

@define-color selected_bg_color #646e73;
@define-color selected_fg_color #ffffff;
@define-color selected_border_color #96a0aa;

/* menus and menubars */
Expand All @@ -174,8 +175,6 @@

/* scale */
@define-color scale_trough_b @theme_bg_color;
@define-color scale_fill_a shade(@theme_selected_bg_color, 1.1);
@define-color scale_fill_b shade(@theme_selected_bg_color, 0.94);

/* notebook */
@define-color notebook_bg #3c464c;
Expand Down
40 changes: 25 additions & 15 deletions Obsidian-2/gtk-3.20/gtk-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,8 @@ entry undershoot.right {
}
.entry.flat,
.entry.flat:focus,
spinbutton.flat:focus:not(.vertical), spinbutton.flat:not(.vertical),
spinbutton.flat:focus:not(.vertical),
spinbutton.flat:not(.vertical),
entry.flat:focus,
entry.flat {
min-height: 0;
Expand Down Expand Up @@ -1001,7 +1002,8 @@ button.osd:backdrop {
.csd popover.background.touch-selection button,
.csd popover.background.magnifier button,
popover.background.touch-selection button,
popover.background.magnifier button, .osd button {
popover.background.magnifier button,
.osd button {
color: @button_fg_osd;
border-color: rgba(0, 0, 0, 0.7);
background-color: transparent;
Expand Down Expand Up @@ -1682,7 +1684,8 @@ filechooser .path-bar.linked > button,
.linked:not(.vertical) > spinbutton:not(.vertical),
.linked:not(.vertical) > entry,
.inline-toolbar button,
.linked > button, toolbar.inline-toolbar toolbutton > button.flat {
.linked > button,
toolbar.inline-toolbar toolbutton > button.flat {
border-right-style: none;
border-radius: 0;
-gtk-outline-radius: 0;
Expand Down Expand Up @@ -1804,9 +1807,8 @@ modelbutton.flat,
/* menu buttons */
modelbutton.flat,
.menuitem.button.flat {
min-height: 24px;
padding-left: 5px;
padding-right: 5px;
min-height: 28px;
padding: 2px 5px;
border-radius: 4px;
outline-offset: -2px;
}
Expand Down Expand Up @@ -3164,7 +3166,7 @@ treeview.view.expander:backdrop {
color: @theme_fg_color_dis;
}
treeview.view.progressbar {
color: #fff;
color: @theme_fg_color;
border: 1px solid @prgbar_border;
border-radius: 4px;
background-image: linear-gradient(to bottom, @prgbar_bg_a, @prgbar_bg_b);
Expand Down Expand Up @@ -3290,6 +3292,8 @@ menubar menuitem,
min-height: 16px;
padding: 4px 8px;
background-color: @menu_bg;
margin-top: 2px;
margin-bottom: 2px;
}
.menu .menuitem:hover,
.menu > .menuitem:hover,
Expand All @@ -3312,6 +3316,8 @@ menubar menuitem:hover,
.menubar > menuitem:hover {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.menu .menuitem:disabled {
color: @menuitem_fg_dis;
Expand All @@ -3334,7 +3340,7 @@ menu,
padding: 6px 1px;
background-color: @menu_bg;
border: 1px solid @borders;
border-radius: 7px;
border-radius: 4px;
}
.csd menu,
.csd .menu,
Expand All @@ -3354,6 +3360,8 @@ menu menuitem,
min-width: 40px;
padding: 4px 6px;
text-shadow: none;
margin: 2px;
border-radius: 4px;
}
menu menuitem label,
.menu menuitem label {
Expand All @@ -3369,8 +3377,8 @@ menu menuitem:hover,
color: @menuitem_fg_hover;
background-color: @menuitem_bg_hover;
background-image: none;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
/*border-top-left-radius: 0px;
border-top-right-radius: 0px;*/
}
menu menuitem:disabled,
.menu menuitem:disabled,
Expand Down Expand Up @@ -3426,15 +3434,14 @@ menu > arrow,
.menu > arrow,
.context-menu > arrow {
border-color: transparent;
background-color: transparent;
background-color: @menu_bdr;
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
-gtk-icon-shadow: none;
min-height: 16px;
min-width: 16px;
padding: 4px;
background-color: @menu_bdr;
border-radius: 0;
}
menu > arrow.top,
Expand Down Expand Up @@ -3531,6 +3538,9 @@ popover.background.magnifier {
}
popover.background separator {
margin: 3px;
border-top: 1px solid @menuitem_separator;
background-color: rgba(255, 255, 255, 0.2);
background: rgba(255, 255, 255, 0.2);
}
popover.background list separator {
margin: 0px;
Expand Down Expand Up @@ -6691,10 +6701,10 @@ stacksidebar.sidebar.right list,
}

separator.sidebar {
background-color: @border_normal;
background-color: rgba(100, 128, 138, 0.4);
}
separator.sidebar:backdrop {
background-color: @border_normal;
background-color: rgba(100, 128, 138, 0.4);
}

.sidebar .frame {
Expand Down Expand Up @@ -12726,7 +12736,7 @@ NemoWindow .sidebar .view {
color: @sidebar_fg;
}
.nemo-window .sidebar separator {
background-color: transparent;
background-color: rgba(100, 128, 138, 0.4);
}

.nemo-window .nemo-places-sidebar.frame {
Expand Down
40 changes: 25 additions & 15 deletions Obsidian-2/gtk-3.20/gtk.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,8 @@ entry undershoot.right {
}
.entry.flat,
.entry.flat:focus,
spinbutton.flat:focus:not(.vertical), spinbutton.flat:not(.vertical),
spinbutton.flat:focus:not(.vertical),
spinbutton.flat:not(.vertical),
entry.flat:focus,
entry.flat {
min-height: 0;
Expand Down Expand Up @@ -1001,7 +1002,8 @@ button.osd:backdrop {
.csd popover.background.touch-selection button,
.csd popover.background.magnifier button,
popover.background.touch-selection button,
popover.background.magnifier button, .osd button {
popover.background.magnifier button,
.osd button {
color: @button_fg_osd;
border-color: rgba(0, 0, 0, 0.7);
background-color: transparent;
Expand Down Expand Up @@ -1682,7 +1684,8 @@ filechooser .path-bar.linked > button,
.linked:not(.vertical) > spinbutton:not(.vertical),
.linked:not(.vertical) > entry,
.inline-toolbar button,
.linked > button, toolbar.inline-toolbar toolbutton > button.flat {
.linked > button,
toolbar.inline-toolbar toolbutton > button.flat {
border-right-style: none;
border-radius: 0;
-gtk-outline-radius: 0;
Expand Down Expand Up @@ -1804,9 +1807,8 @@ modelbutton.flat,
/* menu buttons */
modelbutton.flat,
.menuitem.button.flat {
min-height: 24px;
padding-left: 5px;
padding-right: 5px;
min-height: 28px;
padding: 2px 5px;
border-radius: 4px;
outline-offset: -2px;
}
Expand Down Expand Up @@ -3164,7 +3166,7 @@ treeview.view.expander:backdrop {
color: @theme_fg_color_dis;
}
treeview.view.progressbar {
color: #fff;
color: @theme_fg_color;
border: 1px solid @prgbar_border;
border-radius: 4px;
background-image: linear-gradient(to bottom, @prgbar_bg_a, @prgbar_bg_b);
Expand Down Expand Up @@ -3290,6 +3292,8 @@ menubar menuitem,
min-height: 16px;
padding: 4px 8px;
background-color: @menu_bg;
margin-top: 2px;
margin-bottom: 2px;
}
.menu .menuitem:hover,
.menu > .menuitem:hover,
Expand All @@ -3312,6 +3316,8 @@ menubar menuitem:hover,
.menubar > menuitem:hover {
border-top-left-radius: 4px;
border-top-right-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
}
.menu .menuitem:disabled {
color: @menuitem_fg_dis;
Expand All @@ -3334,7 +3340,7 @@ menu,
padding: 6px 1px;
background-color: @menu_bg;
border: 1px solid @borders;
border-radius: 7px;
border-radius: 4px;
}
.csd menu,
.csd .menu,
Expand All @@ -3354,6 +3360,8 @@ menu menuitem,
min-width: 40px;
padding: 4px 6px;
text-shadow: none;
margin: 2px;
border-radius: 4px;
}
menu menuitem label,
.menu menuitem label {
Expand All @@ -3369,8 +3377,8 @@ menu menuitem:hover,
color: @menuitem_fg_hover;
background-color: @menuitem_bg_hover;
background-image: none;
border-top-left-radius: 0px;
border-top-right-radius: 0px;
/*border-top-left-radius: 0px;
border-top-right-radius: 0px;*/
}
menu menuitem:disabled,
.menu menuitem:disabled,
Expand Down Expand Up @@ -3426,15 +3434,14 @@ menu > arrow,
.menu > arrow,
.context-menu > arrow {
border-color: transparent;
background-color: transparent;
background-color: @menu_bdr;
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
-gtk-icon-shadow: none;
min-height: 16px;
min-width: 16px;
padding: 4px;
background-color: @menu_bdr;
border-radius: 0;
}
menu > arrow.top,
Expand Down Expand Up @@ -3531,6 +3538,9 @@ popover.background.magnifier {
}
popover.background separator {
margin: 3px;
border-top: 1px solid @menuitem_separator;
background-color: rgba(255, 255, 255, 0.2);
background: rgba(255, 255, 255, 0.2);
}
popover.background list separator {
margin: 0px;
Expand Down Expand Up @@ -6691,10 +6701,10 @@ stacksidebar.sidebar.right list,
}

separator.sidebar {
background-color: @border_normal;
background-color: rgba(100, 128, 138, 0.4);
}
separator.sidebar:backdrop {
background-color: @border_normal;
background-color: rgba(100, 128, 138, 0.4);
}

.sidebar .frame {
Expand Down Expand Up @@ -12726,7 +12736,7 @@ NemoWindow .sidebar .view {
color: @sidebar_fg;
}
.nemo-window .sidebar separator {
background-color: transparent;
background-color: rgba(100, 128, 138, 0.4);
}

.nemo-window .nemo-places-sidebar.frame {
Expand Down
Loading

0 comments on commit ed5e9cd

Please sign in to comment.