data-sourcerer 0.4.0__tar.gz → 0.5.0__tar.gz

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-sourcerer
-Version: 0.4.0
+Version: 0.5.0
 Summary: Sourcerer is a terminal cloud storage navigator.
 Author-email: Bohdana Kuzmenko <bohdana.kuzmenko.dev@gmail.com>
 License: MIT
@@ -16,6 +16,7 @@ Requires-Dist: dependency-injector<5.0.0,>=4.43.0
 Requires-Dist: google-cloud-storage<4.0.0,>=3.1.0
 Requires-Dist: humanize<5.0.0,>=4.12.1
 Requires-Dist: msgspec>=0.19.0
+Requires-Dist: packaging>=25.0
 Requires-Dist: pyopenssl>=22.1.0; sys_platform == 'linux'
 Requires-Dist: sqlalchemy-utils<1.0.0,>=0.41.2
 Requires-Dist: sqlalchemy<3.0.0,>=2.0.38
@@ -36,8 +37,8 @@ Description-Content-Type: text/markdown
 
 # 🧙‍♂️ Sourcerer
 
-**Sourcerer** is a CLI-based cloud storage explorer that provides a unified interface for developers and DevOps 
-engineers to view and manage files across multiple cloud providers like 
+**Sourcerer** is a CLI-based cloud storage explorer that provides a unified interface for developers and DevOps
+engineers to view and manage files across multiple cloud providers like
 **GCP Storage**, **Azure Storage**, **AWS S3**, and **S3-compatible services**.
 
 > Your terminal. Your storages. Your control.
@@ -48,11 +49,11 @@ engineers to view and manage files across multiple cloud providers like
 
 ## ✨ Features
 
-- 🔍 Unified file browser for GCP Storage, Azure Storage, AWS S3, and S3-compatible services  
-- 🧭 Terminal UI (TUI) built with [Textual](https://github.com/Textualize/textual)  
-- 🗂️ Explore buckets and objects seamlessly  
-- 🔄 Upload, download, and delete files  
-- 🔐 Secure credential management via local **SQLite database**  
+- 🔍 Unified file browser for GCP Storage, Azure Storage, AWS S3, and S3-compatible services
+- 🧭 Terminal UI (TUI) built with [Textual](https://github.com/Textualize/textual)
+- 🗂️ Explore buckets and objects seamlessly
+- 🔄 Upload, download, and delete files
+- 🔐 Secure credential management via local **SQLite database**
 
 ---
 

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/README.md

@@ -1,7 +1,7 @@
 # 🧙‍♂️ Sourcerer
 
-**Sourcerer** is a CLI-based cloud storage explorer that provides a unified interface for developers and DevOps 
-engineers to view and manage files across multiple cloud providers like 
+**Sourcerer** is a CLI-based cloud storage explorer that provides a unified interface for developers and DevOps
+engineers to view and manage files across multiple cloud providers like
 **GCP Storage**, **Azure Storage**, **AWS S3**, and **S3-compatible services**.
 
 > Your terminal. Your storages. Your control.
@@ -12,11 +12,11 @@ engineers to view and manage files across multiple cloud providers like
 
 ## ✨ Features
 
-- 🔍 Unified file browser for GCP Storage, Azure Storage, AWS S3, and S3-compatible services  
-- 🧭 Terminal UI (TUI) built with [Textual](https://github.com/Textualize/textual)  
-- 🗂️ Explore buckets and objects seamlessly  
-- 🔄 Upload, download, and delete files  
-- 🔐 Secure credential management via local **SQLite database**  
+- 🔍 Unified file browser for GCP Storage, Azure Storage, AWS S3, and S3-compatible services
+- 🧭 Terminal UI (TUI) built with [Textual](https://github.com/Textualize/textual)
+- 🗂️ Explore buckets and objects seamlessly
+- 🔄 Upload, download, and delete files
+- 🔐 Secure credential management via local **SQLite database**
 
 ---
 

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 
 name = "data-sourcerer"
-version = "0.4.0"
+dynamic = ["version"]
 description = "Sourcerer is a terminal cloud storage navigator."
 requires-python = ">=3.9"
 
@@ -28,6 +28,7 @@ dependencies = [
     "azure-identity>=1.22.0,<2.0.0",
     "azure-mgmt-storage>=22.2.0,<23.0.0",
     "msgspec>=0.19.0",
+    "packaging>=25.0",
 ]
 
 [project.scripts]
@@ -109,6 +110,9 @@ max-complexity = 10
 include = ["src"]
 sources = ["src"]
 
+[tool.hatch.version]
+path = "src/sourcerer/__init__.py"
+
 [tool.ty.rules]
 unresolved-import = "ignore"
 invalid-assignment = "warn"

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/sourcerer/__init__.py

@@ -12,4 +12,6 @@ The application is structured using a clean architecture approach with:
 - Presentation layer: User interface components
 """
 
-__version__ = "0.4.0"
+name = "sourcerer"
+package_name = "data_sourcerer"
+__version__ = "0.5.0"

data_sourcerer-0.5.0/sourcerer/domain/package_meta/entities.py

@@ -0,0 +1,9 @@
+from msgspec._core import Struct
+
+
+class PackageMeta(Struct):
+    version: str
+    latest_version: str | None
+    has_available_update: bool
+    system_version: str
+    platform: str

data_sourcerer-0.5.0/sourcerer/domain/package_meta/services.py

@@ -0,0 +1,9 @@
+from abc import ABCMeta, abstractmethod
+
+from sourcerer.domain.package_meta.entities import PackageMeta
+
+
+class BasePackageMetaService(metaclass=ABCMeta):
+    @abstractmethod
+    def get_package_meta(self) -> PackageMeta:
+        raise NotImplementedError

data_sourcerer-0.5.0/sourcerer/domain/settings/entities.py

@@ -0,0 +1,11 @@
+from msgspec._core import Struct
+
+
+class Settings(Struct):
+    theme: str = "github-dark"
+    group_by_access_credentials: bool = False
+
+
+class SettingsFields:
+    theme = "theme"
+    group_by_access_credentials = "group_by_access_credentials"

data_sourcerer-0.5.0/sourcerer/domain/settings/repositories.py

@@ -0,0 +1,20 @@
+from abc import ABCMeta, abstractmethod
+
+from sourcerer.domain.settings.entities import Settings
+
+
+class BaseSettingsRepository(metaclass=ABCMeta):
+    @abstractmethod
+    def get_settings(self) -> Settings:
+        """Retrieve all settings as a Settings."""
+        raise NotImplementedError()
+
+    @abstractmethod
+    def get_setting(self, key: str) -> str:
+        """Retrieve a setting by its key."""
+        raise NotImplementedError()
+
+    @abstractmethod
+    def set_setting(self, key: str, value: str) -> None:
+        """Set a setting with a given key and value."""
+        raise NotImplementedError()

data_sourcerer-0.5.0/sourcerer/domain/settings/services.py

@@ -0,0 +1,19 @@
+from sourcerer.domain.settings.entities import Settings
+from sourcerer.domain.settings.repositories import BaseSettingsRepository
+
+
+class BaseSettingsService:
+    def __init__(self, repository: BaseSettingsRepository):
+        self.repository = repository
+
+    def load_settings(self) -> Settings:
+        """Load settings from the settings file."""
+        raise NotImplementedError("This method should be implemented by subclasses.")
+
+    def get_setting(self, key: str) -> str:
+        """Get the value of a setting by its key."""
+        raise NotImplementedError("This method should be implemented by subclasses.")
+
+    def set_setting(self, key: str, value: str) -> None:
+        """Set the value of a setting by its key."""
+        raise NotImplementedError("This method should be implemented by subclasses.")

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/sourcerer/infrastructure/db/models.py

@@ -76,3 +76,26 @@ class Storage(Base):
         cascade="save-update",
         backref=backref("storages", passive_deletes=True),
     )
+
+
+class Settings(Base):
+    """
+    SQLAlchemy model for storing application settings.
+
+    This model represents the settings table in the database,
+    storing key-value pairs for application configuration.
+
+    Attributes:
+        id (int): Primary key
+        key (str): Setting key
+        value (str): Setting value
+        created_at (datetime): Timestamp when the setting was created
+        updated_at (datetime): Timestamp when the setting was last updated
+    """
+
+    __tablename__ = "settings"
+    id = Column(Integer, primary_key=True)
+    key = Column(String, unique=True, nullable=False)
+    value = Column(String, nullable=False)
+    created_at = Column(DateTime, default=datetime.utcnow)
+    updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)

data_sourcerer-0.5.0/sourcerer/infrastructure/package_meta/services.py

@@ -0,0 +1,26 @@
+import platform
+
+from packaging import version
+
+from sourcerer import __version__, package_name
+from sourcerer.domain.package_meta.entities import PackageMeta
+from sourcerer.domain.package_meta.services import BasePackageMetaService
+from sourcerer.utils import get_last_package_version
+
+
+class PackageMetaService(BasePackageMetaService):
+    def get_package_meta(self) -> PackageMeta:
+        latest_version = get_last_package_version(package_name)
+        has_available_update = (
+            version.parse(latest_version) > version.parse(__version__)
+            if latest_version
+            else False
+        )
+
+        return PackageMeta(
+            version=__version__,
+            latest_version=latest_version,
+            has_available_update=has_available_update,
+            system_version=platform.release(),
+            platform=platform.system(),
+        )

data_sourcerer-0.5.0/sourcerer/infrastructure/settings/repositories.py

@@ -0,0 +1,59 @@
+from typing import get_type_hints
+
+from sourcerer.domain.settings.entities import Settings
+from sourcerer.domain.settings.repositories import BaseSettingsRepository
+from sourcerer.infrastructure.db.models import Settings as DBSettings
+
+
+class SQLAlchemySettingsRepository(BaseSettingsRepository):
+    def __init__(self, db):
+        """
+        Initialize the repository with a database session factory.
+
+        Args:
+            db: Database session factory
+        """
+        self.db = db
+
+    def get_settings(self) -> Settings:
+        """Retrieve all settings as a Settings."""
+
+        with self.db() as session:
+            settings = session.query(DBSettings).all()
+        type_hints = get_type_hints(Settings)
+        return Settings(
+            **{
+                setting.key: self.parse_value(
+                    setting.key, setting.value, type_hints.get(setting.key, str)
+                )
+                for setting in settings
+            }
+        )
+
+    def get_setting(self, key: str) -> str:
+        """Retrieve a setting by its key."""
+        with self.db() as session:
+            setting = session.query(DBSettings).filter(DBSettings.key == key).first()
+            if setting is None:
+                raise KeyError(f"Setting '{key}' not found.")
+            return setting.value
+
+    def set_setting(self, key: str, value: str) -> None:
+        """Set a setting with a given key and value."""
+        with self.db() as session:
+            setting = session.query(DBSettings).filter(DBSettings.key == key).first()
+            if setting is None:
+                setting = DBSettings(key=key, value=value)
+                session.add(setting)
+            else:
+                setting.value = value
+            session.commit()
+
+    def parse_value(self, key: str, value: str, expected_type):
+        if expected_type is bool:
+            return value.lower() in ("true", "1", "yes", "on")
+        if expected_type is int:
+            return int(value)
+        if expected_type is float:
+            return float(value)
+        return value  # Assume string or leave as-is

data_sourcerer-0.5.0/sourcerer/infrastructure/settings/services.py

@@ -0,0 +1,16 @@
+from sourcerer.domain.settings.entities import Settings
+from sourcerer.domain.settings.services import BaseSettingsService
+
+
+class SettingsService(BaseSettingsService):
+    def load_settings(self) -> Settings:
+        """Load settings from the settings file."""
+        return self.repository.get_settings()
+
+    def get_setting(self, key: str) -> str:
+        """Get the value of a setting by its key."""
+        return self.repository.get_setting(key)
+
+    def set_setting(self, key: str, value: str) -> None:
+        """Set the value of a setting by its key."""
+        self.repository.set_setting(key, value)

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/sourcerer/infrastructure/storage_provider/services/gcp.py

@@ -118,7 +118,6 @@ class GCPStorageProviderService(BaseStorageProviderService):
             ListStorageItemsError: If an error occurs while listing items
         """
         try:
-
             files = []
             folders = []
             if path and not path.endswith("/"):

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/sourcerer/infrastructure/utils.py

@@ -4,6 +4,7 @@ Utility functions for the Sourcerer application.
 This module provides various utility functions used throughout the application,
 including UUID generation, MIME type detection, and file type checking.
 """
+
 import mimetypes
 import secrets
 import uuid

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/sourcerer/presentation/di_container.py

@@ -16,6 +16,9 @@ from sourcerer.infrastructure.access_credentials.repositories import (
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
 from sourcerer.infrastructure.db.config import Database
 from sourcerer.infrastructure.file_system.services import FileSystemService
+from sourcerer.infrastructure.package_meta.services import PackageMetaService
+from sourcerer.infrastructure.settings.repositories import SQLAlchemySettingsRepository
+from sourcerer.infrastructure.settings.services import SettingsService
 from sourcerer.infrastructure.storage.repositories import SQLAlchemyStoragesRepository
 from sourcerer.infrastructure.storage.services import StoragesService
 from sourcerer.settings import APP_DIR, DB_NAME
@@ -50,6 +53,10 @@ class DiContainer(containers.DeclarativeContainer):
         SQLAlchemyStoragesRepository, session_factory
     )
 
+    settings_repository = providers.Factory(
+        SQLAlchemySettingsRepository, session_factory
+    )
+
     credentials_service = providers.Factory(
         CredentialsService, repository=credentials_repository
     )
@@ -59,3 +66,9 @@ class DiContainer(containers.DeclarativeContainer):
     )
 
     file_system_service = providers.Factory(FileSystemService, Path.home())
+
+    package_meta_service = providers.Factory(PackageMetaService)
+    settings_service = providers.Factory(
+        SettingsService,
+        repository=settings_repository,
+    )

data_sourcerer-0.5.0/sourcerer/presentation/screens/about/main.py

@@ -0,0 +1,60 @@
+from dependency_injector.wiring import Provide
+from rich.text import Text
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal
+from textual.widgets import Static
+
+from sourcerer.domain.package_meta.services import BasePackageMetaService
+from sourcerer.presentation.di_container import DiContainer
+from sourcerer.presentation.screens.shared.modal_screens import ExitBoundModalScreen
+from sourcerer.presentation.screens.shared.widgets.button import Button
+
+
+class AboutScreen(ExitBoundModalScreen):
+    """Screen with a parameter."""
+
+    CSS_PATH = "styles.tcss"
+
+    def __init__(
+        self,
+        package_meta_service: BasePackageMetaService = Provide[
+            DiContainer.package_meta_service
+        ],
+    ) -> None:
+        super().__init__()
+        self.package_meta_service = package_meta_service
+
+    def compose(self) -> ComposeResult:
+        package_meta = self.package_meta_service.get_package_meta()
+
+        with Container():
+            yield Static(Text("Sourcerer", style="bold cyan", justify="center"))
+            yield Static(
+                Text(
+                    f"Version: {package_meta.version}"
+                    f"{' (newer version is available)' if package_meta.has_available_update else ''}",
+                    style="dim",
+                    justify="center",
+                )
+            )
+            yield Static(
+                Text(
+                    f"Platform: {package_meta.platform}", style="dim", justify="center"
+                )
+            )
+            yield Static(
+                Text(
+                    f"System Version: {package_meta.system_version}",
+                    style="dim",
+                    justify="center",
+                )
+            )
+            with Horizontal(id="controls"):
+                yield Button("Close", name="close")
+
+    @on(Button.Click)
+    def on_button_clicked(self, event: Button.Click) -> None:
+        """Handle button clicked events."""
+        if event.action == "close":
+            self.action_cancel_screen()

data_sourcerer-0.5.0/sourcerer/presentation/screens/about/styles.tcss

@@ -0,0 +1,32 @@
+AboutScreen {
+  align: center middle;
+  content-align: center top;
+
+  & > Container {
+    padding: 1 2 0 2;
+    margin: 0 0;
+    width: 50;
+    height: 10;
+    border: solid $border;
+
+    & > Static {
+      text-align: center;
+      text-wrap: wrap;
+    }
+
+    & > Horizontal#controls {
+      padding-top: 1;
+      align: center bottom;
+
+      & > Button {
+        color: $border;
+        border: none;
+
+        & > :focus {
+            color: $border;
+        }
+      }
+    }
+  }
+
+}

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/sourcerer/presentation/screens/main/main.py

@@ -1,26 +1,32 @@
 import contextlib
 import time
 import traceback
+from collections.abc import Iterable
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from typing import ClassVar
 
 from dependency_injector.wiring import Provide
 from textual import on, work
-from textual.app import App, ComposeResult
+from textual.app import App, ComposeResult, SystemCommand
 from textual.binding import Binding, BindingType
 from textual.containers import Horizontal
 from textual.css.query import NoMatches
 from textual.reactive import reactive
+from textual.screen import Screen
 from textual.widgets import Footer
 
+from sourcerer.domain.package_meta.services import BasePackageMetaService
+from sourcerer.domain.settings.entities import SettingsFields
 from sourcerer.domain.storage_provider.entities import Storage
 from sourcerer.infrastructure.access_credentials.services import CredentialsService
+from sourcerer.infrastructure.settings.services import SettingsService
 from sourcerer.infrastructure.storage_provider.exceptions import (
     ListStorageItemsError,
 )
 from sourcerer.infrastructure.utils import generate_uuid
 from sourcerer.presentation.di_container import DiContainer
+from sourcerer.presentation.screens.about.main import AboutScreen
 from sourcerer.presentation.screens.critical_error.main import CriticalErrorScreen
 from sourcerer.presentation.screens.file_system_finder.main import (
     FileSystemNavigationModal,
@@ -55,6 +61,7 @@ from sourcerer.presentation.screens.preview_content.main import PreviewContentSc
 from sourcerer.presentation.screens.provider_creds_list.main import (
     ProviderCredsListScreen,
 )
+from sourcerer.presentation.screens.settings.main import SettingsScreen
 from sourcerer.presentation.screens.storage_action_progress.main import (
     DeleteKey,
     DownloadKey,
@@ -103,8 +110,10 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
     CSS_PATH = "styles.tcss"
     BINDINGS: ClassVar[list[BindingType]] = [
         Binding("ctrl+r", "registrations", "Registrations list"),
-        Binding("ctrl+s", "storages", "Storages list"),
+        Binding("ctrl+l", "storages", "Storages list"),
         Binding("ctrl+f", "find", show=False),
+        Binding("ctrl+s", "settings", "Settings"),
+        Binding("ctrl+a", "about", "About"),
         Binding(
             KeyBindings.ARROW_LEFT.value, "focus_sidebar", "Focus sidebar", show=False
         ),
@@ -116,15 +125,24 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
 
     def __init__(
         self,
+        settings_service: SettingsService = Provide[DiContainer.settings_service],
         credentials_service: CredentialsService = Provide[
             DiContainer.credentials_service
         ],
+        package_meta_service: BasePackageMetaService = Provide[
+            DiContainer.package_meta_service
+        ],
         *args,
         **kwargs,
     ):
         super().__init__(*args, **kwargs)
+        self.settings_service = settings_service
         self.credentials_service = credentials_service
-        self.storage_list_sidebar = StorageListSidebar(id="storage_list_sidebar")
+        self.package_meta_service = package_meta_service
+        self.settings = self.settings_service.load_settings()
+        self.storage_list_sidebar = StorageListSidebar(
+            self.settings.group_by_access_credentials, id="storage_list_sidebar"
+        )
         self.storage_content = StorageContentContainer(id="storage_content_container")
         self.load_percentage = 0
         self.active_resizing_rule: ResizingRule | None = None
@@ -145,14 +163,49 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
     def _handle_exception(self, error: Exception) -> None:
         self.push_screen(CriticalErrorScreen(str(error), traceback.format_exc()))
 
+    def get_system_commands(self, screen: Screen) -> Iterable[SystemCommand]:
+        yield SystemCommand(
+            "Quit the application",
+            "Quit the application as soon as possible",
+            self.action_quit,
+        )
+
+        if screen.query("HelpPanel"):
+            yield SystemCommand(
+                "Hide keys and help panel",
+                "Hide the keys and widget help panel",
+                self.action_hide_help_panel,
+            )
+        else:
+            yield SystemCommand(
+                "Show keys and help panel",
+                "Show help for the focused widget and a summary of available keys",
+                self.action_show_help_panel,
+            )
+        yield SystemCommand(
+            "Save screenshot",
+            "Save an SVG 'screenshot' of the current screen",
+            self.deliver_screenshot,
+        )
+        yield SystemCommand("About", "About sourcerer", self.action_about)
+        yield SystemCommand("Settings", "Sourcerer settings", self.action_settings)
+
     def on_mount(self):
         """
         Initializes the application theme and storage list on mount.
         """
 
         self.register_theme(github_dark_theme)  # pyright: ignore [reportArgumentType]
-
-        self.theme = "github-dark"
+        if self.settings.theme in self._registered_themes:
+            self.theme = self.settings.theme
+
+        package_meta = self.package_meta_service.get_package_meta()
+        if package_meta.has_available_update:
+            self.notify(
+                f"Sourcerer {package_meta.version} "
+                f"is running while {package_meta.latest_version} is available",
+                severity="warning",
+            )
         self.init_storages_list()
 
     def action_find(self):
@@ -188,9 +241,39 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
             ProviderCredsListScreen(), callback=self.modal_screen_callback
         )
 
+    def action_settings(self):
+        """
+        Opens the settings screen.
+        This method is triggered by the key binding "ctrl+s" and allows the user
+        to modify application settings such as theme and grouping of storage items.
+        It retrieves the current settings from the settings service and pushes
+        the SettingsScreen to the application stack. A callback is set to handle
+        the settings changes when the screen is closed.
+        """
+        settings = self.settings_service.load_settings()
+        self.app.push_screen(SettingsScreen(settings), callback=self.settings_callback)
+
     def action_storages(self):
         self.app.push_screen(StoragesListScreen(), callback=self.modal_screen_callback)
 
+    def action_about(self):
+        self.push_screen(AboutScreen())
+
+    def settings_callback(self, settings: dict | None):
+        default_settings = self.settings_service.load_settings()
+        if settings is None:
+            self.app.theme = default_settings.theme
+            return
+        self.app.theme = settings[SettingsFields.theme]
+        if (theme := settings.get(SettingsFields.theme)) != default_settings.theme:
+            self.settings_service.set_setting(SettingsFields.theme, theme)  # type: ignore
+
+        if (
+            group_by := settings.get(SettingsFields.group_by_access_credentials)
+        ) != default_settings.group_by_access_credentials:
+            self.settings_service.set_setting(SettingsFields.group_by_access_credentials, group_by)  # type: ignore
+            self.storage_list_sidebar.groupby_access_credentials = group_by  # type: ignore
+
     def modal_screen_callback(self, requires_storage_refresh: bool | None = True):
         """
         Callback for modal screens to refresh the storage list if required.
@@ -587,7 +670,7 @@ class Sourcerer(App, ResizeContainersWatcherMixin):
                 for storage in credentials.storages
                 if storage.name not in storage_names
             ]
-            self.storage_list_sidebar.storages[credentials.uuid] = (
+            self.storage_list_sidebar.storages[(credentials.uuid, credentials.name)] = (
                 storages + registered_storages
             )
             self.storage_list_sidebar.last_update_timestamp = time.time()

{data_sourcerer-0.4.0 → data_sourcerer-0.5.0}/sourcerer/presentation/screens/main/styles.tcss

@@ -12,9 +12,18 @@ StorageContent {
   align-horizontal: center;
 
   & > Button {
+    color: $primary;
     border: solid $primary;
-    width: 10;
-    content-align-horizontal: center;
+    padding-top: 0;
+    width: 15;
+    text-align: center;
+
+    &:hover {
+        color: $text;
+    }
+    &:focus {
+        color: $text;
+    }
   }
 }
 
@@ -25,8 +34,8 @@ StorageContent {
   padding: 1 1 0 1;
 }
 
-Rule {
+ResizingRule {
   color: $background-lighten-3;
   padding: 0 0;
   margin: 0 0;
-}
+}