diff --git a/plugins/Oomox/Entity/Oomox.php b/plugins/Oomox/Entity/Oomox.php index cf928f43d1..027dad7a36 100644 --- a/plugins/Oomox/Entity/Oomox.php +++ b/plugins/Oomox/Entity/Oomox.php @@ -53,8 +53,8 @@ class Oomox extends Entity private ?string $colour_border_dark; private ?string $colour_accent_dark; private ?string $colour_shadow_dark; - private \DateTimeInterface $created; - private \DateTimeInterface $modified; + private DateTimeInterface $created; + private DateTimeInterface $modified; public function setActorId(int $actor_id): self { @@ -199,29 +199,28 @@ class Oomox extends Entity return $this->colour_shadow_dark; } - public function setCreated(\DateTimeInterface $created): self + public function setCreated(DateTimeInterface $created): self { $this->created = $created; return $this; } - public function getCreated(): \DateTimeInterface + public function getCreated(): DateTimeInterface { return $this->created; } - public function setModified(\DateTimeInterface $modified): self + public function setModified(DateTimeInterface $modified): self { $this->modified = $modified; return $this; } - public function getModified(): \DateTimeInterface + public function getModified(): DateTimeInterface { return $this->modified; } - // @codeCoverageIgnoreEnd // }}} Autocode public static function schemaDef(): array @@ -229,21 +228,21 @@ class Oomox extends Entity return [ 'name' => 'oomox', 'fields' => [ - 'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'foreign key to actor table'], - 'colour_foreground_light' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_background_hard_light' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_background_card_light' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_border_light' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_accent_light' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_shadow_light' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_foreground_dark' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_background_hard_dark' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_background_card_dark' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_border_dark' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_accent_dark' => ['type' => 'text', 'description' => 'color hex code'], - 'colour_shadow_dark' => ['type' => 'text', 'description' => 'color hex code'], - 'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', 'default' => 'CURRENT_TIMESTAMP'], - 'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified', 'default' => 'CURRENT_TIMESTAMP'], + 'actor_id' => ['type' => 'int', 'foreign key' => true, 'target' => 'Actor.id', 'multiplicity' => 'one to one', 'not null' => true, 'description' => 'foreign key to actor table'], + 'colour_foreground_light' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_background_hard_light' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_background_card_light' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_border_light' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_accent_light' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_shadow_light' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_foreground_dark' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_background_hard_dark' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_background_card_dark' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_border_dark' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_accent_dark' => ['type' => 'text', 'description' => 'color hex code'], + 'colour_shadow_dark' => ['type' => 'text', 'description' => 'color hex code'], + 'created' => ['type' => 'datetime', 'not null' => true, 'description' => 'date this record was created', 'default' => 'CURRENT_TIMESTAMP'], + 'modified' => ['type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified', 'default' => 'CURRENT_TIMESTAMP'], ], 'primary key' => ['actor_id'], ]; diff --git a/public/assets/default_theme/css/base.css b/public/assets/default_theme/css/base.css index cc318b175f..b24f98dfe2 100644 --- a/public/assets/default_theme/css/base.css +++ b/public/assets/default_theme/css/base.css @@ -80,6 +80,10 @@ address { border: 0; } +details summary { + cursor: pointer !important; +} + details summary>* { margin: unset; padding: unset; diff --git a/public/assets/default_theme/css/pages/settings.css b/public/assets/default_theme/css/pages/settings.css index 964edb0d5e..26043c0dbb 100644 --- a/public/assets/default_theme/css/pages/settings.css +++ b/public/assets/default_theme/css/pages/settings.css @@ -1,8 +1,23 @@ .section-settings { + border: 2px solid var(--border); +} + +.section-settings, +.section-title-settings { + background: var(--background-card); margin-bottom: .6rem; border-radius: .6rem; padding: .6rem; box-sizing: border-box; + box-shadow: var(--shadow); +} + +.section-title-settings[open] > summary:first-child { + margin-bottom: var(--smaller); +} + +.section-title-settings summary + form { + padding-left: var(--smaller); } .section-settings hr { @@ -10,76 +25,6 @@ margin-bottom: .6rem; } -.section-settings,.section-settings ul { - border: 2px solid var(--border) !important; - background-color: var(--background-card) !important; -} - -.section-settings ul { - border-radius: .6rem; - padding: .6rem; - box-sizing: border-box; -} - -.section-settings ul li { - border-radius: .6rem; -} - -.form { - display: flex; - border-radius: .6rem; - padding: .6rem; - box-sizing: border-box; -} - -.form form { - width: 100%; -} - -.form #save { - display: flex; - flex-direction: column; - padding: .6rem; - box-sizing: border-box; -} - -.form #save div { - display: contents; -} - -.form #save div label { - display: inline-block; - font-family: 'Poppins',sans-serif; -} - -.form #save div input,.form #save div textarea { - display: inline-block; - position: relative; - border-radius: .6rem; - padding: .6rem; - box-sizing: border-box; -} - -.form #save div textarea { - resize: vertical; -} - -.form #save div p { - font-style: italic; -} - -.form #save div:last-of-type { - text-align: end; -} - -.section-title-settings section { - margin-top: .6rem; -} - -.section-title-settings summary { - padding: .6rem 1rem; -} - .section-title-settings summary h3:first-letter ,.section-title-settings summary em:first-letter { text-transform: uppercase; } diff --git a/public/assets/default_theme/css/widgets/buttons.css b/public/assets/default_theme/css/widgets/buttons.css index 961585f0bf..a14bcfc818 100644 --- a/public/assets/default_theme/css/widgets/buttons.css +++ b/public/assets/default_theme/css/widgets/buttons.css @@ -116,12 +116,9 @@ input[type=color] { } button { + display: block !important; cursor: pointer !important; - float: right !important; - -webkit-align-self: end !important; - -ms-flex-item-align: end !important; - -ms-grid-row-align: end !important; - align-self: end !important; + margin-left: auto !important; margin-top: var(--smaller); }