Skip to content

Commit 1864dc6

Browse files
authored
Merge pull request #141 from buggregator/issue/#134-add-logo
Issue/#134 add logo
2 parents 9903686 + 2077fca commit 1864dc6

File tree

8 files changed

+90
-33
lines changed

8 files changed

+90
-33
lines changed

src/assets/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ body a:hover {
99
}
1010
body a[disabled="true"] {
1111
pointer-events: none;
12+
text-decoration: none !important;
1213
}

src/assets/mixins.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
@mixin layout-head {
1010
@apply justify-between;
11-
@apply backdrop-blur-sm bg-gradient-to-b from-white/80 to-white/20 dark:from-gray-800/80 dark:to-gray-800/20;
12-
//@apply backdrop-blur dark:backdrop-brightness-150 dark:bg-black/30 bg-white/30;
11+
@apply backdrop-blur-sm bg-gradient-to-b from-white/100 to-white/20 dark:from-gray-800/100 dark:to-gray-800/20;
1312
@apply absolute left-0 right-0 z-50;
1413
@apply h-9 sm:h-10 md:h-14;
1514
@apply px-2 md:px-4;
Lines changed: 1 addition & 0 deletions
Loading

src/shared/ui/icon-svg/icon-svg-originals/logo.svg

Lines changed: 9 additions & 5 deletions
Loading

src/shared/ui/icon-svg/icon-svg.vue

Lines changed: 40 additions & 7 deletions
Large diffs are not rendered by default.

src/shared/ui/pause-button/pause-button.vue

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,32 @@ const toggleUpdate = () => {
5252
5353
.pause-button {
5454
@include button;
55-
@apply bg-blue-400 dark:bg-gray-700 hover:bg-blue-500 dark:hover:bg-blue-800;
56-
@apply flex items-center space-x-1;
57-
@apply text-gray-800 dark:text-white hover:opacity-100 opacity-40 relative;
58-
@apply relative;
55+
@apply flex items-center space-x-1 relative;
56+
@apply bg-blue-300 hover:bg-blue-500 text-gray-200;
57+
@apply dark:bg-gray-700 dark:hover:bg-blue-800 dark:text-white;
5958
6059
&[disabled] {
61-
@apply bg-gray-400 dark:bg-gray-700 opacity-40 text-gray-400 cursor-not-allowed;
60+
@apply bg-gray-400 opacity-50 cursor-not-allowed text-white;
61+
@apply dark:bg-gray-700 dark:text-white;
6262
}
6363
}
6464
6565
.pause-button--active {
66-
@apply opacity-100 bg-blue-500 dark:bg-blue-800;
66+
@apply opacity-100 bg-blue-500 dark:bg-blue-800 text-white;
6767
}
6868
6969
.pause-button__icon {
7070
@apply w-4 h-4 stroke-white animate-pulse;
71+
72+
[disabled] > & {
73+
@apply animate-none;
74+
}
7175
}
7276
73-
.pause-button--active .pause-button__icon {
74-
@apply animate-none;
77+
.pause-button__icon {
78+
.pause-button--active & {
79+
@apply animate-none;
80+
}
7581
}
7682
7783
.pause-button__count {

src/widgets/ui/layout-sidebar/layout-sidebar.vue

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ const logout = () => {
6060
<template>
6161
<aside class="layout-sidebar">
6262
<nav class="layout-sidebar__nav">
63+
<NuxtLink
64+
to="/"
65+
title="Events"
66+
class="layout-sidebar__link layout-sidebar__link--logo"
67+
>
68+
<IconSvg class="layout-sidebar__link-icon" name="logo-short" />
69+
</NuxtLink>
70+
6371
<NuxtLink to="/" title="Events" class="layout-sidebar__link">
6472
<IconSvg class="layout-sidebar__link-icon" name="events" />
6573
</NuxtLink>
@@ -164,16 +172,21 @@ const logout = () => {
164172
165173
.layout-sidebar__link {
166174
@apply block relative;
167-
@apply text-blue-500 hover:text-white;
168-
@apply hover:bg-gray-700;
169175
@apply flex items-center justify-center;
170176
@apply md:mx-1 lg:mx-1.5 md:mt-1 lg:mt-1.5 md:rounded-lg;
177+
@apply text-blue-500 hover:text-white hover:bg-gray-700 hover:opacity-100;
171178
172179
&.router-link-active {
173180
@apply bg-blue-700 text-blue-200;
174181
}
175182
}
176183
184+
.layout-sidebar__link--logo,
185+
.layout-sidebar__link--logo.router-link-active {
186+
@apply text-blue-600 bg-transparent hover:text-blue-600 hover:bg-transparent;
187+
@apply dark:text-blue-500 dark:bg-transparent hover:dark:text-blue-200 hover:dark:bg-transparent;
188+
}
189+
177190
.layout-sidebar__link-icon {
178191
@apply flex items-center justify-center;
179192
@apply fill-current;

src/widgets/ui/page-placeholder/page-placeholder.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script lang="ts" setup>
2-
import PagePlaceholderItem from "./page-placeholder-item.vue";
32
import { IconSvg } from "~/src/shared/ui";
3+
import PagePlaceholderItem from "./page-placeholder-item.vue";
44
55
const items = [
66
{
@@ -23,8 +23,8 @@ const items = [
2323

2424
<template>
2525
<div class="page-placeholder">
26-
<div class="logo">
27-
<IconSvg name="logo"/>
26+
<div class="page-placeholder__logo">
27+
<IconSvg class="page-placeholder__logo-in" name="logo" />
2828
</div>
2929
<ul class="page-placeholder__list">
3030
<PagePlaceholderItem
@@ -40,18 +40,18 @@ const items = [
4040

4141
<style lang="scss" scoped>
4242
.page-placeholder {
43-
@apply p-4 md:p-6 lg:p-10 w-1/2;
43+
@apply p-6 lg:p-10 w-1/2 md:w-1/3 lg:w-1/3;
4444
@apply bg-white dark:bg-gray-900;
4545
@apply border dark:border-gray-600 rounded-lg;
4646
@apply text-gray-600 dark:text-gray-300;
4747
}
4848
49-
.logo {
50-
@apply mb-10 flex h-10;
49+
.page-placeholder__logo {
50+
@apply mb-4 md:mb-6 lg:mb-10 flex text-black dark:text-white w-full;
51+
}
5152
52-
svg {
53-
@apply h-10;
54-
}
53+
.page-placeholder__logo-in {
54+
@apply h-8 md:h-12 lg:h-14;
5555
}
5656
5757
.page-placeholder__list {

0 commit comments

Comments
 (0)