diff --git a/eww/eww.css b/eww/eww.css index 05e9a18..edc9ead 100644 --- a/eww/eww.css +++ b/eww/eww.css @@ -111,40 +111,6 @@ tooltip { background-color: rgba(128, 128, 128, 0.5); } -/* Panel widgets */ -.panel_mini_widg { - border-radius: 2px; - background-color: rgba(108, 110, 114, 0.74); -} -.panel_mini_widg.panel_time { - padding: 0 2px; - background-color: rgba(29, 80, 69, 0.74); -} -.panel_mini_widg.panel_date { - padding: 0 2px; - background-color: rgba(109, 75, 173, 0.74); -} -.panel_mini_widg.panel_ico { - font-family: "icon-font"; - border-radius: 4px; - background-color: rgba(109, 75, 173, 0.74); -} -.panel_mini_widg.panel_bat_ico { - background-color: rgba(235, 92, 223, 0.74); -} -.panel_mini_widg.panel_vol_ico { - background-color: rgba(201, 243, 84, 0.74); -} -.panel_mini_widg.panel_brit_ico { - background-color: rgba(211, 80, 76, 0.74); -} -.panel_mini_widg.panel_wifi_ico { - background-color: rgba(76, 231, 154, 0.74); -} -.panel_mini_widg.panel_notif_ico { - background-color: rgba(76, 180, 212, 0.74); -} - /* Panel */ .panel_widg { background-color: rgba(128, 128, 128, 0.5); @@ -159,4 +125,42 @@ tooltip { background-color: rgba(96, 211, 196, 0.863); } +/* Panel widgets */ +.panel_mini_widg { + border-radius: 2px; + background-color: rgba(108, 110, 114, 0.74); +} +.panel_mini_widg.panel_text_widg { + font-family: "Iosevka"; + font-size: 14px; + padding: 0 2px; +} +.panel_mini_widg.panel_text_widg.panel_time { + background-color: rgba(29, 80, 69, 0.74); +} +.panel_mini_widg.panel_text_widg.panel_date { + background-color: rgba(109, 75, 173, 0.74); +} +.panel_mini_widg.panel_ico { + font-family: "icon-font"; + border-radius: 4px; + font-size: 14px; + background-color: rgba(109, 75, 173, 0.74); +} +.panel_mini_widg.panel_ico.panel_bat_ico { + background-color: rgba(235, 92, 223, 0.74); +} +.panel_mini_widg.panel_ico.panel_vol_ico { + background-color: rgba(201, 243, 84, 0.74); +} +.panel_mini_widg.panel_ico.panel_brit_ico { + background-color: rgba(211, 80, 76, 0.74); +} +.panel_mini_widg.panel_ico.panel_wifi_ico { + background-color: rgba(76, 231, 154, 0.74); +} +.panel_mini_widg.panel_ico.panel_notif_ico { + background-color: rgba(76, 180, 212, 0.74); +} + /*# sourceMappingURL=eww.css.map */ diff --git a/eww/eww.css.map b/eww/eww.css.map index 1564e05..7d04497 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_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,kBNgDqB;;AM9CrB;EACI;EACA,kBN+CY;;AM5ChB;EACI;EACA,kBN4CY;;AMxChB;EACI;EACA;EACA,kBNqCY;;AMjChB;EACI,kBNsCe;;AMnCnB;EACI,kBNoCe;;AMjCnB;EACI,kBNkCgB;;AM/BpB;EACI,kBNgCgB;;AM7BpB;EACI,kBN8BiB;;;AOtEzB;AAEA;EACI,kBPyCW;;AOvCX;EACI,kBPwCa;;AOtCjB;EACI,kBPsCW;;AOpCf;EACI,kBPoCY","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.scss","scss/panel/_panel_widgets.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;;;AMxClB;AAEA;EACI,kBNyCW;;AMvCX;EACI,kBNwCa;;AMtCjB;EACI,kBNsCW;;AMpCf;EACI,kBNoCY;;;AOlBhB;AACA;EACI;EACA,kBPkBiB;;AOhBjB;EACI;EACA;EACA;;AA5BR;EAEQ,kBP0CQ;;AO5ChB;EAEQ,kBP4CQ;;AObZ;EACI;EACA;EACA;EACA,kBPSQ;;AOvDhB;EACI,kBP4De;;AO7DnB;EACI,kBP8De;;AO/DnB;EACI,kBPgEgB;;AOjEpB;EACI,kBPkEgB;;AOnEpB;EACI,kBPoEiB","file":"eww.css"} \ No newline at end of file diff --git a/eww/scss/panel/_panel.scss b/eww/scss/panel/_panel.scss index 4192791..964aae0 100644 --- a/eww/scss/panel/_panel.scss +++ b/eww/scss/panel/_panel.scss @@ -14,4 +14,6 @@ .panel_right { background-color: $panel_left_bg_col; } -} \ No newline at end of file +} + +@include panel_widgets; \ No newline at end of file diff --git a/eww/scss/panel/_panel_widgets.scss b/eww/scss/panel/_panel_widgets.scss index 5ceabb5..7c02505 100644 --- a/eww/scss/panel/_panel_widgets.scss +++ b/eww/scss/panel/_panel_widgets.scss @@ -1,46 +1,60 @@ @use "../colors/_glassy.scss" as *; -/* Panel widgets */ -.panel_mini_widg { - border-radius: 2px; - background-color: $panel_mini_widg_bg_col; +@mixin panel_ico_style($ico_class, $ico_bg, $ico_col: null) { + &.#{$ico_class} { + background-color: $ico_bg; + @if $ico_col { + color: $ico_col; + } + } +} - &.panel_time { - padding: 0 2px; - background-color: $panel_time_bg_col; - //color: $panel_time_text_col; - } - &.panel_date { - padding: 0 2px; - background-color: $panel_date_bg_col; - //color: $panel_date_text_col; +@mixin panel_text_widg_style($widg_class, $widg_bg:null, $widg_padding: null, $text_col:null, $font:null, $fontsize:null) { + &.#{$widg_class} { + @if $widg_bg { + background-color: $widg_bg; + } + @if $text_col { + color: $text_col; + } + @if $widg_padding { + padding: $widg_padding; + } + @if $font { + font-family: $font; + } + @if $fontsize { + font-size: $fontsize; + } } +} - &.panel_ico { - font-family: "icon-font"; - border-radius: 4px; - background-color: $panel_date_bg_col; - //color: $panel_date_text_col; - } - - &.panel_bat_ico { - background-color: $panel_ico_bat_bg_col; - //color: $panel_ico_bat_text_col; - } - &.panel_vol_ico { - background-color: $panel_ico_vol_bg_col; - //color: $panel_ico_vol_text_col; - } - &.panel_brit_ico { - background-color: $panel_ico_brit_bg_col; - //color: $panel_ico_brit_text_col; - } - &.panel_wifi_ico { - background-color: $panel_ico_wifi_bg_col; - //color: $panel_ico_wifi_text_col; - } - &.panel_notif_ico { - background-color: $panel_ico_notif_bg_col; - //color: $panel_ico_wifi_text_col; +@mixin panel_widgets { + /* Panel widgets */ + .panel_mini_widg { + border-radius: 2px; + background-color: $panel_mini_widg_bg_col; + + &.panel_text_widg { + font-family: "Iosevka"; + font-size: 14px; + padding: 0 2px; + @include panel_text_widg_style("panel_time", $panel_time_bg_col); + @include panel_text_widg_style("panel_date", $panel_date_bg_col); + } + + &.panel_ico { + font-family: "icon-font"; + border-radius: 4px; + font-size: 14px; + background-color: $panel_date_bg_col; + //color: $panel_date_text_col; + + @include panel_ico_style("panel_bat_ico", $panel_ico_bat_bg_col); + @include panel_ico_style("panel_vol_ico", $panel_ico_vol_bg_col); + @include panel_ico_style("panel_brit_ico", $panel_ico_brit_bg_col); + @include panel_ico_style("panel_wifi_ico", $panel_ico_wifi_bg_col); + @include panel_ico_style("panel_notif_ico", $panel_ico_notif_bg_col); + } } } \ 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 index 5b7d2ba..b4e9c05 100644 --- a/eww/yuck/panel/panel_widgs/panel_clock.yuck +++ b/eww/yuck/panel/panel_widgs/panel_clock.yuck @@ -1,6 +1,6 @@ (defwidget panel_time [h] (label - :class "panel_mini_widg panel_time" + :class "panel_mini_widg panel_text_widg panel_time" :halign "end" :valign "end" :height "${h}" diff --git a/eww/yuck/panel/panel_widgs/panel_date.yuck b/eww/yuck/panel/panel_widgs/panel_date.yuck index fe6b1ba..c53417a 100644 --- a/eww/yuck/panel/panel_widgs/panel_date.yuck +++ b/eww/yuck/panel/panel_widgs/panel_date.yuck @@ -1,6 +1,6 @@ (defwidget panel_date [h] (label - :class "panel_mini_widg panel_date" + :class "panel_mini_widg panel_text_widg panel_date" :halign "end" :valign "end" :height "${h}"