diff --git a/tailwind/custom/asgaros.css b/tailwind/custom/asgaros.css index 89ffe00..1efc6fd 100644 --- a/tailwind/custom/asgaros.css +++ b/tailwind/custom/asgaros.css @@ -145,3 +145,14 @@ div.mce-floatpanel{ } +.asgarosforum-widget { + + .widget-content{ + @apply flex flex-col justify-start items-start; + + .post-author{ + @apply text-white; + } + } + +} \ No newline at end of file diff --git a/tailwind/tailwind-editor-extra.css b/tailwind/tailwind-editor-extra.css index 38df39b..24ffa85 100644 --- a/tailwind/tailwind-editor-extra.css +++ b/tailwind/tailwind-editor-extra.css @@ -20,3 +20,13 @@ .entry-content { @apply px-8 bg-glass; } + +.editor-styles-wrapper{ + z-index:1; +} + +.wp-block-widget-area__panel-body-content { + .editor-styles-wrapper{ + z-index:0; + } +} \ No newline at end of file diff --git a/tailwind/tailwind.css b/tailwind/tailwind.css index 74c51c2..6c0e347 100644 --- a/tailwind/tailwind.css +++ b/tailwind/tailwind.css @@ -41,30 +41,30 @@ :root { --wowp-gap: 1em; - --color-deathknight: #C41E3A; - --color-demonhunter: #A330C9; - --color-druid: #DD7C0A; - --color-evoker: #33937F; - --color-hunter: #AAD372; - --color-mage: #3FC7EB; - --color-monk: #00FF98; - --color-paladin: #F48CBA; - --color-priest: #FFFFFF; - --color-rogue: #FFF468; - --color-shaman: #0070DD; - --color-warlock: #8788EE; - --color-warrior: #C69B6D; - --color-deepblue: #000032; - --color-alliance: #f7941e; - --color-background: var(--color-deepblue); - --color-glass:color-mix(in lch, transparent 75%, var(--color-background) ); + --color-deathknight: #C41E3A; + --color-demonhunter: #A330C9; + --color-druid: #DD7C0A; + --color-evoker: #33937F; + --color-hunter: #AAD372; + --color-mage: #3FC7EB; + --color-monk: #00FF98; + --color-paladin: #F48CBA; + --color-priest: #FFFFFF; + --color-rogue: #FFF468; + --color-shaman: #0070DD; + --color-warlock: #8788EE; + --color-warrior: #C69B6D; + --color-deepblue: #000032; + --color-alliance: #f7941e; + --color-background: var(--color-deepblue); + --color-glass: color-mix(in lch, transparent 75%, var(--color-background)); } -.p-auto{ +.p-auto { padding: var(--wowp-gap); } -.gap-auto{ +.gap-auto { gap: var(--wowp-gap); } @@ -72,7 +72,7 @@ body { background-color: unset; --body-bg: url('https://bnetcmsus-a.akamaihd.net/cms/blog_header/3i/3ITOIMA3P61U1699028715242.png'); position: relative; -z-index: -10; + z-index: -10; @apply min-h-screen; } @@ -81,7 +81,7 @@ z-index: -10; backdrop-filter: blur(10px); } -.shadow{ +.shadow { -webkit-box-shadow: 5px 5px 9px 0px rgba(0, 0, 0, 0.5); box-shadow: 5px 5px 9px 0px rgba(0, 0, 0, 0.5); } @@ -113,9 +113,10 @@ body:before { } .content-wrapper { -display: flex; -flex-direction:column; -gap: var(--wowp-gap); + display: flex; + flex-direction: column; + gap: var(--wowp-gap); + @media screen(xl) { display: grid; grid-column-gap: var(--wowp-gap); @@ -125,124 +126,180 @@ gap: var(--wowp-gap); } } -article{ - margin-inline: var(--wowp-gap); - @media screen(xl){ - margin-inline: unset; - } +article { + margin-inline: var(--wowp-gap); + + @media screen(xl) { + margin-inline: unset; + } } - .post-wrapper { - display: grid; - grid-template-columns: auto auto 1fr; - grid-template-rows: auto auto 1fr auto; - grid-column-gap: var(--wowp-gap); - grid-row-gap: var(--wowp-gap); +.post-wrapper { + display: grid; + grid-template-columns: auto auto 1fr; + grid-template-rows: auto auto 1fr auto; + grid-column-gap: var(--wowp-gap); + grid-row-gap: var(--wowp-gap); +} + +.post-title { + grid-area: 1 / 1 / 2 / 4; + @apply text-center text-2xl py-2; +} + +.post-content { + grid-area: 3 / 1 / 4 / 4; + + padding-inline: var(--wowp-gap); +} + +.post-category { + grid-area: 2 / 1 / 3 / 4; + + span { + @apply p-0; + + &:before { + height: 1.5em; } - - .post-title { grid-area: 1 / 1 / 2 / 4; - @apply text-center text-2xl py-2; + + &:after { + height: 1.5em; } - .post-content { grid-area: 3 / 1 / 4 / 4; - - padding-inline: var(--wowp-gap);} - .post-category { grid-area: 2 / 1 / 3 / 4; - - span{ - @apply p-0; - &:before{ - height: 1.5em; - } - &:after{ - height: 1.5em; - } - - @media screen(xl) { - padding: .75em 1.25em .75em .75em; - &:before{ - height: 3em; - } - &:after{ - height: 3em; - } - } + @media screen(xl) { + padding: .75em 1.25em .75em .75em; + &:before { + height: 3em; } - - } - .post-author { grid-area: 4 / 3 / 5 / 4; - @apply text-end; - color: var(--author-class); - padding-right: var(--wowp-gap); - padding-bottom: var(--wowp-gap); - } - .post-day { grid-area: 4 / 1 / 5 / 2; - - padding-left: var(--wowp-gap); - padding-bottom: var(--wowp-gap); - } - .post-month { grid-area: 4 / 2 / 5 / 3; - padding-bottom: var(--wowp-gap); - - } - .post-avatar{ - display:none; + &:after { + height: 3em; + } } - @media screen(xl){ + } + +} + +.post-author { + grid-area: 4 / 3 / 5 / 4; + @apply text-end; + color: var(--author-class); + padding-right: var(--wowp-gap); + padding-bottom: var(--wowp-gap); + +} + +.post-day { + grid-area: 4 / 1 / 5 / 2; + + padding-left: var(--wowp-gap); + padding-bottom: var(--wowp-gap); +} + +.post-month { + grid-area: 4 / 2 / 5 / 3; + padding-bottom: var(--wowp-gap); + +} + +.post-avatar { + display: none; +} + +@media screen(xl) { .post-wrapper { display: grid; grid-template-columns: 1fr 7fr; grid-template-rows: auto auto 1fr auto auto 1fr auto; grid-column-gap: var(--wowp-gap); grid-row-gap: 0px; - } - - .post-title { grid-area: 1 / 2 / 2 / 5; + } + + .post-title { + grid-area: 1 / 2 / 2 / 5; @apply text-4xl text-left; - } - .post-content { grid-area: 2 / 2 / 8 / 5; + } + + .post-content { + grid-area: 2 / 2 / 8 / 5; @apply prose prose-wowpress; padding: unset; padding-right: var(--wowp-gap); - } - .post-day { grid-area: 1 / 1 / 2 / 2; - @apply bg-shaman flex flex-row items-center justify-center text-4xl; - padding:unset; + } - } - .post-month { - @apply bg-slate-400 flex flex-row items-center justify-center text-xl; - padding: unset; - grid-area: 2 / 1 / 3 / 2; - } - .post-category { grid-area: 3 / 1 / 4 / 2; + .post-day { + grid-area: 1 / 1 / 2 / 2; + @apply bg-shaman flex flex-row items-center justify-center text-4xl; + padding: unset; + + } + + .post-month { + @apply bg-slate-400 flex flex-row items-center justify-center text-xl; + padding: unset; + grid-area: 2 / 1 / 3 / 2; + } + + .post-category { + grid-area: 3 / 1 / 4 / 2; @apply bg-glass; margin-top: var(--wowp-gap); } - .post-avatar { - @apply flex flex-col justify-end items-center bg-glass; - grid-area: 4 / 1 / 7 / 2; - - img{ - @apply rounded-md mb-4 outline shadow w-20; - outline-color: var(--author-class); - - } - + + .post-avatar { + @apply flex flex-col justify-end items-center bg-glass; + grid-area: 4 / 1 / 7 / 2; + + img { + @apply rounded-md mb-4 outline shadow w-20; + outline-color: var(--author-class); + } - .post-author { grid-area: 7 / 1 / 8 / 2; - @apply flex flex-row items-center justify-center; - padding:unset; - - background-color: var(--author-class); - color: black; - } } + .post-author { + grid-area: 7 / 1 / 8 / 2; + @apply flex flex-row items-center justify-center; + + padding: unset; + + background-color: var(--author-class); + color: black; + } +} + +.page-numbers { + @apply btn btn-alliance; + + &.current { + @apply btn-outline; + } +} +.is-type-video { + @apply w-full; + + @media screen(lg) { + @apply w-1/2; + } +} + +.logo { + mask-image: url(icons/logo_nk.png); + mask-repeat: no-repeat; + mask-position: center; + mask-mode: auto; + background-color: var(--color-alliance); + mask-size: contain; + -webkit-mask-image: url(icons/logo_nk.png); + -webkit-mask-repeat: no-repeat; + -webkit-mask-position: center; + -webkit-mask-mode: auto; + -webkit-mask-size: contain; +} \ No newline at end of file diff --git a/theme/icons/class/rogue/subtelty.png b/theme/icons/class/rogue/subtlety.png similarity index 100% rename from theme/icons/class/rogue/subtelty.png rename to theme/icons/class/rogue/subtlety.png diff --git a/theme/icons/logo_nk.png b/theme/icons/logo_nk.png new file mode 100644 index 0000000..4cdda07 Binary files /dev/null and b/theme/icons/logo_nk.png differ diff --git a/theme/inc/template-tags.php b/theme/inc/template-tags.php index 1f1b1ab..c7eecfc 100644 --- a/theme/inc/template-tags.php +++ b/theme/inc/template-tags.php @@ -263,6 +263,7 @@ if ( ! function_exists( 'wowpress_the_posts_navigation' ) ) : 'mid_size' => 2, 'prev_text' => __( 'Newer posts', 'wowpress' ), 'next_text' => __( 'Older posts', 'wowpress' ), + #'base' => "%_%", ) ); } diff --git a/theme/index.php b/theme/index.php index 1c3fbe0..dbff2d9 100644 --- a/theme/index.php +++ b/theme/index.php @@ -36,7 +36,15 @@ get_header(); } // Previous/next page navigation. - wowpress_the_posts_navigation(); + ?> + + -
- -

- -

- -

- +
+ + +
-
-
-
- - -
- -
-
- + diff --git a/theme/template-parts/widgets/boss_kills.php b/theme/template-parts/widgets/boss_kills.php index 4ce73fc..f46eedb 100644 --- a/theme/template-parts/widgets/boss_kills.php +++ b/theme/template-parts/widgets/boss_kills.php @@ -4,17 +4,20 @@

title ?>

-

+

+
+
+
+
+
getBossList($instance) as $boss) { ?> -
-
-
-
+
+
+
+
\ No newline at end of file diff --git a/theme/template-parts/widgets/char_search.php b/theme/template-parts/widgets/char_search.php index c1afe92..594f964 100644 --- a/theme/template-parts/widgets/char_search.php +++ b/theme/template-parts/widgets/char_search.php @@ -2,6 +2,18 @@ use WoWPress\Models\Character; +function hasSearch($specs) + { + foreach ($specs as $spec) { + foreach ($spec as $search) { + if ($search) { + return true; + } + } + } + return false; + } + ?>

Klassensuche

diff --git a/theme/template-parts/widgets/raid_signup.php b/theme/template-parts/widgets/raid_signup.php index 5d5ffc1..206652c 100644 --- a/theme/template-parts/widgets/raid_signup.php +++ b/theme/template-parts/widgets/raid_signup.php @@ -9,7 +9,7 @@ use WoWPress\Models\User; $user = User::find(get_current_user_id()); $raids = Raid::where('start', '>', date('Y-m-d H:i', strtotime('NOW')))->get()->take(intval($instance['count']) ?: 1); $character = $user->raiders->first(); - +if(!empty($character)){ ?>
@@ -31,4 +31,5 @@ $character = $user->raiders->first(); ?>
-
\ No newline at end of file + + 'text NOT NULL', 'realm' => 'text NOT NULL', - 'class' => "text DEFAULT Adventurer", - 'spec' => "text DEFAULT Brave", + 'class' => "text", + 'spec' => "text", 'id_blizz' => 'mediumint', 'id_wowaudit' => 'mediumint', 'raidchar' => 'boolean DEFAULT 0', diff --git a/theme/wowpress/Frontend/Widgets/BossKills.php b/theme/wowpress/Frontend/Widgets/BossKills.php index 7c76398..bdd48be 100644 --- a/theme/wowpress/Frontend/Widgets/BossKills.php +++ b/theme/wowpress/Frontend/Widgets/BossKills.php @@ -12,6 +12,29 @@ class BossKills extends Widget protected $restricted = false; + public function getBossList($instance){ + $out = []; + foreach($instance['bosses'] as $boss){ + if(!empty($boss['name'])){ + $out[] = $boss; + } + } + + return $out; + } + + public function getCompletePercent($instance){ + $bosses = $this->getBossList($instance); + $done = 0; + foreach($bosses as $boss){ + if(!empty($boss['date'])){ + $done++; + } + } + + + return (($done/100)*count($bosses))*1000; + } public function form($instance) {