mirror of
https://github.com/vinceliuice/Colloid-gtk-theme.git
synced 2025-09-15 21:08:39 -07:00
Merge branch 'main' of github.com:vinceliuice/Colloid-gtk-theme
This commit is contained in:
vinceliuice
@@ -509,9 +509,7 @@ theme_tweaks() {
|
||||
}
|
||||
|
||||
uninstall_link() {
|
||||
[[ -L "${HOME}/.config/gtk-4.0/assets" ]] && rm -rf "${HOME}/.config/gtk-4.0/assets" && echo -e "\nUninstall ${HOME}/.config/gtk-4.0/assets link ..."
|
||||
[[ -L "${HOME}/.config/gtk-4.0/gtk.css" ]] && rm -rf "${HOME}/.config/gtk-4.0/gtk.css" && echo -e "Uninstall ${HOME}/.config/gtk-4.0/gtk.css link ..."
|
||||
[[ -L "${HOME}/.config/gtk-4.0/gtk-dark.css" ]] && rm -rf "${HOME}/.config/gtk-4.0/gtk-dark.css" && echo -e "Uninstall ${HOME}/.config/gtk-4.0/gtk-dark.css link ..."
|
||||
rm -rf "${HOME}/.config/gtk-4.0/"{assets,windows-assets,gtk.css,gtk-dark.css} && echo -e "\nUninstall ${HOME}/.config/gtk-4.0 links ..."
|
||||
}
|
||||
|
||||
link_libadwaita() {
|
||||
|
||||
@@ -1052,6 +1052,11 @@ toolbar {
|
||||
border-width: 0 1px 1px;
|
||||
border-color: $divider;
|
||||
background-color: $base-alt;
|
||||
|
||||
.frame & {
|
||||
border-width: 1px 0 0;
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
searchbar > revealer > box,
|
||||
@@ -1311,6 +1316,11 @@ searchbar > revealer > box {
|
||||
padding: $space-size $space-size * 2;
|
||||
border-radius: $window-radius $window-radius 0 0;
|
||||
box-shadow: inset 0 1px highlight($titlebar);
|
||||
background-color: $titlebar;
|
||||
|
||||
&:backdrop {
|
||||
background-color: $titlebar-backdrop;
|
||||
}
|
||||
|
||||
.tiled &,
|
||||
.maximized &,
|
||||
@@ -1631,14 +1641,11 @@ menubar,
|
||||
|
||||
&:backdrop {
|
||||
color: $titlebar-text-secondary;
|
||||
background-color: $titlebar-backdrop;
|
||||
}
|
||||
|
||||
.csd & {
|
||||
transition: $transition;
|
||||
|
||||
&:backdrop {
|
||||
background-color: $titlebar-backdrop;
|
||||
}
|
||||
}
|
||||
|
||||
> menuitem {
|
||||
@@ -1903,16 +1910,22 @@ notebook {
|
||||
border-radius: $modal-radius + $space-size;
|
||||
}
|
||||
|
||||
&.frame frame {
|
||||
> border {
|
||||
&.frame {
|
||||
scrolledwindow.frame {
|
||||
border: none;
|
||||
border-radius: $modal-radius;
|
||||
}
|
||||
|
||||
> list {
|
||||
// @extend %circular_list;
|
||||
frame {
|
||||
> border {
|
||||
border: none;
|
||||
border-radius: $modal-radius;
|
||||
}
|
||||
|
||||
row.activatable { border-radius: $corner-radius; }
|
||||
> list {
|
||||
// @extend %circular_list;
|
||||
|
||||
row.activatable { border-radius: $corner-radius; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2405,7 +2418,7 @@ treeview.view {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
||||
&:not(:hover):not(:disabled):not(:checked):not(:indeterminate) {
|
||||
&:not(:disabled):not(:checked):not(:indeterminate) {
|
||||
background-color: $divider;
|
||||
}
|
||||
|
||||
@@ -2414,7 +2427,7 @@ treeview.view {
|
||||
}
|
||||
}
|
||||
|
||||
&:selected, &:selected:focus {
|
||||
&, &:hover, &:selected {
|
||||
radio, check {
|
||||
&:checked, &:indeterminate {
|
||||
background-color: $assets-color;
|
||||
@@ -3651,7 +3664,6 @@ colorchooser .popover.osd {
|
||||
decoration {
|
||||
transition: $transition-shadow;
|
||||
border-radius: $window-radius;
|
||||
// background-color: $background;
|
||||
|
||||
@if $rimless == 'true' {
|
||||
box-shadow: $shadow-z16, 0 0 36px transparent;
|
||||
|
||||
@@ -1625,7 +1625,7 @@ headerbar {
|
||||
}
|
||||
}
|
||||
|
||||
popover.background { // reset popover
|
||||
popover.background { // reset popovers
|
||||
button:not(.suggested-action):not(.destructive-action):not(.flat) {
|
||||
@extend %button-basic;
|
||||
}
|
||||
@@ -1639,6 +1639,15 @@ headerbar {
|
||||
}
|
||||
|
||||
entry { @extend %entry-basic; }
|
||||
|
||||
entry,
|
||||
spinbutton,
|
||||
button,
|
||||
menubutton,
|
||||
stackswitcher {
|
||||
margin-top: 0;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
separator:not(.sidebar) {
|
||||
@@ -2051,11 +2060,13 @@ popover.menu {
|
||||
/************
|
||||
* Popovers *
|
||||
************/
|
||||
popover.background {
|
||||
font: initial;
|
||||
popover {
|
||||
&.background {
|
||||
font: initial;
|
||||
|
||||
&, &:backdrop {
|
||||
background-color: transparent;
|
||||
&, &:backdrop {
|
||||
background-color: transparent;
|
||||
}
|
||||
}
|
||||
|
||||
> arrow,
|
||||
@@ -2074,14 +2085,6 @@ popover.background {
|
||||
background-clip: border-box;
|
||||
box-shadow: 0 0 0 1px $window-border, $shadow-z5;
|
||||
}
|
||||
|
||||
&:backdrop {
|
||||
@if $rimless == 'true' {
|
||||
box-shadow: $shadow-z3;
|
||||
} @else {
|
||||
box-shadow: $shadow-z3, 0 0 0 1px $window-border;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@if $rimless == 'false' and $variant == 'light' {
|
||||
@@ -2490,8 +2493,8 @@ tabbar {
|
||||
}
|
||||
|
||||
> separator {
|
||||
margin-top: 9px;
|
||||
margin-bottom: 9px;
|
||||
margin: 9px 0;
|
||||
min-width: 1px;
|
||||
transition: opacity 150ms ease-in-out;
|
||||
|
||||
&.hidden {
|
||||
@@ -2501,6 +2504,7 @@ tabbar {
|
||||
|
||||
> tabboxchild {
|
||||
margin: 0 -3px;
|
||||
padding: 0;
|
||||
|
||||
> tab {
|
||||
@extend %tabs_tab;
|
||||
@@ -4743,12 +4747,32 @@ colorchooser .popover.osd {
|
||||
**********************/
|
||||
window {
|
||||
border: none;
|
||||
transition: $transition-shadow;
|
||||
|
||||
&.csd {
|
||||
border-radius: $window-radius;
|
||||
outline-offset: -1px;
|
||||
outline: 1px solid highlight($background);
|
||||
margin: 0;
|
||||
|
||||
@if $rimless == 'true' {
|
||||
box-shadow: $shadow-z16, 0 0 36px transparent;
|
||||
} @else {
|
||||
box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent;
|
||||
}
|
||||
|
||||
&:backdrop {
|
||||
// the transparent shadow here is to enforce that the shadow extents don't
|
||||
// change when we go to backdrop, to prevent jumping windows.
|
||||
// The biggest shadow should be in the same order then in the active state
|
||||
// or the jumping will happen during the transition.
|
||||
transition: $transition-shadow;
|
||||
|
||||
@if $rimless == 'true' {
|
||||
box-shadow: $shadow-z4, 0 0 36px transparent;
|
||||
} @else {
|
||||
box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent;
|
||||
}
|
||||
}
|
||||
|
||||
&.maximized,
|
||||
&.fullscreen,
|
||||
@@ -4756,24 +4780,9 @@ window {
|
||||
&.tiled-top,
|
||||
&.tiled-right,
|
||||
&.tiled-bottom,
|
||||
&.tiled-left { border-radius: 0; }
|
||||
}
|
||||
|
||||
@if $rimless == 'true' {
|
||||
box-shadow: $shadow-z16, 0 0 36px transparent;
|
||||
} @else {
|
||||
box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent;
|
||||
}
|
||||
|
||||
&:backdrop {
|
||||
// the transparent shadow here is to enforce that the shadow extents don't
|
||||
// change when we go to backdrop, to prevent jumping windows.
|
||||
// The biggest shadow should be in the same order then in the active state
|
||||
// or the jumping will happen during the transition.
|
||||
@if $rimless == 'true' {
|
||||
box-shadow: $shadow-z4, 0 0 36px transparent;
|
||||
} @else {
|
||||
box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent;
|
||||
&.tiled-left {
|
||||
border-radius: 0;
|
||||
transition: none;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4927,7 +4936,7 @@ windowcontrols {
|
||||
background-color: $primary;
|
||||
}
|
||||
|
||||
.monospace { font-family: monospace; }
|
||||
// .monospace { font-family: monospace; }
|
||||
|
||||
|
||||
/**********************
|
||||
|
||||
@@ -98,12 +98,20 @@ window.dialog {
|
||||
// Calculator
|
||||
//
|
||||
|
||||
.history-view { background-color: $base; }
|
||||
.display-container {
|
||||
&.card {
|
||||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
border-width: 0 0 1px 0;
|
||||
}
|
||||
|
||||
.sourceview {
|
||||
padding: 0 12px 8px 0;
|
||||
font-size: 1.4em;
|
||||
border-top: 1px solid $border;
|
||||
.history-view { background-color: $base; }
|
||||
|
||||
#displayitem {
|
||||
padding: 0 12px 8px 0;
|
||||
font-size: 1.4em;
|
||||
border-top: 1px solid $border;
|
||||
}
|
||||
}
|
||||
|
||||
.math-buttons button {
|
||||
@@ -116,19 +124,6 @@ window.dialog {
|
||||
}
|
||||
}
|
||||
|
||||
.small .card {
|
||||
border-radius: 0;
|
||||
box-shadow: none;
|
||||
|
||||
&.forecast-card {
|
||||
border-width: 1px 0;
|
||||
}
|
||||
|
||||
&.display-container {
|
||||
border-width: 0 0 1px 0;
|
||||
}
|
||||
}
|
||||
|
||||
leaflet {
|
||||
button.number-button {
|
||||
background-color: rgba($text, 0.1);
|
||||
@@ -1127,11 +1122,10 @@ window > contents > leaflet { // Gnome control center
|
||||
// Gnome Weather
|
||||
//
|
||||
|
||||
@define-color weather_temp_chart_fill_color: #{rgba(248, 228, 92, 0.5)};
|
||||
@define-color weather_temp_chart_stroke_color: #{rgba(246, 211, 45, 1.0)};
|
||||
|
||||
@define-color weather_thermometer_warm_color: #{if($variant == 'light', $yellow-dark, $yellow-light)};
|
||||
@define-color weather_thermometer_cold_color: #{if($variant == 'light', $blue-dark, $blue-light)};
|
||||
@define-color weather_temp_chart_fill_color #{rgba($warning, 0.5)};
|
||||
@define-color weather_temp_chart_stroke_color #{darken($warning, 10%)};
|
||||
@define-color weather_thermometer_warm_color #{if($variant == 'light', $yellow-dark, $yellow-light)};
|
||||
@define-color weather_thermometer_cold_color #{if($variant == 'light', $blue-dark, $blue-light)};
|
||||
|
||||
$weather_thermometer_high_color: $yellow-light;
|
||||
$weather_thermometer_low_color: $blue-light;
|
||||
@@ -1166,6 +1160,7 @@ $weather_forecast_color: #ae7b03;
|
||||
.forecast-card {
|
||||
transition: border-radius 100ms ease-out;
|
||||
border-radius: $corner-radius;
|
||||
border-width: 1px 0;
|
||||
}
|
||||
|
||||
.forecast-card separator {
|
||||
@@ -1484,11 +1479,3 @@ window.dialog {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
window.aboutdialog {
|
||||
stack scrolledwindow.frame > {
|
||||
&, viewport.view {
|
||||
border-radius: $window-radius - $space-size;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,6 +46,16 @@ wnck-pager {
|
||||
&:selected { background-color: $primary; }
|
||||
}
|
||||
|
||||
#xfce4-mpc-plugin-26 {
|
||||
> frame > border {
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
|
||||
#xfce-panel-button {
|
||||
-gtk-icon-style: symbolic;
|
||||
}
|
||||
|
||||
XfdesktopIconView.view {
|
||||
border-radius: $corner-radius;
|
||||
background-color: transparent;
|
||||
|
||||
Reference in New Issue
Block a user