From c65931a7d728f6cb371c3a42d29637f3bcaecc63 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Fri, 29 Nov 2024 21:49:20 +0545 Subject: [PATCH] fix osd --- config/fabric/main.py | 14 +- config/fabric/modules/osd.py | 274 +++++------ config/fabric/snippets/__init__.py | 7 +- .../fabric/snippets/{util.py => functions.py} | 0 config/fabric/style/bar.css | 120 +++++ config/fabric/style/launcher.css | 218 +++++++++ config/fabric/style/main.css | 458 +----------------- config/fabric/style/notification.css | 37 ++ config/fabric/style/osd.css | 41 ++ 9 files changed, 554 insertions(+), 615 deletions(-) rename config/fabric/snippets/{util.py => functions.py} (100%) create mode 100644 config/fabric/style/bar.css create mode 100644 config/fabric/style/launcher.css create mode 100644 config/fabric/style/notification.css create mode 100644 config/fabric/style/osd.css diff --git a/config/fabric/main.py b/config/fabric/main.py index 5d8a7541..5bf7c7e0 100644 --- a/config/fabric/main.py +++ b/config/fabric/main.py @@ -21,22 +21,22 @@ if __name__ == "__main__": bar = Bar() launcher = Launcher() launcher.hide() - systemOverlay = OSDContainer() + + osd = OSDContainer() notif = NotificationPopup() app = Application( "fabric-bar", bar, launcher, notif, - systemOverlay, + osd, ) - # Monitor main.css file for changes - main_css_file = monitor_file(get_relative_path("style/main.css")) - main_css_file.connect("changed", lambda *args: apply_style(app)) - # Monitor colors.css file for changes + css_file = monitor_file(get_relative_path("style/main.css")) + _ = css_file.connect("changed", lambda *_: apply_style(app)) + color_css_file = monitor_file(f"/home/{os.getlogin()}/.cache/material/colors.css") - color_css_file.connect("changed", lambda *args: apply_style(app)) + _ = color_css_file.connect("changed", lambda *_: apply_style(app)) apply_style(app) diff --git a/config/fabric/modules/osd.py b/config/fabric/modules/osd.py index 194a6b1c..2943cc02 100644 --- a/config/fabric/modules/osd.py +++ b/config/fabric/modules/osd.py @@ -1,46 +1,17 @@ -from dataclasses import dataclass -from typing import Iterator, List +import time +from typing import Literal from fabric.audio import Audio from fabric.widgets.box import Box from fabric.widgets.label import Label +from fabric.widgets.revealer import Revealer from fabric.widgets.scale import Scale, ScaleMark from fabric.widgets.wayland import WaylandWindow as Window from gi.repository import GLib, GObject -from services import Brightness +from services.brightness import Brightness from snippets import Animator, MaterialIcon -@dataclass -class IconMapping: - threshold: float - name: str - - -class BrightnessIcons: - MAPPINGS: List[str] = [ - "brightness_1", - "brightness_2", - "brightness_3", - "brightness_4", - "brightness_5", - "brightness_6", - "brightness_7", - ] - MAX_BRIGHTNESS: float = 100 - RATIO: float = 1.6 - - -class VolumeIcons: - MAPPINGS: List[IconMapping] = [ - IconMapping(101, "sound_detection_loud_sound"), - IconMapping(67, "volume_up"), - IconMapping(34, "volume_down"), - IconMapping(1, "volume_mute"), - IconMapping(0, "volume_off"), - ] - - class AnimatedScale(Scale): def __init__(self, **kwargs): super().__init__(**kwargs) @@ -50,36 +21,36 @@ class AnimatedScale(Scale): min_value=self.min_value, max_value=self.value, tick_widget=self, - notify_value=self._update_scale_value, + notify_value=lambda p, *_: self.set_value(p.value), ) - def animate_value(self, value: float) -> None: + def animate_value(self, value: float): self.animator.pause() self.animator.min_value = self.value self.animator.max_value = value self.animator.play() - def _update_scale_value(self, provider: any, *_) -> None: - self.set_value(provider.value) - -class BaseOSDContainer(Box): - def __init__(self, icon_name: str, icon_size: str, **kwargs): +class BrightnessOSDContainer(Box): + def __init__(self, **kwargs): super().__init__(**kwargs, orientation="h", spacing=12, name="osd") - self.icon = self._create_icon(icon_name, icon_size) - self.scale = self._create_scale() - self._setup_layout() + self.brightness_service = Brightness() + self.icon = self._create_icon("brightness_7", icon_size="28px") + self.scale = self._create_brightness_scale() - def _setup_layout(self) -> None: self.add(self.icon) self.add(self.scale) + self.update_brightness() + + self.scale.connect("value-changed", lambda *_: self.update_brightness()) + self.brightness_service.connect("screen", self.on_brightness_changed) def _create_icon(self, icon_name: str, icon_size: str) -> Label: return MaterialIcon(icon_name=icon_name, size=icon_size) - def _create_scale(self) -> AnimatedScale: + def _create_brightness_scale(self) -> AnimatedScale: return AnimatedScale( - marks=self._create_scale_marks(), + marks=(ScaleMark(value=i) for i in range(0, 101, 10)), value=70, min_value=0, max_value=100, @@ -87,186 +58,183 @@ class BaseOSDContainer(Box): orientation="h", ) - def _create_scale_marks(self) -> Iterator[ScaleMark]: - return (ScaleMark(value=i) for i in range(1, 100, 10)) - - -class BrightnessOSDContainer(BaseOSDContainer): - def __init__(self, **kwargs): - super().__init__(icon_name="brightness_7", icon_size="28px", **kwargs) - self.brightness_service = Brightness() - self._setup_handlers() - self.update_brightness() - - def _setup_handlers(self) -> None: - self.scale.connect("value-changed", lambda *_: self.update_brightness()) - self.brightness_service.connect("screen", self.on_brightness_changed) - def update_brightness(self) -> None: current_brightness = self.brightness_service.screen_brightness if current_brightness != 0: normalized_brightness = self._normalize_brightness(current_brightness) - self._update_ui(normalized_brightness) + self.scale.animate_value(normalized_brightness) + self.update_icon(normalized_brightness) + + def update_icon(self, brightness_percentage: float) -> None: + icon_name = self.get_brightness_icon(brightness_percentage) + self.icon.set_label(icon_name) def on_brightness_changed(self, _sender: any, value: float, *_args) -> None: normalized_brightness = self._normalize_brightness(value) - self._update_ui(normalized_brightness) + self.scale.animate_value(normalized_brightness) + self.update_icon(normalized_brightness) def _normalize_brightness(self, brightness: float) -> float: return (brightness / self.brightness_service.max_screen) * 100 - def _update_ui(self, brightness: float) -> None: - self.scale.animate_value(brightness) - self.update_icon(brightness) - - def update_icon(self, brightness_percentage: float) -> None: - icon_name = self._calculate_icon_name(brightness_percentage) - self.icon.set_label(icon_name) - - def _calculate_icon_name(self, brightness_percentage: float) -> str: + def get_brightness_icon(self, brightness_percentage: float) -> str: + brightness_icons = [ + "brightness_1", + "brightness_2", + "brightness_3", + "brightness_4", + "brightness_5", + "brightness_6", + "brightness_7", + ] thresholds = [ - BrightnessIcons.MAX_BRIGHTNESS - / (BrightnessIcons.RATIO ** (len(BrightnessIcons.MAPPINGS) - i - 1)) - for i in range(len(BrightnessIcons.MAPPINGS)) + 100 / (1.6 ** (len(brightness_icons) - i - 1)) + for i in range(len(brightness_icons)) ] for i, threshold in enumerate(thresholds): if brightness_percentage < threshold: - return BrightnessIcons.MAPPINGS[i] + return brightness_icons[i] - return BrightnessIcons.MAPPINGS[-1] + return brightness_icons[-1] -class AudioOSDContainer(BaseOSDContainer): +class AudioOSDContainer(Box): __gsignals__ = { "volume-changed": (GObject.SIGNAL_RUN_FIRST, GObject.TYPE_NONE, ()), } def __init__(self, **kwargs): - super().__init__(icon_name="volume_up", icon_size="29px", **kwargs) + super().__init__(**kwargs, orientation="h", spacing=13, name="osd") self.audio = Audio() - self._setup_handlers() + self.icon = self._create_icon("volume_up", icon_size="28px") + self.scale = self._create_audio_scale() + + self.add(self.icon) + self.add(self.scale) self.sync_with_audio() - def _setup_handlers(self) -> None: self.scale.connect("value-changed", self.on_volume_changed) self.audio.connect("notify::speaker", self.on_audio_speaker_changed) - def sync_with_audio(self) -> None: + def _create_icon(self, icon_name: str, icon_size: str) -> Label: + return MaterialIcon(icon_name=icon_name, size=icon_size) + + def _create_audio_scale(self) -> AnimatedScale: + return AnimatedScale( + marks=(ScaleMark(value=i) for i in range(1, 100, 10)), + value=70, + min_value=0, + max_value=100, + increments=(1, 1), + orientation="h", + ) + + def sync_with_audio(self): if self.audio.speaker: volume = round(self.audio.speaker.volume) - self._update_ui(volume) + self.scale.set_value(volume) + self.update_icon(volume) - def on_volume_changed(self, *_) -> None: + def on_volume_changed(self, *_): if self.audio.speaker: volume = self.scale.value if 1 <= volume <= 100: self.audio.speaker.set_volume(volume) - self._update_ui(volume) + self.update_icon(volume) self.emit("volume-changed") - def on_audio_speaker_changed(self, *_) -> None: + def on_audio_speaker_changed(self, *_): if self.audio.speaker: self.audio.speaker.connect("notify::volume", self.update_volume) self.update_volume() - def update_volume(self, *_) -> None: + def update_volume(self, *_): if self.audio.speaker and not self.is_hovered(): volume = round(self.audio.speaker.volume) - self._update_ui(volume) + self.scale.set_value(volume) + self.update_icon(volume) - def _update_ui(self, volume: int) -> None: - self.scale.set_value(volume) - self.update_icon(volume) - - def update_icon(self, volume: int) -> None: - icon_name = self._get_volume_icon(volume) + def update_icon(self, volume): + icon_name = self._get_audio_icon_name(volume) self.icon.set_label(icon_name) - def _get_volume_icon(self, volume: int) -> str: - for mapping in VolumeIcons.MAPPINGS: - if volume >= mapping.threshold: - return mapping.name + def _get_audio_icon_name(self, volume: int) -> str: + if volume == 101: + return "sound_detection_loud_sound" + elif volume >= 67: + return "volume_up" + elif volume >= 34: + return "volume_down" + elif volume >= 1: + return "volume_mute" + else: + return "volume_off" class OSDContainer(Window): def __init__(self, **kwargs): self.audio_container = AudioOSDContainer() self.brightness_container = BrightnessOSDContainer() - self.is_initial_display = True - self.last_activity_time = GLib.get_monotonic_time() - self.main_box = self._create_main_box() - super().__init__( - **kwargs, - layer="overlay", - anchor="bottom", - exclusive=False, - focusable=False, - child=self.main_box, - visible=True, + self.timeout = 1000 + + self.revealer = Revealer( + transition_type="slide-up", + transition_duration=100, + child_revealed=False, ) - self._initialize() - def _create_main_box(self) -> Box: - return Box( + self.main_box = Box( orientation="v", spacing=13, - children=[self.audio_container, self.brightness_container], + children=[self.revealer], ) - def _initialize(self) -> None: - self._setup_containers() - self._setup_event_handlers() - self._setup_timers() + super().__init__( + layer="overlay", + anchor="bottom", + child=self.main_box, + visible=False, + pass_through=True, + keyboard_mode="on-demand", + **kwargs, + ) - def _setup_containers(self) -> None: - self.audio_container.set_visible(True) - self.brightness_container.set_visible(True) + self.last_activity_time = time.time() - def _setup_event_handlers(self) -> None: self.audio_container.audio.connect("notify::speaker", self.show_audio) self.brightness_container.brightness_service.connect( "screen", self.show_brightness ) self.audio_container.connect("volume-changed", self.show_audio) - def _setup_timers(self) -> None: - GLib.timeout_add_seconds(1, self._check_inactivity) - GLib.timeout_add_seconds(1, self._end_initial_display) + GLib.timeout_add(100, self.check_inactivity) - def _end_initial_display(self) -> bool: - self.is_initial_display = False - self._hide_all() - return False + def show_audio(self, *_): + self.show_box(box_to_show="audio") + self.reset_inactivity_timer() - def _hide_all(self) -> None: - self.set_visible(False) - self.audio_container.set_visible(False) - self.brightness_container.set_visible(False) + def show_brightness(self, *_): + self.show_box(box_to_show="brightness") + self.reset_inactivity_timer() - def show_audio(self, *_) -> None: - if not self.is_initial_display: - self._show_container(show_audio=True) - - def show_brightness(self, *_) -> None: - if not self.is_initial_display: - self._show_container(show_audio=False) - - def _show_container(self, show_audio: bool) -> None: - self.audio_container.set_visible(show_audio) - self.brightness_container.set_visible(not show_audio) + def show_box(self, box_to_show: Literal["audio", "brightness"]): self.set_visible(True) - self._reset_inactivity_timer() + if box_to_show == "audio": + self.revealer.children = self.audio_container + elif box_to_show == "brightness": + self.revealer.children = self.brightness_container + self.revealer.set_reveal_child(True) + self.reset_inactivity_timer() - def _reset_inactivity_timer(self) -> None: - self.last_activity_time = GLib.get_monotonic_time() + def start_hide_timer(self): + self.set_visible(False) - def _check_inactivity(self) -> bool: - current_time = GLib.get_monotonic_time() - if ( - not self.is_initial_display - and (current_time - self.last_activity_time) / 1_000_000 >= 2 - ): - self.set_visible(False) + def reset_inactivity_timer(self): + self.last_activity_time = time.time() + + def check_inactivity(self): + if time.time() - self.last_activity_time >= (self.timeout / 1000): + self.start_hide_timer() return True diff --git a/config/fabric/snippets/__init__.py b/config/fabric/snippets/__init__.py index 2451c7ee..6d550f3a 100644 --- a/config/fabric/snippets/__init__.py +++ b/config/fabric/snippets/__init__.py @@ -1,7 +1,12 @@ from .animator import Animator +from .functions import ( + get_current_uptime, + get_profile_picture_path, + read_config, + username, +) from .icon import MaterialIcon from .icon_resolver import IconResolver -from .util import get_current_uptime, get_profile_picture_path, read_config, username __all__ = [ "Animator", diff --git a/config/fabric/snippets/util.py b/config/fabric/snippets/functions.py similarity index 100% rename from config/fabric/snippets/util.py rename to config/fabric/snippets/functions.py diff --git a/config/fabric/style/bar.css b/config/fabric/style/bar.css new file mode 100644 index 00000000..90af0976 --- /dev/null +++ b/config/fabric/style/bar.css @@ -0,0 +1,120 @@ +#bar { + background-color: @surface; + padding: 3px; +} +#bar label { + font-weight: bold; +} + +#progress { + color: transparent; + background-color: transparent; +} + +#progress { + border: solid 0px @outlineVariant; +} + +#workspaces { + border-radius: 100px; + font-weight: bold; + font-style: normal; + color: @onSurface; + background: @surfaceContainer; + padding: 0px 10px 0px 10px; +} + +#datetime { + background-color: @surfaceContainer; + border-radius: 100px; + padding: 8px; +} + +#battery { + background-color: @surfaceContainer; + border-radius: 100px; + padding: 2px 10px 2px 10px; +} + +#battery label { + color: @onSurface; + font-size: 16px; + font-weight: 300; +} + +#battery .icon { + color: @onSurface; +} + +#battery.critical { + background-color: @error; +} + +#battery.critical label, +#battery.critical .icon { + color: @onError; +} + +#tray { + background-color: @surfaceContainer; + border-radius: 100px; + padding: 2px 10px 0px 10px; +} + +#tray > button { + margin: 0px; + padding: 0px; +} + +#tray image { + color: @onSurface; +} + +#progress { + color: lighter(@outlineVariant); + border: 2px solid @onSecondaryContainer; +} + +#applets { + background-color: @surfaceContainer; + border-radius: 100px; + padding: 2px 10px 2px 10px; + margin: 0px; +} + +#applets .icon { + color: @onSurface; + font-weight: 900; +} + +#applets > button { + color: @onSurface; + margin: 0px; + padding: 0px; +} + +#taskbar { + border-radius: 100px; + font-weight: bold; + font-style: normal; + color: @onSurface; + background: @surfaceContainer; + padding-left: 4px; + padding-right: 4px; +} + +#taskbar .activated { + border-radius: 100px; + background: @surfaceVariant; +} + +#taskbar > button { + padding: 0px 5px; + margin: 4px 0px; + margin-right: 3px; + border-radius: 100px; + border: 0px; +} +#taskbar > button:last-child { + margin-right: 0px; +} diff --git a/config/fabric/style/launcher.css b/config/fabric/style/launcher.css new file mode 100644 index 00000000..1e2cca5f --- /dev/null +++ b/config/fabric/style/launcher.css @@ -0,0 +1,218 @@ +#launcher { + margin: 18px; + border: 1px solid @outlineVariant; + background-color: @surface; + border-radius: 24px; + padding: 18px; + min-width: 480px; +} + +#launcher button { + border-radius: 100px; + background-color: transparent; + background-image: none; + box-shadow: none; +} + +#launcher button:focus { + box-shadow: inset 0 0 0 1px @primary; + background-color: @background; +} + +#launcher button:hover { + box-shadow: inset 0 0 0 1px @background; + background-color: @background; +} + +#launcher entry { + transition: all 0.1s ease; + border-radius: 11px; + padding: 10px; + margin: 12px; + box-shadow: inset 0 0 0 1px @outlineVariant; +} + +#launcher entry:focus { + background-color: @background; +} + +#launcher entry:hover { + background-color: @background; +} + +#launcher entry selection { + color: @outline; + background-color: transparent; +} + +#launcher button#fav-item { + border-radius: 10px; + padding: 10px; + background-image: none; + box-shadow: none; +} + +#launcher button#fav-item:hover image, +#launcher button#fav-item:focus image { + -gtk-icon-shadow: 2px 2px @primary; +} + +#launcher button#fav-item:active { + background-color: transparent; + border-radius: 11px; + box-shadow: inset 0 0 0 1px rgba(158, 142, 130, 0.04); +} + +#launcher button#app-item { + border-radius: 11px; + background-color: transparent; + background-image: none; + box-shadow: none; + transition: 200ms; + padding: 7px; +} + +#launcher button#app-item:hover #title, +#launcher button#app-item:focus #title { + color: @primary; +} + +#launcher button#app-item:hover #description, +#launcher button#app-item:focus #description { + color: @inversePrimary; +} + +#launcher button#app-item:hover image, +#launcher button#app-item:focus image { + -gtk-icon-shadow: 2px 2px @primary; +} + +#launcher button#app-item:active { + background-color: @primaryContainer; + border-radius: 11px; + box-shadow: inset 0 0 0 1px rgba(158, 142, 130, 0.04); +} + +#launcher button#app-item:active #title { +} + +#launcher button#emoji-item { + border-radius: 11px; + background-color: transparent; + background-image: none; + box-shadow: none; + padding: 0px; +} + +#launcher button#emoji-item:disabled { + color: mix(@onSurface, transparent, 0.38); +} + +#launcher button#emoji-item label { + font-size: 24px; +} + +#launcher button#emoji-item:hover, +#launcher button#emoji-item:focus { + text-shadow: 2px 2px 2px @primary; +} + +#launcher button#cliphist-item { + border-radius: 11px; + background-color: transparent; + background-image: none; + box-shadow: none; +} + +window#launcher button#cliphist-item:disabled { + color: mix(@onSurface, transparent, 0.38); +} + +#launcher button#cliphist-item:hover, +#launcher button#cliphist-item:focus { + text-shadow: 2px 2px 2px @primary; +} + +#launcher button#cliphist-img-item { + background-size: cover; + background-position: center; + background-repeat: no-repeat; + border-radius: 8px; + min-width: 70px; + min-height: 70px; +} + +#launcher button#cliphist-img-item:hover, +#launcher button#cliphist-img-item:focus { + box-shadow: 2px 2px 2px @primary; +} + +#launcher button#exit-button { + /* background-color: red; */ + border-radius: 100px; +} + +#launcher button#exit-button:active { + text-shadow: 2px 2px 2px @primary; +} + +#launcher button#power-item { + border-radius: 11px; + background-color: transparent; + background-image: none; + box-shadow: none; +} + +#launcher button#power-item:disabled { + color: mix(@onSurface, transparent, 0.38); +} + +#launcher button#power-item:hover, +#launcher button#power-item:focus { + text-shadow: 2pt 2pt 2pt @primary; +} + +#launcher button#sh-item { + border-radius: 11px; + background-color: transparent; + background-image: none; + box-shadow: none; +} + +#launcher button#sh-item:disabled { + color: mix(@onSurface, transparent, 0.38); +} + +#launcher button#sh-item:hover, +#launcher button#sh-item:focus { + text-shadow: 2pt 2pt 2pt @primary; +} + +#launcher button#help-item { + border-radius: 11px; + background-color: transparent; + background-image: none; + box-shadow: none; +} + +#launcher button#help-item:hover label, +#launcher button#help-item:focus label { + text-shadow: 2px 2px 2px @primary; +} + +#launcher button#wall-item { + border-radius: 0px; + background-color: transparent; + background-image: none; + box-shadow: none; + padding: 5px; +} + +#launcher button#wall-item:disabled { + color: mix(@onSurface, transparent, 0.38); +} + +#launcher button#wall-item:hover, +#launcher button#wall-item:focus { + box-shadow: 2pt 2pt 2pt @primary; +} diff --git a/config/fabric/style/main.css b/config/fabric/style/main.css index f7124f62..5d772eba 100644 --- a/config/fabric/style/main.css +++ b/config/fabric/style/main.css @@ -1,4 +1,8 @@ @import url(../../.cache/material/colors.css); +@import "launcher.css"; +@import "bar.css"; +@import "notification.css"; +@import "osd.css"; * { all: unset; @@ -8,12 +12,6 @@ sans-serif; } -/* - * ╭───────────────────────────────────────────────────────────────────╮ - * │ other │ - * ╰───────────────────────────────────────────────────────────────────╯ -*/ - menu { border-radius: 10px; background-color: @surfaceContainer; @@ -67,19 +65,6 @@ tooltip label { margin: 4px; } -/* - * ╭───────────────────────────────────────────────────────────────────╮ - * │ bar │ - * ╰───────────────────────────────────────────────────────────────────╯ -*/ - -#bar { - background-color: @surface; - padding: 3px; -} -#bar label { - font-weight: bold; -} #start-container, #center-container, #end-container { @@ -89,443 +74,8 @@ tooltip label { margin-right: 12px; } -#progress { - color: transparent; - background-color: transparent; -} - #material_icon, #material_icon * { all: unset; font-family: "Material Symbols Outlined", "Material Symbols Sharp"; } -#progress { - border: solid 0px @outlineVariant; -} - -#workspaces { - border-radius: 100px; - font-weight: bold; - font-style: normal; - color: @onSurface; - background: @surfaceContainer; - padding: 0px 10px 0px 10px; -} - -#datetime { - background-color: @surfaceContainer; - border-radius: 100px; - padding: 8px; -} - -#battery { - background-color: @surfaceContainer; - border-radius: 100px; - padding: 2px 10px 2px 10px; -} - -#battery label { - color: @onSurface; - font-size: 16px; - font-weight: 300; -} - -#battery .icon { - color: @onSurface; -} - -#battery.critical { - background-color: @error; -} - -#battery.critical label, -#battery.critical .icon { - color: @onError; -} - -#tray { - background-color: @surfaceContainer; - border-radius: 100px; - padding: 2px 10px 0px 10px; -} - -#tray > button { - margin: 0px; - padding: 0px; -} - -#tray image { - color: @onSurface; -} - -#progress { - color: lighter(@outlineVariant); - border: 2px solid @onSecondaryContainer; -} - -#applets { - background-color: @surfaceContainer; - border-radius: 100px; - padding: 2px 10px 2px 10px; - margin: 0px; -} - -#applets .icon { - color: @onSurface; - font-weight: 900; -} - -#applets > button { - color: @onSurface; - margin: 0px; - padding: 0px; -} - -#taskbar .activated { - border-radius: 100px; - background: @surfaceVariant; -} - -#corner-bottom-left { - background-color: @surface; -} - -#corner-bottom-right { - background-color: @surface; -} -#taskbar { - border-radius: 100px; - font-weight: bold; - font-style: normal; - color: @onSurface; - background: @surfaceContainer; - padding-left: 4px; - padding-right: 4px; -} - -#taskbar > button { - padding: 0px 5px; - margin: 4px 0px; - margin-right: 3px; - border-radius: 100px; - border: 0px; -} -#taskbar > button:last-child { - margin-right: 0px; -} - -/* - * ╭───────────────────────────────────────────────────────────────────╮ - * │ launcher │ - * ╰───────────────────────────────────────────────────────────────────╯ -*/ - -#launcher { - margin: 18px; - border: 1px solid @outlineVariant; - background-color: @surface; - border-radius: 24px; - padding: 18px; - min-width: 480px; -} - -#launcher button { - border-radius: 100px; - background-color: transparent; - background-image: none; - box-shadow: none; -} - -#launcher button:focus { - box-shadow: inset 0 0 0 1px @primary; - background-color: @background; -} - -#launcher button:hover { - box-shadow: inset 0 0 0 1px @background; - background-color: @background; -} - -#launcher entry { - transition: all 0.1s ease; - border-radius: 11px; - padding: 10px; - margin: 12px; -} - -#launcher entry:focus { - background-color: @background; -} - -#launcher entry:hover { - background-color: @background; -} - -#launcher entry selection { - color: @outline; - background-color: transparent; -} - -#launcher button#fav-item { - border-radius: 10px; - padding: 10px; - background-image: none; - box-shadow: none; -} - -#launcher button#fav-item:hover image, -#launcher button#fav-item:focus image { - -gtk-icon-shadow: 2px 2px @primary; -} - -#launcher button#fav-item:active { - background-color: transparent; - border-radius: 11px; - box-shadow: inset 0 0 0 1px rgba(158, 142, 130, 0.04); -} - -#launcher button#app-item { - border-radius: 11px; - background-color: transparent; - background-image: none; - box-shadow: none; - transition: 200ms; - padding: 7px; -} - -#launcher button#app-item:hover #title, -#launcher button#app-item:focus #title { - color: @primary; -} - -#launcher button#app-item:hover #description, -#launcher button#app-item:focus #description { - color: @inversePrimary; -} - -#launcher button#app-item:hover image, -#launcher button#app-item:focus image { - -gtk-icon-shadow: 2px 2px @primary; -} - -#launcher button#app-item:active { - background-color: @primaryContainer; - border-radius: 11px; - box-shadow: inset 0 0 0 1px rgba(158, 142, 130, 0.04); -} - -#launcher button#app-item:active #title { -} - -#launcher button#emoji-item { - border-radius: 11px; - background-color: transparent; - background-image: none; - box-shadow: none; - padding: 0px; -} - -#launcher button#emoji-item:disabled { - color: mix(@onSurface, transparent, 0.38); -} - -#launcher button#emoji-item label { - font-size: 24px; -} - -#launcher button#emoji-item:hover, -#launcher button#emoji-item:focus { - text-shadow: 2px 2px 2px @primary; -} - -#launcher button#cliphist-item { - border-radius: 11px; - background-color: transparent; - background-image: none; - box-shadow: none; -} - -window#launcher button#cliphist-item:disabled { - color: mix(@onSurface, transparent, 0.38); -} - -#launcher button#cliphist-item:hover, -#launcher button#cliphist-item:focus { - text-shadow: 2px 2px 2px @primary; -} - -#launcher button#cliphist-img-item { - background-size: cover; - background-position: center; - background-repeat: no-repeat; - border-radius: 8px; - min-width: 70px; - min-height: 70px; -} - -#launcher button#cliphist-img-item:hover, -#launcher button#cliphist-img-item:focus { - box-shadow: 2px 2px 2px @primary; -} - -#launcher button#exit-button { - /* background-color: red; */ - border-radius: 100px; -} - -#launcher button#exit-button:active { - text-shadow: 2px 2px 2px @primary; -} - -#launcher button#power-item { - border-radius: 11px; - background-color: transparent; - background-image: none; - box-shadow: none; -} - -#launcher button#power-item:disabled { - color: mix(@onSurface, transparent, 0.38); -} - -#launcher button#power-item:hover, -#launcher button#power-item:focus { - text-shadow: 2pt 2pt 2pt @primary; -} - -#launcher button#sh-item { - border-radius: 11px; - background-color: transparent; - background-image: none; - box-shadow: none; -} - -#launcher button#sh-item:disabled { - color: mix(@onSurface, transparent, 0.38); -} - -#launcher button#sh-item:hover, -#launcher button#sh-item:focus { - text-shadow: 2pt 2pt 2pt @primary; -} - -#launcher button#help-item { - border-radius: 11px; - background-color: transparent; - background-image: none; - box-shadow: none; -} - -#launcher button#help-item:hover label, -#launcher button#help-item:focus label { - text-shadow: 2px 2px 2px @primary; -} - -#launcher button#wall-item { - border-radius: 0px; - background-color: transparent; - background-image: none; - box-shadow: none; - padding: 5px; -} - -#launcher button#wall-item:disabled { - color: mix(@onSurface, transparent, 0.38); -} - -#launcher button#wall-item:hover, -#launcher button#wall-item:focus { - box-shadow: 2pt 2pt 2pt @primary; -} - -/* - * ╭───────────────────────────────────────────────────────────────────╮ - * │ osd │ - * ╰───────────────────────────────────────────────────────────────────╯ -*/ - -#osd-container { - background: @surfaceContainer; - padding: 12px; - border-radius: 14px; - margin-bottom: 16px; -} - -#osd-container scale { - min-width: 150px; -} - -#osd-container slider { - color: @onPrimary; - background-color: @primary; - background-size: 20px 20px; - min-width: 5px; - min-height: 14px; - border-radius: 100px; - padding: 0px; - background-repeat: no-repeat; - background-position: center; - margin-left: 0px; - margin-right: 0px; - margin-top: -16px; - margin-bottom: -16px; - box-shadow: - -4px 0px 0px 1px @surfaceContainer, - 4px 0px 0px 1px @surfaceContainer; -} - -#osd-container trough { - background: @secondaryContainer; - min-height: 10px; - margin-right: 4px; - border-radius: 100px; -} - -#osd-container highlight { - border-radius: 100px 0px 0px 100px; - background: @primary; -} - -/* - * ╭───────────────────────────────────────────────────────────────────╮ - * │ notification │ - * ╰───────────────────────────────────────────────────────────────────╯ -*/ - -#notification { - padding: 16px; - border: solid 1px @outlineVariant; - border-radius: 20px; - margin-bottom: 12px; - background-color: @surfaceContainerLow; - min-width: 400px; -} - -#notification .summary { - font-size: 20px; - font-weight: bold; -} - -#notification .body { - color: darker(@foreground); - font-weight: normal; -} - -#notification_action_button button.start-action { - margin-left: 0; -} - -#notification_action_button button.end-action { - margin-right: 0; -} - -#notification_action_button button { - padding: 0.6rem; - font-weight: 600; - border-radius: 3rem; - background-color: @outlineVariant; -} - -#notification_action_button button:hover { - background-color: lighter(@outlineVariant); -} diff --git a/config/fabric/style/notification.css b/config/fabric/style/notification.css new file mode 100644 index 00000000..f157226b --- /dev/null +++ b/config/fabric/style/notification.css @@ -0,0 +1,37 @@ +#notification { + padding: 16px; + border: solid 1px @outlineVariant; + border-radius: 20px; + margin-bottom: 12px; + background-color: @surfaceContainerLow; + min-width: 400px; +} + +#notification .summary { + font-size: 20px; + font-weight: bold; +} + +#notification .body { + color: darker(@foreground); + font-weight: normal; +} + +#notification_action_button button.start-action { + margin-left: 0; +} + +#notification_action_button button.end-action { + margin-right: 0; +} + +#notification_action_button button { + padding: 0.6rem; + font-weight: 600; + border-radius: 3rem; + background-color: @outlineVariant; +} + +#notification_action_button button:hover { + background-color: lighter(@outlineVariant); +} diff --git a/config/fabric/style/osd.css b/config/fabric/style/osd.css new file mode 100644 index 00000000..866978b2 --- /dev/null +++ b/config/fabric/style/osd.css @@ -0,0 +1,41 @@ +#osd { + background: @surfaceContainer; + padding: 12px 20px; + border-radius: 100px; + margin-bottom: 16px; +} + +#osd scale { + min-width: 150px; +} + +#osd slider { + color: @onPrimary; + background-color: @primary; + background-size: 20px 20px; + min-width: 5px; + min-height: 14px; + border-radius: 100px; + padding: 0px; + background-repeat: no-repeat; + background-position: center; + margin-left: 0px; + margin-right: 0px; + margin-top: -16px; + margin-bottom: -16px; + box-shadow: + -4px 0px 0px 1px @surfaceContainer, + 4px 0px 0px 1px @surfaceContainer; +} + +#osd trough { + background: @secondaryContainer; + min-height: 10px; + margin-right: 4px; + border-radius: 100px; +} + +#osd highlight { + border-radius: 100px 0px 0px 100px; + background: @primary; +}