diff --git a/eww/eww.css b/eww/eww.css index b399381..65a6ed4 100644 --- a/eww/eww.css +++ b/eww/eww.css @@ -111,6 +111,13 @@ tooltip { background-color: rgba(128, 128, 128, 0.5); } +/* Panel widgets */ +.panel_mini_widg { + padding: 0 2px; + border-radius: 2px; + background-color: rgba(108, 110, 114, 0.74); +} + /* Panel */ .panel_widg { background-color: rgba(128, 128, 128, 0.5); diff --git a/eww/eww.css.map b/eww/eww.css.map index 3d79254..5f7c559 100644 --- a/eww/eww.css.map +++ b/eww/eww.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["scss/common/_common.scss","scss/tooltip/_tooltip.scss","scss/colors/_glassy.scss","scss/osd/_osd.scss","scss/osd/_bat.scss","scss/osd/_bri.scss","scss/osd/_vol.scss","scss/dock/_dock.scss","scss/panel/_panel.scss"],"names":[],"mappings":"AAAA;AACA;EACI;;;ACFJ;AAGA;EACI;EACA,kBCDS;EDET,OCDY;;;ACDhB;AAKI;EACH,eAJI;EAKJ,kBDHY;;ACMT;EAEH;EACA,kBDNc;;ACOd;EAEI,eAdA;;AAgBJ;EAEI;;AClBA;EACH,kBFMyB;;AEJtB;EACH,kBFI6B;;AEF1B;EACH,kBFE0B;;AEAvB;EACH;;AAEG;EACH,kBFF0B;;AEIvB;EACH,kBFJsB;;AEMnB;EACH,kBFNwB;;AEQrB;EACH,kBFRuB;;AEUpB;EACH,kBFVuB;;AGfpB;EACH,kBHyBsB;;AGvBnB;EACH,kBHuBsB;;AGrBnB;EACH,kBHqBuB;;AGnBpB;EACH,kBHmBuB;;AGjBpB;EACH,kBHiBuB;;AI9BpB;EACH,kBJgBsB;;AIdnB;EACH,kBJesB;;AIbnB;EACH,kBJasB;;AIXnB;EACH,kBJWuB;;AITpB;EACH,kBJSuB;;AIPpB;EACH,kBJOuB;;ACErB;EAEH,cA3BI;EA4BJ;EACA;;AAGG;EAEH;EACA;EACA;;;AIzCD;AAEA;EACI;EACA,kBLoCU;;AKnCV;EACI;EACA;EACA;EACA,OLiCc;;AK/Bd;EACI,kBL6BM;;;AMzClB;AAEA;EACI,kBN0CW;;AMxCX;EACI,kBNwCa;;AMtCjB;EACI,kBNsCW;;AMpCf;EACI,kBNoCY","file":"eww.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["scss/common/_common.scss","scss/tooltip/_tooltip.scss","scss/colors/_glassy.scss","scss/osd/_osd.scss","scss/osd/_bat.scss","scss/osd/_bri.scss","scss/osd/_vol.scss","scss/dock/_dock.scss","scss/panel/_panel_widgets.scss","scss/panel/_panel.scss"],"names":[],"mappings":"AAAA;AACA;EACI;;;ACFJ;AAGA;EACI;EACA,kBCDS;EDET,OCDY;;;ACDhB;AAKI;EACH,eAJI;EAKJ,kBDHY;;ACMT;EAEH;EACA,kBDNc;;ACOd;EAEI,eAdA;;AAgBJ;EAEI;;AClBA;EACH,kBFMyB;;AEJtB;EACH,kBFI6B;;AEF1B;EACH,kBFE0B;;AEAvB;EACH;;AAEG;EACH,kBFF0B;;AEIvB;EACH,kBFJsB;;AEMnB;EACH,kBFNwB;;AEQrB;EACH,kBFRuB;;AEUpB;EACH,kBFVuB;;AGfpB;EACH,kBHyBsB;;AGvBnB;EACH,kBHuBsB;;AGrBnB;EACH,kBHqBuB;;AGnBpB;EACH,kBHmBuB;;AGjBpB;EACH,kBHiBuB;;AI9BpB;EACH,kBJgBsB;;AIdnB;EACH,kBJesB;;AIbnB;EACH,kBJasB;;AIXnB;EACH,kBJWuB;;AITpB;EACH,kBJSuB;;AIPpB;EACH,kBJOuB;;ACErB;EAEH,cA3BI;EA4BJ;EACA;;AAGG;EAEH;EACA;EACA;;;AIzCD;AAEA;EACI;EACA,kBLoCU;;AKnCV;EACI;EACA;EACA;EACA,OLiCc;;AK/Bd;EACI,kBL6BM;;;AMzClB;AAEA;EACI;EACA;EACA,kBN4CqB;;;AOhDzB;AAEA;EACI,kBPyCW;;AOvCX;EACI,kBPuCa;;AOrCjB;EACI,kBPqCW;;AOnCf;EACI,kBPmCY","file":"eww.css"} \ No newline at end of file diff --git a/eww/scss/colors/_glassy.scss b/eww/scss/colors/_glassy.scss index b9657b6..3c863d7 100644 --- a/eww/scss/colors/_glassy.scss +++ b/eww/scss/colors/_glassy.scss @@ -48,3 +48,4 @@ $panel_bg_col: rgba(128, 128, 128, 0.5); $panel_right_bg_col: rgba(221, 128, 128, 0.856); $panel_cen_bg_col: rgba(209, 188, 95, 0.849); $panel_left_bg_col: rgba(96, 211, 196, 0.863); +$panel_mini_widg_bg_col: rgba(108, 110, 114, 0.74); diff --git a/eww/scss/panel/_panel.scss b/eww/scss/panel/_panel.scss index a122301..4192791 100644 --- a/eww/scss/panel/_panel.scss +++ b/eww/scss/panel/_panel.scss @@ -1,4 +1,5 @@ @use "../colors/_glassy.scss" as *; +@use "./_panel_widgets.scss" as *; /* Panel */ .panel_widg { diff --git a/eww/scss/panel/_panel_widgets.scss b/eww/scss/panel/_panel_widgets.scss new file mode 100644 index 0000000..8d9e77d --- /dev/null +++ b/eww/scss/panel/_panel_widgets.scss @@ -0,0 +1,8 @@ +@use "../colors/_glassy.scss" as *; +/* Panel widgets */ + +.panel_mini_widg { + padding: 0 2px; + border-radius: 2px; + background-color: $panel_mini_widg_bg_col; +} \ No newline at end of file diff --git a/eww/yuck/panel/panel_widg.yuck b/eww/yuck/panel/panel_widg.yuck index 8458141..815e889 100644 --- a/eww/yuck/panel/panel_widg.yuck +++ b/eww/yuck/panel/panel_widg.yuck @@ -5,13 +5,13 @@ (defwidget panel_widg [h] (centerbox :class "panel_widg" - :halign "fill" + :halign "end" :height "${h}" :width 1366 :active true - (panel_left) - (panel_cen) - (panel_right) + (panel_left :h "${h}") + (panel_cen :h "${h}") + (panel_right :h "${h}") ) ) \ No newline at end of file diff --git a/eww/yuck/panel/panel_widg_cen.yuck b/eww/yuck/panel/panel_widg_cen.yuck index 7709228..29a696c 100644 --- a/eww/yuck/panel/panel_widg_cen.yuck +++ b/eww/yuck/panel/panel_widg_cen.yuck @@ -1,6 +1,6 @@ -(defwidget panel_cen [] +(defwidget panel_cen [h] (box - :class "panel_cen" + :class "panel_side panel_cen" :halign "center" :height 28 :width 300 diff --git a/eww/yuck/panel/panel_widg_left.yuck b/eww/yuck/panel/panel_widg_left.yuck index 3a0a7c6..2b37cea 100644 --- a/eww/yuck/panel/panel_widg_left.yuck +++ b/eww/yuck/panel/panel_widg_left.yuck @@ -1,6 +1,6 @@ -(defwidget panel_left [] +(defwidget panel_left [h] (box - :class "panel_left" + :class "panel_side panel_left" :halign "start" :height 28 :width 300 diff --git a/eww/yuck/panel/panel_widg_right.yuck b/eww/yuck/panel/panel_widg_right.yuck index 501403c..3b78d6a 100644 --- a/eww/yuck/panel/panel_widg_right.yuck +++ b/eww/yuck/panel/panel_widg_right.yuck @@ -1,11 +1,18 @@ -(defwidget panel_right [] +(include "yuck/panel/panel_widgs/panel_clock.yuck") +(include "yuck/panel/panel_widgs/panel_date.yuck") + +(defwidget panel_right [h] (box - :class "panel_right" - :halign "end" - :height 28 - :width 300 - :active true + :class "panel_side panel_right" + :orientation "h" + :halign "end" + :valign "end" + :height "${h}" + ;:width 300 + ;:active false + :space-evenly false - "--panel_right--" + (panel_date :h "${h}") + (panel_time :h "${h}") ) ) \ No newline at end of file diff --git a/eww/yuck/panel/panel_widgs/panel_clock.yuck b/eww/yuck/panel/panel_widgs/panel_clock.yuck new file mode 100644 index 0000000..5b7d2ba --- /dev/null +++ b/eww/yuck/panel/panel_widgs/panel_clock.yuck @@ -0,0 +1,10 @@ +(defwidget panel_time [h] + (label + :class "panel_mini_widg panel_time" + :halign "end" + :valign "end" + :height "${h}" + ;:active true + :text "${formattime(EWW_TIME,"%I:%M%p")}" + ) +) \ No newline at end of file diff --git a/eww/yuck/panel/panel_widgs/panel_date.yuck b/eww/yuck/panel/panel_widgs/panel_date.yuck new file mode 100644 index 0000000..fe6b1ba --- /dev/null +++ b/eww/yuck/panel/panel_widgs/panel_date.yuck @@ -0,0 +1,10 @@ +(defwidget panel_date [h] + (label + :class "panel_mini_widg panel_date" + :halign "end" + :valign "end" + :height "${h}" + ;:active true + :text "${formattime(EWW_TIME,"%b%d")}" + ) +) \ No newline at end of file diff --git a/eww/yuck/panel/panel_window.yuck b/eww/yuck/panel/panel_window.yuck index acd5bfc..b8ef537 100644 --- a/eww/yuck/panel/panel_window.yuck +++ b/eww/yuck/panel/panel_window.yuck @@ -5,8 +5,8 @@ :windowtype "dock" :wm-ignore true :stacking "fg" - :halign "end" - :valign "end" + :halign "center" + :valign "center" :geometry (geometry :anchor "top center"