Skip to content

Commit

Permalink
Style a lot of pages (team admin, academy, report)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rayvented
Rayvented committed Nov 17, 2023
1 parent 0e87785 commit a5bf998
Show file tree
Hide file tree
Showing 24 changed files with 800 additions and 653 deletions.
16 changes: 16 additions & 0 deletions assets/styles/app.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
#task-assign #btn-assign {
@apply hidden;
}

#content-team-admin {
@apply w-full lg:w-2/3 xl:w-1/2 mx-auto;
}

#cards-reports h3 {
@apply mb-5;
}

#cards-reports a {
@apply inline-block mb-1;
}

#cards-reports a:before {
content: "» ";
}
128 changes: 116 additions & 12 deletions assets/styles/colors.css
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,153 @@
@import "./tailmater.css";

.card-vvt, .btn-vvt {
.btn-vvt {
@apply bg-vvt-50 hover:bg-vvt-100 text-vvt-800;
}

.card-dsfa, .btn-dsfa {
.btn-dsfa {
@apply bg-dsfa-50 hover:bg-dsfa-100 text-dsfa-800;
}

.card-tom, .btn-tom {
.btn-tom {
@apply bg-tom-50 hover:bg-tom-100 text-tom-800;
}

.card-kontakt, .btn-kontakt {
.btn-kontakt {
@apply bg-kontakt-50 hover:bg-kontakt-100 text-kontakt-800;
}

.card-datenweitergabe, .btn-datenweitergabe {
.btn-datenweitergabe {
@apply bg-datenweitergabe-50 hover:bg-datenweitergabe-100 text-datenweitergabe-800;
}

.card-av, .btn-av {
.btn-av {
@apply bg-av-50 hover:bg-av-100 text-av-800;
}

.card-formular, .btn-formular {
.btn-formular {
@apply bg-formular-50 hover:bg-formular-100 text-formular-800;
}

.card-policy, .btn-policy {
.btn-policy {
@apply bg-policy-50 hover:bg-policy-100 text-policy-800;
}

.card-software, .btn-software {
.btn-software {
@apply bg-software-50 hover:bg-software-100 text-software-800;
}

.card-tasks, .btn-tasks {
.btn-tasks {
@apply bg-task-50 hover:bg-task-100 text-task-800;
}

.card-loeschkonzept, .btn-loeschkonzept {
.btn-loeschkonzept {
@apply bg-loeschkonzept-50 hover:bg-loeschkonzept-100 text-loeschkonzept-800;
}

.card-datenkategorie, .btn-datenkatekorie {
.btn-datenkatekorie {
@apply bg-datenkategorie-50 hover:bg-datenkategorie-100 text-datenkategorie-800;
}

/* .card */

.card-element {
@apply card border;
}

.card-vvt {
@apply card-element bg-vvt-50 text-vvt-800 border-vvt-100;
}

.card-dsfa {
@apply card-element bg-dsfa-50 text-dsfa-800 border-dsfa-100;
}

.card-tom {
@apply card-element bg-tom-50 text-tom-800 border-tom-100;
}

.card-kontakt {
@apply card-element bg-kontakt-50 text-kontakt-800 border-kontakt-100;
}

.card-datenweitergabe {
@apply card-element bg-datenweitergabe-50 text-datenweitergabe-800 border-datenweitergabe-100;
}

.card-av {
@apply card-element bg-av-50 text-av-800 border-av-100;
}

.card-formular {
@apply card-element bg-formular-50 text-formular-800 border-formular-100;
}

.card-policy {
@apply card-element bg-policy-50 text-policy-800 border-policy-100;
}

.card-software {
@apply card-element bg-software-50 text-software-800 border-software-100;
}

.card-tasks {
@apply card-element bg-task-50 text-task-800 border-task-100;
}

.card-loeschkonzept {
@apply card-element bg-loeschkonzept-50 text-loeschkonzept-800 border-loeschkonzept-100;
}

.card-datenkategorie {
@apply card-element bg-datenkategorie-50 text-datenkategorie-800 border-datenkategorie-100;
}

/* .card links */

.card-vvt a {
@apply hover:text-vvt-950 text-vvt-800;
}

.card-dsfa a {
@apply hover:text-dsfa-950 text-dsfa-800;
}

.card-tom a {
@apply hover:text-tom-950 text-tom-800;
}

.card-kontakt a {
@apply hover:text-kontakt-950 text-kontakt-800;
}

.card-datenweitergabe a {
@apply hover:text-datenweitergabe-950 text-datenweitergabe-800;
}

.card-av a {
@apply hover:text-av-950 text-av-800;
}

.card-formular a {
@apply hover:text-formular-950 text-formular-800;
}

.card-policy a {
@apply hover:text-policy-950 text-policy-800;
}

.card-software a {
@apply hover:text-software-950 text-software-800;
}

.card-tasks a {
@apply hover:text-task-950 text-task-800;
}

.card-loeschkonzept a {
@apply hover:text-loeschkonzept-950 text-loeschkonzept-800;
}

.card-datenkategorie a {
@apply hover:text-datenkategorie-950 text-datenkategorie-800;
}
73 changes: 66 additions & 7 deletions assets/styles/tailmater.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,6 +732,10 @@ body {
@apply rounded-full w-full h-12 px-5 flex flex-row items-center justify-between gap-1.5;
}

#topbar a {
@apply text-gray-700;
}

#bock-cta .btn {
@apply mb-5;
}
Expand Down Expand Up @@ -772,6 +776,10 @@ aside > nav > hr {
@apply mx-4;
}

article a {
@apply text-primary-600 hover:text-primary-900;
}

footer {
@apply p-4 md:py-6 mt-24 ml-60 md:mb-0 flex flex-col md:flex-row justify-center text-center text-gray-600 text-sm font-normal;
}
Expand All @@ -789,7 +797,7 @@ footer > ul > li {
}

.dropdown a {
@apply min-h-[3rem] flex flex-row items-center gap-4 py-2 px-3 hover-icon hover:bg-secondary-100 dark:hover:bg-secondary-700 hover:bg-opacity-30 dark:hover:bg-opacity-30;
@apply !text-gray-800 min-h-[3rem] flex flex-row items-center gap-4 py-2 px-3 hover-icon hover:bg-secondary-100 dark:hover:bg-secondary-700 hover:bg-opacity-30 dark:hover:bg-opacity-30;
}

@layer components {
Expand All @@ -806,11 +814,11 @@ footer > ul > li {
}

.card-filled {
@apply card bg-gray-100 dark:bg-gray-700;
@apply card bg-surface-100 dark:bg-gray-700;
}

.btn {
@apply relative items-center justify-center gap-x-2 py-2.5 px-6 rounded-[6.25rem] text-sm tracking-[.00714em] font-medium bg-surface-100 hover:bg-surface-200 focus:bg-surface-300 text-primary-600 dark:bg-surfacedark-100 dark:hover:bg-surfacedark-200 dark:focus:bg-surfacedark-400 dark:text-primary-200;
@apply relative inline-block items-center justify-center gap-x-2 py-2.5 px-6 rounded-[6.25rem] text-sm tracking-[.00714em] font-medium bg-surface-100 hover:bg-surface-200 focus:bg-surface-300 text-primary-600 dark:bg-surfacedark-100 dark:hover:bg-surfacedark-200 dark:focus:bg-surfacedark-400 dark:text-primary-200;
}
}

Expand All @@ -822,6 +830,10 @@ form > fieldset > legend {
@apply bg-surface-200 rounded-xl px-3 py-1 text-base;
}

form > fieldset .btn-primary {
@apply bg-primary-500 hover:bg-primary-600 text-white btn-elevated;
}

.form-help {
@apply text-muted text-sm mt-3;
}
Expand Down Expand Up @@ -870,8 +882,11 @@ hr {
@apply border-gray-200 dark:border-gray-700;
}

.btn-icon {
@apply flex flex-row;
}

.btn .material-symbols-outlined {
@apply text-sm;
}

.btn-create {
Expand All @@ -886,6 +901,10 @@ hr {
@apply bg-red-50 hover:bg-red-500 text-red-600 hover:text-white focus:bg-red-700;
}

.text-danger {
@apply text-red-600 hover:text-red-800;
}

@layer base {
.text-muted {
@apply text-gray-400;
Expand All @@ -908,6 +927,10 @@ form {
@apply mb-4;
}

.form-group:last-of-type {
@apply mb-0;
}

.form-group label {
@apply block text-sm mb-1;
}
Expand All @@ -932,10 +955,22 @@ input[type='text'], input[type='password'], input[type='email'], input[type='num
@apply w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50;
}

input[type='checkbox'] {
@apply w-5 h-5;
}

.form-group textarea {
@apply -mb-2;
}

.form-check {
@apply flex;
}

.form-check input[type='checkbox'] {
@apply mr-2;
}

.important, .important > * {
@apply !bg-red-50 !text-red-700;
}
Expand Down Expand Up @@ -973,11 +1008,11 @@ input[type='text'], input[type='password'], input[type='email'], input[type='num
}

.dl-content > dl > div > dt {
@apply text-sm font-medium leading-6 text-gray-900 pl-5;
@apply text-sm font-medium leading-6 text-gray-900 pl-5 sm:col-span-2;
}

.dl-content > dl > div > dd {
@apply mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0 pl-5;
@apply mt-1 text-sm leading-6 text-gray-700 sm:col-span-5 sm:mt-0 pl-5;
}

.modal {
Expand Down Expand Up @@ -1010,4 +1045,28 @@ input[type='text'], input[type='password'], input[type='email'], input[type='num

.modal-footer .btn-submit {
@apply bg-primary-600 text-white;
}
}

ul.stacked-list {
@apply divide-y divide-surface-200 bg-surface-100 mb-5 rounded-2xl;
}

ul.stacked-list > li {
@apply flex justify-between gap-x-6 py-5 px-5;
}

ul.stacked-list > li > div:first-child {

}

ul.stacked-list > li > div:first-child > p:nth-child(1) {
@apply text-base leading-6 text-gray-900 block;
}

ul.stacked-list > li > div:first-child > p:nth-child(2) {
@apply mt-1 truncate text-sm leading-5 text-gray-500 block;
}

ul.stacked-list > li > div:last-child {
@apply shrink-0 sm:flex sm:flex-col sm:items-end text-sm;
}
2 changes: 1 addition & 1 deletion src/Form/Type/DsbType.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)

$builder
->add('dsb', TextType::class, ['required' => false, 'label' => 'dpoEmail', 'help' => 'dpoEmailHelp', 'translation_domain' => 'form'])
->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-outline-primary'), 'label' => 'appoint', 'translation_domain' => 'form']);
->add('submit', SubmitType::class, ['attr' => array('class' => 'btn btn-primary'), 'label' => 'appoint', 'translation_domain' => 'form']);
}

public function configureOptions(OptionsResolver $resolver)
Expand Down
13 changes: 13 additions & 0 deletions src/Service/MenuService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public function createMainMenu(array $options): ItemInterface
$menu->addChild($this->trans('dashboard'), ['route' => 'dashboard']);
$menu->addChild($this->trans('myAssignments'), ['route' => 'assign']);
$menu->addChild($this->trans('tasks'), ['route' => 'tasks']);
$menu->addChild($this->trans('reports'), ['route' => 'bericht']);
}

$this->handleCurrentItem($menu);
Expand Down Expand Up @@ -136,10 +137,22 @@ private function getRoutePrefix(string $route): string
{
$parts = \explode('_', $this->standardizeRouteName($route));

if ('team_create' === $route) {
return 'manage_teams';
}

if (\str_starts_with($route, 'team')) {
return $route;
}

if (\str_starts_with($route, 'akademie')) {
return $route . '_';
}

if (\str_starts_with($route, 'manage')) {
return $route;
}

return $parts[0];
}

Expand Down
Loading

0 comments on commit a5bf998

Please sign in to comment.