diff --git a/de/home/.config/eww/modules/bar/workspaces.yuck b/de/home/.config/eww/modules/bar/workspaces.yuck index 3bee94c..7be886a 100644 --- a/de/home/.config/eww/modules/bar/workspaces.yuck +++ b/de/home/.config/eww/modules/bar/workspaces.yuck @@ -29,31 +29,31 @@ :space-evenly false :halign "start" - (revealer - :class "ws-left" - :reveal wsreveal - :transition "slideleft" - :duration "500ms" - (box - (for entry in array - (literal - :visible {((entry.num <= activeWorkspace) && !entry.focused) ? true : false} - :content {((entry.num <= activeWorkspace) && !entry.focused) ? "(workspace :ws entry :side 'left')" : "(box :visible false)"})))) - (box - (for entry in array - (literal - :visible {entry.focused ? true : false} - :content {entry.focused ? "(workspace :ws entry :side 'center')" : "(box :visible false)"}))) - (revealer - :class "ws-right" - :reveal wsreveal - :transition "slideright" - :duration "500ms" - (box - (for entry in array - (literal - :visible {((entry.num >= activeWorkspace) && !entry.focused) ? true : false} - :content {((entry.num >= activeWorkspace) && !entry.focused) ? "(workspace :ws entry :side 'right')" : "(box :visible false)"}))))))) + (revealer + :class "ws-left" + :reveal wsreveal + :transition "slideleft" + :duration "500ms" + (box + (for entry in array + (literal + :visible {((entry.num <= activeWorkspace) && !entry.focused) ? true : false} + :content {((entry.num <= activeWorkspace) && !entry.focused) ? "(workspace :ws entry :side 'left')" : "(box :visible false)"})))) + (box + (for entry in array + (literal + :visible {entry.focused ? true : false} + :content {entry.focused ? "(workspace :ws entry :side 'center')" : "(box :visible false)"}))) + (revealer + :class "ws-right" + :reveal wsreveal + :transition "slideright" + :duration "500ms" + (box + (for entry in array + (literal + :visible {((entry.num >= activeWorkspace) && !entry.focused) ? true : false} + :content {((entry.num >= activeWorkspace) && !entry.focused) ? "(workspace :ws entry :side 'right')" : "(box :visible false)"}))))))) ;) ; (for entry in array diff --git a/de/home/.config/eww/style/bar.scss b/de/home/.config/eww/style/bar.scss index 9f988ad..ee5c239 100644 --- a/de/home/.config/eww/style/bar.scss +++ b/de/home/.config/eww/style/bar.scss @@ -12,93 +12,67 @@ $bar-reveal-children-bg-color: rgba($color0, 0.1); border-radius: $bar-module-border-radius; border: 3px solid $bar-module-fg-color; box-shadow: 0px 0px 9px 0px $bar-module-fg-color; -// &>box:not(.workspaces), -// &>box.revealer-on-hover, .revealer-on-hover>widget>box>box>*, -// .revealer-on-hover>widget>box>box>button, .reveal_children>*, &>button, &>label { color: $bar-module-fg-color; -// background-color: $bar-bg-color; border-radius: $bar-module-border-radius; margin: 0px 5px; -// padding: 0px 5px; -// margin-left: -5px; min-width: $bar-module-width; -// border: 2px solid $bar-module-fg-color; -// background-color: $bar-module-bg-color; -// box-shadow: 4px 0 3px -2px $bar-module-fg-color; + &:first-child { + margin-left: 0px; + } +// &:last-child { +// margin-right: 0px; +// } } .revealer-on-hover>widget>box>box>* { -// .revealer-on-hover>widget>box>box>button { -// margin-right: 0px; border-radius: 8px; } .revealer-on-hover>widget>box>box>*, -// .revealer-on-hover>widget>box>box>button, .reveal_children>*, -// &>box.revealer-on-hover:not(:last-child), &>button, &>label { -// &>:not(:last-child) { box-shadow: 3px 0 3px -2px $bar-module-fg-color; -// } -// margin-left: -5px; } -// .revealer-on-hover:not(:last-child) { -// margin: 0px 10px; -// } .revealer-on-hover.true { background-color: $bar-reveal-children-bg-color; border-radius: 8px; } .reveal_children { -// background-color: $bar-reveal-children-bg-color; border-radius: 0px $bar-module-border-radius $bar-module-border-radius 0px; } .reveal_children>* { margin-left: -6px; -// background-color: $bar-reveal-children-bg-color; -// margin: 0px; -// border-radius: 0px $bar-module-border-radius $bar-module-border-radius 0px; -// padding: -10px; -// &:first-child { -// margin-left: 5px; -// color: red; -// box-shadow: -4px 0px 2px -2px red, 5px 0 3px -2px $bar-module-fg-color; -// } } } .workspaces { color: $bar-module-fg-color; -// border-radius: $bar-module-border-radius; margin: 0px 5px; -// min-width: $bar-module-width; -// border: 2px solid $bar-module-fg-color; -// background-color: $bar-module-bg-color; -// margin-left: 5px; revealer { &.ws-left { padding-left: 5px; + button { + background-color: $bar-reveal-children-bg-color; + } } &.ws-right { - padding-right: 1px; + padding-right: 5px; + button { + background-color: $bar-reveal-children-bg-color; + } } } button { min-width: 35px; transition: all 0.3s; -// padding: 0px 0px; &.left { -// border-right: 1px solid $bar-module-fg-color; -// border-left: 1px solid $bar-module-fg-color; margin-right: -2px; border-radius: $bar-module-border-radius - 2; box-shadow: -4px 0 3px -2px $bar-module-fg-color; -// background-color: $bar-reveal-children-bg-color; } &.center { color: $bar-module-fg-color; @@ -106,12 +80,9 @@ $bar-reveal-children-bg-color: rgba($color0, 0.1); box-shadow: 0 0 2px 1px $bar-module-fg-color; } &.right { -// border-left: 1px solid $bar-module-fg-color; -// border-right: 1px solid $bar-module-fg-color; margin-left: -2px; border-radius: $bar-module-border-radius - 1; box-shadow: 4px 0 3px -2px $bar-module-fg-color; -// background-color: $bar-reveal-children-bg-color; } label { padding: 4px 6px; @@ -155,8 +126,7 @@ $bar-reveal-children-bg-color: rgba($color0, 0.1); &>box>label, .bar-module>button, .bar-module>label, -// .revealer-on-hover>widget>box>box>*, - .revealer-on-hover>widget>box>box>button, + .revealer-on-hover>widget>box>box>*, .reveal_children>* { padding: 0px 5px; min-width: $bar-module-width; @@ -166,9 +136,6 @@ $bar-reveal-children-bg-color: rgba($color0, 0.1); text-shadow: $bar-module-hover-shadow; } } -// .reveal_children>* { -// border-left: 1px solid $bar-module-fg-color; -// } .tray>widget>image, .scratchpad>button>image { padding: 3px 4px; @@ -188,9 +155,6 @@ $bar-reveal-children-bg-color: rgba($color0, 0.1); .datetime { font-weight: bold; } -// .chevron { -// margin-right: 10px; -// } .chevron box { border: 2px solid transparent; box-shadow: 8px -8px 10px -8px black;