Fixed issues

pull/202/head
vinceliuice 4 years ago
parent 704da97872
commit 6995a97ea0

@ -301,8 +301,8 @@ install_theme() {
link_theme() { link_theme() {
for theme in "${themes[@]}"; do for theme in "${themes[@]}"; do
for color in "${colors[2]}"; do for color in "${colors[@]}"; do
for size in "${sizes[0]}"; do for size in "${SIZE_VARIANTS[0]}"; do
link_libadwaita "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size" link_libadwaita "${dest:-$DEST_DIR}" "${_name:-$THEME_NAME}" "$theme" "$color" "$size"
done done
done done

@ -3,16 +3,8 @@
* Base States * * Base States *
***************/ ***************/
.background { .background {
background-color: rgba($background, 1); background-color: $background;
color: $text; color: $text;
&.csd { // Set csd windows botttom border radius
border-radius: $window-radius;
}
&.maximized, &.tiled, &.fullscreen, &.solid-csd { // No radius when windows maximized
border-radius: 0;
}
} }
dnd { dnd {
@ -1088,13 +1080,15 @@ toolbar {
// searchbar // searchbar
searchbar > revealer > box { searchbar > revealer > box {
padding: $container-padding $container-padding * 2; padding: $container-padding;
border-spacing: $container-padding; border-spacing: $container-padding;
border-style: solid; border-style: solid;
border-width: 0 0 1px; border-width: 0 0 1px;
border-color: $divider; border-color: $divider;
background-color: $background; background-color: $background;
background-clip: border-box; background-clip: border-box;
entry { margin: 0; }
} }
/*************** /***************
@ -1691,6 +1685,10 @@ popover.background {
background-color: transparent; background-color: transparent;
} }
> scrolledwindow > viewport > stack > box {
padding: 0;
}
separator { separator {
background-color: $divider; background-color: $divider;
margin: $container-padding / 2 0; margin: $container-padding / 2 0;
@ -1738,9 +1736,12 @@ popover.background {
} }
listview { listview {
padding: 0;
> row { > row {
padding: $container-padding $container-padding * 2; padding: $container-padding $container-padding * 2;
border-radius: $corner-radius / 2; border-radius: $corner-radius / 2;
margin: 0;
} }
} }
} }
@ -3319,12 +3320,6 @@ window.dialog.message { // Message Dialog styling
} }
&.csd { // rounded bottom border styling for csd version &.csd { // rounded bottom border styling for csd version
&.background {
// bigger radius for better antialiasing
border-bottom-left-radius: $window-radius;
border-bottom-right-radius: $window-radius;
}
.dialog-action-area { .dialog-action-area {
// margin-top: -$container-padding; // margin-top: -$container-padding;
padding: $container-padding; padding: $container-padding;
@ -3347,11 +3342,6 @@ window.dialog.message { // Message Dialog styling
} }
filechooser { filechooser {
.csd & {
background-color: $base;
border-radius: 0 0 $window-radius $window-radius;
}
.dialog-action-box { border-top: 1px solid $divider; } .dialog-action-box { border-top: 1px solid $divider; }
#pathbarbox { #pathbarbox {
@ -3365,44 +3355,8 @@ filechooser {
} }
stack.view { stack.view {
background-color: transparent;
scrolledwindow {
background-color: transparent;
border-radius: 0 0 $window-radius 0;
list { background-color: transparent; }
treeview.view {
@extend %view;
background-color: transparent;
}
}
> placesview {
background-color: transparent;
// border-bottom-right-radius: $window-radius;
> actionbar {
&, > revealer > box {
background-color: transparent;
}
}
}
frame > border { border: none; } frame > border { border: none; }
} }
.csd & placessidebar {
background: none;
border-bottom-left-radius: $window-radius;
}
actionbar {
&, > revealer > box {
background-color: transparent;
}
}
} }
filechooserbutton > button > box { filechooserbutton > button > box {
@ -3414,6 +3368,14 @@ filechooserbutton:drop(active) {
border-color: transparent; border-color: transparent;
} }
// aboutdialog
window.aboutdialog {
stack scrolledwindow.frame {
&, > .view, > .view > text {
border-radius: $corner-radius;
}
}
}
/*********** /***********
* Sidebar * * Sidebar *
@ -4134,6 +4096,8 @@ popover.emoji-picker {
background: none; background: none;
entry { entry {
margin: 0;
text { text {
background: none; background: none;
box-shadow: none; box-shadow: none;
@ -4143,15 +4107,16 @@ popover.emoji-picker {
.emoji-toolbar { .emoji-toolbar {
padding: 0; padding: 0;
border-spacing: $container-padding/2; border-spacing: $container-padding / 2;
border-top: 1px solid $divider; border-top: 1px solid $divider;
background: none; background: none;
box-shadow: none;
} }
button.emoji-section { button.emoji-section {
margin: 0; margin: 0;
padding: $container-padding; padding: $container-padding;
border-radius: $corner-radius -$container-padding/2; border-radius: $corner-radius -$container-padding / 2;
&:checked { &:checked {
color: $primary; color: $primary;
@ -4172,7 +4137,7 @@ popover.emoji-picker emoji {
emoji-completion-row { emoji-completion-row {
min-height: $menuitem-size; min-height: $menuitem-size;
padding: 0 $container-padding*2; padding: 0 $container-padding * 2;
> box { > box {
border-spacing: $container-padding; border-spacing: $container-padding;

@ -13,24 +13,28 @@
box-shadow: inset 0 0 0 2px transparent; box-shadow: inset 0 0 0 2px transparent;
background-color: if($fc == $primary, $entry, rgba($fc, 0.08)); background-color: if($fc == $primary, $entry, rgba($fc, 0.08));
color: if($fc == $primary, $text, $fc); color: if($fc == $primary, $text, $fc);
outline: none;
} }
@if $t == hover { @if $t == hover {
background-color: $overlay-hover; background-color: $overlay-hover;
box-shadow: inset 0 0 0 2px $overlay-hover; box-shadow: inset 0 0 0 2px $overlay-hover;
color: if($fc == $primary, $text, $fc); color: if($fc == $primary, $text, $fc);
outline: none;
} }
@if $t == focus { @if $t == focus {
background-color: $overlay-focus; background-color: $overlay-focus;
box-shadow: inset 0 0 0 2px if($fc == $primary, $track, $fc); box-shadow: inset 0 0 0 2px if($fc == $primary, $track, $fc);
color: if($fc == $primary, $text, $fc); color: if($fc == $primary, $text, $fc);
outline: none;
} }
@if $t == checked { @if $t == checked {
background-color: if($fc == $primary, $entry, rgba($fc, 0.08)); background-color: if($fc == $primary, $entry, rgba($fc, 0.08));
box-shadow: inset 0 0 0 2px if($fc == $primary, $primary, $fc); box-shadow: inset 0 0 0 2px if($fc == $primary, $primary, $fc);
color: if($fc == $primary, $text, $fc); color: if($fc == $primary, $text, $fc);
outline: none;
} }
@if $t == disabled { @if $t == disabled {
@ -38,6 +42,7 @@
background-color: if($fc == $primary, $fill, rgba($fc, 0.04)); background-color: if($fc == $primary, $fill, rgba($fc, 0.04));
color: $text-disabled; color: $text-disabled;
color: if($fc == $primary, $text-disabled, rgba($fc, 0.35)); color: if($fc == $primary, $text-disabled, rgba($fc, 0.35));
outline: none;
} }
@if $t == raised-normal { @if $t == raised-normal {
@ -46,21 +51,25 @@
box-shadow: inset 0 0 0 2px transparent; box-shadow: inset 0 0 0 2px transparent;
background-color: if($fc == $primary, $surface, $fc); background-color: if($fc == $primary, $surface, $fc);
color: if($fc == $primary, $text, on($fc)); color: if($fc == $primary, $text, on($fc));
outline: none;
} }
@if $t == raised-hover { @if $t == raised-hover {
box-shadow: inset 0 0 0 2px $overlay-hover; box-shadow: inset 0 0 0 2px $overlay-hover;
outline: none;
} }
@if $t == raised-focus { @if $t == raised-focus {
border-image: none; border-image: none;
box-shadow: inset 0 0 0 2px if($fc == $primary, $primary, $fc); box-shadow: inset 0 0 0 2px if($fc == $primary, $primary, $fc);
outline: none;
} }
@if $t == raised-disabled { @if $t == raised-disabled {
box-shadow: inset 0 0 0 2px transparent; box-shadow: inset 0 0 0 2px transparent;
background-color: $base-alt; background-color: $base-alt;
color: $text-disabled; color: $text-disabled;
outline: none;
} }
} }

@ -679,8 +679,8 @@ dnd {
tab { tab {
min-height: $menuitem-size; min-height: $menuitem-size;
padding: $container-padding / 2 $container-padding; padding: $container-padding / 2 $container-padding;
border-radius: $menu-radius; border-radius: $corner-radius / 2;
margin: 0 2px; margin: 0 1px;
button.image-button { button.image-button {
padding: 0; padding: 0;
@ -729,4 +729,8 @@ leaflet {
border-radius: 0; border-radius: 0;
outline: none; outline: none;
} }
> box > scrolledwindow > viewport > widget > stack {
background-color: $base;
}
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save