Skip to content

Commit

Permalink
More tweaks and additions
Browse files Browse the repository at this point in the history
  • Loading branch information
lassekongo83 committed Feb 9, 2022
1 parent 59a6ed5 commit b3f6604
Show file tree
Hide file tree
Showing 4 changed files with 283 additions and 10 deletions.
141 changes: 141 additions & 0 deletions gtk/src/adw-gtk3/gtk-3.0/_apps.scss
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,21 @@ window#guake-terminal notebook header {
}

// XFCE4
XfdesktopIconView.view {
background: transparent;
color: $osd_fg_color;
border-radius: $button_radius;
&:active {
background: rgba(darken($selected_bg_color, 15%), 0.5);
text-shadow: 0 1px 1px black;
}
.label { text-shadow: 1px 1px 2px black; }
.rubberband {
@extend rubberband;
border-radius: 0;
}
}

$panel_bg_color: #1e1e1e;
$panel_fg_color: #ffffff;
.xfce4-panel.background {
Expand Down Expand Up @@ -306,3 +321,129 @@ $panel_fg_color: #ffffff;
}
}
}

// Nemo
.nemo-desktop.nemo-canvas-item {
color: $selected_fg_color;
text-shadow: 1px 1px 2px transparentize(black, 0.2);
}

.nemo-properties-dialog {
.dialog-action-box .dialog-action-area {
// add margin to preferences buttons
margin: 2px 6px 4px;
}

toolbar stackswitcher.linked button {
margin-right: 0;

&:backdrop {
color: $backdrop_fg_color;
background-color: $backdrop_bg_color;
}
}
}

.nemo-window {
.sidebar {
scrolledwindow.frame.nemo-places-sidebar {
// get rid of double border in sidebar
border: none;
}

viewport.frame box.vertical treeview.view.places-treeview {
// use sidebar bg color
background-image: image($sidebar_bg_color);
border-radius: 0; // get rid of weird radius on selected rows

&:backdrop {
background-image: image($backdrop_sidebar_bg_color);
}

&:selected {
background: $selected_bg_color;
}

&:not(:selected) {
&:not(:backdrop):hover {
background-image: image($base_hover_color);
}
}
}
}

.nemo-inactive-pane .view,
.nemo-inactive-pane iconview {
// Shades the background of the inactive pane
background-color: $backdrop_bg_color;
}

.nemo-window-pane {
widget.entry {
// Add border around rename text entry
border: 1px solid;
border-radius: 3px;
color: $fg_color;
border-color: $selected_bg_color;
background-color: $bg_color;
}

widget.entry:selected {
// Add highlighting to selected text in rename text entry
border: 1px solid;
border-radius: 3px;
color: $selected_fg_color;
border-color: $selected_bg_color;
background-color: $selected_bg_color;
}
}

toolbar.horizontal.primary-toolbar {
// add border under toolbar
border-bottom: 1px solid $borders_color;

widget.linked.raised button {
// use proper icons for next and left in stackswitcher-like pathbar
&:first-child widget {
-gtk-icon-source: -gtk-icontheme('go-previous-symbolic');
}
&:last-child widget {
-gtk-icon-source: -gtk-icontheme('go-next-symbolic');
}
}

toolitem box widget * {
// reset toolbar button dimensions
min-height: 0;
min-width: 0;
}

.linked button {
// link linked buttons
margin-right: 0;
}

button {
// return non-flat buttons
@each $state,
$t in ("", "normal"),
(":hover", "hover"),
(":active, &:checked", "active"),
(":disabled", "insensitive"),
(":disabled:active, &:disabled:checked", "insensitive-active"),
(":backdrop", "backdrop"),
(":backdrop:active, &:backdrop:checked", 'backdrop-active'),
(":backdrop:disabled", 'backdrop-insensitive'),
(":backdrop:disabled:active, &:backdrop:disabled:checked", 'backdrop-insensitive-active') {
&#{$state} {
@include button($t);
}
}
}
}
}

// USB Creator GTK
#dialog-action_area3 {
margin: 5px;
}
4 changes: 4 additions & 0 deletions gtk/src/adw-gtk3/gtk-3.0/_libhandy.scss
Original file line number Diff line number Diff line change
Expand Up @@ -382,20 +382,24 @@ list.content {
}
&:not(:first-child):not(:last-child) {
border-radius: 0;
-gtk-outline-radius: 0;
}
&:first-child {
border-top-left-radius: $card_radius;
border-top-right-radius: $card_radius;
-gtk-outline-radius: $card_radius $card_radius 0 0;
}
&:last-child {
border-top-left-radius: 0;
border-top-right-radius: 0;
border-bottom-left-radius: $card_radius;
border-bottom-right-radius: $card_radius;
-gtk-outline-radius: 0 0 $card_radius $card_radius;
}
&:only-child {
border-bottom: none;
border-radius: $card_radius;
-gtk-outline-radius: $card_radius;
}
&:not(:selected):hover {
background-color: if($variant == 'light', darken($card_bg_color, 2.3%), lighten($card_bg_color, 2.3%));
Expand Down
74 changes: 69 additions & 5 deletions gtk/src/adw-gtk3/gtk-3.0/gtk-dark.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

textview border { background-color: #212121; }

.rubberband, rubberband, .content-view rubberband, .content-view .rubberband, treeview.view rubberband, flowbox rubberband { border: 1px solid #1659ab; background-color: rgba(22, 89, 171, 0.2); }
.rubberband, rubberband, XfdesktopIconView.view .rubberband, .content-view rubberband, .content-view .rubberband, treeview.view rubberband, flowbox rubberband { border: 1px solid #1659ab; background-color: rgba(22, 89, 171, 0.2); }

flowbox flowboxchild { padding: 3px; }

Expand Down Expand Up @@ -2342,13 +2342,13 @@ list.content > row.expander:checked:not(:first-child), list.content > row.expand

list.content > row:not(:last-child) { border-bottom: 1px solid rgba(73, 73, 73, 0.5); border-bottom-left-radius: 0; border-bottom-right-radius: 0; }

list.content > row:not(:first-child):not(:last-child) { border-radius: 0; }
list.content > row:not(:first-child):not(:last-child) { border-radius: 0; -gtk-outline-radius: 0; }

list.content > row:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; }
list.content > row:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; -gtk-outline-radius: 12px 12px 0 0; }

list.content > row:last-child { border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; }
list.content > row:last-child { border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; -gtk-outline-radius: 0 0 12px 12px; }

list.content > row:only-child { border-bottom: none; border-radius: 12px; }
list.content > row:only-child { border-bottom: none; border-radius: 12px; -gtk-outline-radius: 12px; }

list.content > row:not(:selected):hover { background-color: #3b3b3b; }

Expand Down Expand Up @@ -2592,6 +2592,14 @@ geary-conversation-viewer#conversation_viewer searchbar > revealer > box { backg

window#guake-terminal notebook header { background: #303030; }

XfdesktopIconView.view { background: transparent; color: #eeeeee; border-radius: 6px; }

XfdesktopIconView.view:active { background: rgba(19, 78, 148, 0.5); text-shadow: 0 1px 1px black; }

XfdesktopIconView.view .label { text-shadow: 1px 1px 2px black; }

XfdesktopIconView.view .rubberband { border-radius: 0; }

.xfce4-panel.background { border: none; background-color: #1e1e1e; color: #ffffff; }

.xfce4-panel.background button { padding: 0; min-height: 12px; min-width: 12px; border-radius: 0; color: #ffffff; border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
Expand All @@ -2611,3 +2619,59 @@ window#guake-terminal notebook header { background: #303030; }
.xfce4-panel.background button menu .linked button { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: transparent; background-color: #3e3e3e; box-shadow: none; }

.xfce4-panel.background button menu .linked button:disabled { color: #929292; border-color: transparent; background-color: #313131; text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; border-color: rgba(73, 73, 73, 0.5); }

.nemo-desktop.nemo-canvas-item { color: #ffffff; text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8); }

.nemo-properties-dialog .dialog-action-box .dialog-action-area { margin: 2px 6px 4px; }

.nemo-properties-dialog toolbar stackswitcher.linked button { margin-right: 0; }

.nemo-properties-dialog toolbar stackswitcher.linked button:backdrop { color: #929292; background-color: #242424; }

.nemo-window .sidebar scrolledwindow.frame.nemo-places-sidebar { border: none; }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview { background-image: image(#242424); border-radius: 0; }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview:backdrop { background-image: image(#212121); }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview:selected { background: #1c71d8; }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview:not(:selected):not(:backdrop):hover { background-image: image(rgba(255, 255, 255, 0.05)); }

.nemo-window .nemo-inactive-pane .view, .nemo-window .nemo-inactive-pane iconview { background-color: #242424; }

.nemo-window .nemo-window-pane widget.entry { border: 1px solid; border-radius: 3px; color: white; border-color: #1c71d8; background-color: #242424; }

.nemo-window .nemo-window-pane widget.entry:selected { border: 1px solid; border-radius: 3px; color: #ffffff; border-color: #1c71d8; background-color: #1c71d8; }

.nemo-window toolbar.horizontal.primary-toolbar { border-bottom: 1px solid #494949; }

.nemo-window toolbar.horizontal.primary-toolbar widget.linked.raised button:first-child widget { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }

.nemo-window toolbar.horizontal.primary-toolbar widget.linked.raised button:last-child widget { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }

.nemo-window toolbar.horizontal.primary-toolbar toolitem box widget * { min-height: 0; min-width: 0; }

.nemo-window toolbar.horizontal.primary-toolbar .linked button { margin-right: 0; }

.nemo-window toolbar.horizontal.primary-toolbar button { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: transparent; background-color: #3e3e3e; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:hover { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: transparent; background-color: #4a4a4a; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:active, .nemo-window toolbar.horizontal.primary-toolbar button:checked { color: white; outline-color: rgba(255, 255, 255, 0.3); border-color: transparent; background-color: #717171; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:active:hover, .nemo-window toolbar.horizontal.primary-toolbar button:checked:hover { background-color: #7d7d7d; }

.nemo-window toolbar.horizontal.primary-toolbar button:disabled { color: #929292; border-color: transparent; background-color: #313131; text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:disabled:active, .nemo-window toolbar.horizontal.primary-toolbar button:disabled:checked { color: #929292; border-color: transparent; background-color: #616161; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop { color: #929292; border-color: transparent; background-color: #313131; text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop:active, .nemo-window toolbar.horizontal.primary-toolbar button:backdrop:checked { color: #929292; border-color: transparent; background-color: #616161; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop:disabled { color: #4a4a4a; border-color: transparent; background-color: #313131; text-shadow: none; -gtk-icon-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop:disabled:active, .nemo-window toolbar.horizontal.primary-toolbar button:backdrop:disabled:checked { color: #4a4a4a; border-color: transparent; background-color: #616161; }

#dialog-action_area3 { margin: 5px; }
74 changes: 69 additions & 5 deletions gtk/src/adw-gtk3/gtk-3.0/gtk.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@

textview border { background-color: #fdfdfd; }

.rubberband, rubberband, .content-view rubberband, .content-view .rubberband, treeview.view rubberband, flowbox rubberband { border: 1px solid #1b6acb; background-color: rgba(27, 106, 203, 0.2); }
.rubberband, rubberband, XfdesktopIconView.view .rubberband, .content-view rubberband, .content-view .rubberband, treeview.view rubberband, flowbox rubberband { border: 1px solid #1b6acb; background-color: rgba(27, 106, 203, 0.2); }

flowbox flowboxchild { padding: 3px; }

Expand Down Expand Up @@ -2358,13 +2358,13 @@ list.content > row.expander:checked:not(:first-child), list.content > row.expand

list.content > row:not(:last-child) { border-bottom: 1px solid #e1e1e1; border-bottom-left-radius: 0; border-bottom-right-radius: 0; }

list.content > row:not(:first-child):not(:last-child) { border-radius: 0; }
list.content > row:not(:first-child):not(:last-child) { border-radius: 0; -gtk-outline-radius: 0; }

list.content > row:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; }
list.content > row:first-child { border-top-left-radius: 12px; border-top-right-radius: 12px; -gtk-outline-radius: 12px 12px 0 0; }

list.content > row:last-child { border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; }
list.content > row:last-child { border-top-left-radius: 0; border-top-right-radius: 0; border-bottom-left-radius: 12px; border-bottom-right-radius: 12px; -gtk-outline-radius: 0 0 12px 12px; }

list.content > row:only-child { border-bottom: none; border-radius: 12px; }
list.content > row:only-child { border-bottom: none; border-radius: 12px; -gtk-outline-radius: 12px; }

list.content > row:not(:selected):hover { background-color: #f9f9f9; }

Expand Down Expand Up @@ -2608,6 +2608,14 @@ geary-conversation-viewer#conversation_viewer searchbar > revealer > box { backg

window#guake-terminal notebook header { background: #ebebeb; }

XfdesktopIconView.view { background: transparent; color: #eeeeee; border-radius: 6px; }

XfdesktopIconView.view:active { background: rgba(24, 95, 180, 0.5); text-shadow: 0 1px 1px black; }

XfdesktopIconView.view .label { text-shadow: 1px 1px 2px black; }

XfdesktopIconView.view .rubberband { border-radius: 0; }

.xfce4-panel.background { border: none; background-color: #1e1e1e; color: #ffffff; }

.xfce4-panel.background button { padding: 0; min-height: 12px; min-width: 12px; border-radius: 0; color: #ffffff; border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; }
Expand All @@ -2627,3 +2635,59 @@ window#guake-terminal notebook header { background: #ebebeb; }
.xfce4-panel.background button menu .linked button { color: black; outline-color: rgba(0, 0, 0, 0.3); border-color: transparent; background-color: #e1e1e1; box-shadow: none; }

.xfce4-panel.background button menu .linked button:disabled { color: #949494; border-color: transparent; background-color: #ededed; text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; border-color: rgba(207, 207, 207, 0.5); }

.nemo-desktop.nemo-canvas-item { color: #ffffff; text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.8); }

.nemo-properties-dialog .dialog-action-box .dialog-action-area { margin: 2px 6px 4px; }

.nemo-properties-dialog toolbar stackswitcher.linked button { margin-right: 0; }

.nemo-properties-dialog toolbar stackswitcher.linked button:backdrop { color: #949494; background-color: #fafafa; }

.nemo-window .sidebar scrolledwindow.frame.nemo-places-sidebar { border: none; }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview { background-image: image(#fafafa); border-radius: 0; }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview:backdrop { background-image: image(#fcfcfc); }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview:selected { background: #3584e4; }

.nemo-window .sidebar viewport.frame box.vertical treeview.view.places-treeview:not(:selected):not(:backdrop):hover { background-image: image(rgba(46, 46, 46, 0.05)); }

.nemo-window .nemo-inactive-pane .view, .nemo-window .nemo-inactive-pane iconview { background-color: #fafafa; }

.nemo-window .nemo-window-pane widget.entry { border: 1px solid; border-radius: 3px; color: #2e2e2e; border-color: #3584e4; background-color: #fafafa; }

.nemo-window .nemo-window-pane widget.entry:selected { border: 1px solid; border-radius: 3px; color: #ffffff; border-color: #3584e4; background-color: #3584e4; }

.nemo-window toolbar.horizontal.primary-toolbar { border-bottom: 1px solid #cfcfcf; }

.nemo-window toolbar.horizontal.primary-toolbar widget.linked.raised button:first-child widget { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }

.nemo-window toolbar.horizontal.primary-toolbar widget.linked.raised button:last-child widget { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }

.nemo-window toolbar.horizontal.primary-toolbar toolitem box widget * { min-height: 0; min-width: 0; }

.nemo-window toolbar.horizontal.primary-toolbar .linked button { margin-right: 0; }

.nemo-window toolbar.horizontal.primary-toolbar button { color: #2e2e2e; outline-color: rgba(46, 46, 46, 0.3); border-color: transparent; background-color: #e1e1e1; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:hover { color: #2e2e2e; outline-color: rgba(46, 46, 46, 0.3); border-color: transparent; background-color: #d4d4d4; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:active, .nemo-window toolbar.horizontal.primary-toolbar button:checked { color: #2e2e2e; outline-color: rgba(46, 46, 46, 0.3); border-color: transparent; background-color: #aeaeae; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:active:hover, .nemo-window toolbar.horizontal.primary-toolbar button:checked:hover { background-color: #a1a1a1; }

.nemo-window toolbar.horizontal.primary-toolbar button:disabled { color: #949494; border-color: transparent; background-color: #ededed; text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:disabled:active, .nemo-window toolbar.horizontal.primary-toolbar button:disabled:checked { color: #949494; border-color: transparent; background-color: #bdbdbd; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop { color: #949494; border-color: transparent; background-color: #ededed; text-shadow: none; -gtk-icon-shadow: none; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop:active, .nemo-window toolbar.horizontal.primary-toolbar button:backdrop:checked { color: #949494; border-color: transparent; background-color: #bdbdbd; box-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop:disabled { color: #d4d4d4; border-color: transparent; background-color: #ededed; text-shadow: none; -gtk-icon-shadow: none; }

.nemo-window toolbar.horizontal.primary-toolbar button:backdrop:disabled:active, .nemo-window toolbar.horizontal.primary-toolbar button:backdrop:disabled:checked { color: #d4d4d4; border-color: transparent; background-color: #bdbdbd; }

#dialog-action_area3 { margin: 5px; }

0 comments on commit b3f6604

Please sign in to comment.