Skip to content

Commit

Permalink
title and settings fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Дмитрий Мартынов authored and Дмитрий Мартынов committed Jan 12, 2025
1 parent 24a974a commit 47e474a
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
4 changes: 1 addition & 3 deletions src/components/LineChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,12 @@ console.log(loginStore.getStoreWeights)
.mainBlockLineChart {
background-color: #007aff;
height: 120px;
border-radius: 15px;
padding: 10px 20px 20px 20px;
margin-bottom: 20px;
}
.lineChart {
Expand Down
4 changes: 3 additions & 1 deletion src/components/Now.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<a class="now">Калорий сегодня</a>
<a class="update" v-if="backTime > 0">обновлено {{ backTime }} минут назад</a>
<a class="update" v-else>обновлено только что</a>
<div class="ccal">{{ loginStore.getSumCcalToday }} ккал<svg
<div class="ccal">{{ loginStore.getSumCcalToday }} ккал<svg @click="hiddenStore.add = !hiddenStore.add"
aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 24 24">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.4"
d="M18 5V4a1 1 0 0 0-1-1H8.914a1 1 0 0 0-.707.293L4.293 7.207A1 1 0 0 0 4 7.914V20a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-5M9 3v4a1 1 0 0 1-1 1H4m11.383.772 2.745 2.746m1.215-3.906a2.089 2.089 0 0 1 0 2.953l-6.65 6.646L9 17.95l.739-3.692 6.646-6.646a2.087 2.087 0 0 1 2.958 0Z" />
Expand All @@ -18,6 +18,8 @@
<script setup>
import { useLogin } from '../store/Login';
const loginStore = useLogin();
import { useComponents } from '../store/ComponentsHidden';
const hiddenStore = useComponents();
import { ref, watch } from 'vue'
Expand Down
7 changes: 6 additions & 1 deletion src/components/Target.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
Цели <svg @click="hiddenStore.showSettings()" class="imageMain" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"
<a class="title">Цели</a> <svg @click="hiddenStore.showSettings()" class="imageMain" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none"
viewBox="0 0 24 24">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"
d="M11 9h6m-6 3h6m-6 3h6M6.996 9h.01m-.01 3h.01m-.01 3h.01M4 5h16a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1Z" />
Expand Down Expand Up @@ -77,6 +77,7 @@ defineProps({


<style scoped>
.mainBlockTarget {
display: flex;
overflow-x: scroll;
Expand All @@ -87,6 +88,10 @@ defineProps({
.mainBlockTarget::-webkit-scrollbar {
display: none;
}
.title{
font-weight: 600;
}
.imageMain {
color: #007aff;
float: right;
Expand Down
6 changes: 5 additions & 1 deletion src/components/TimeLine.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<template>
<a class="title">Лента событий</a>
<div class="mainBlockTimeLine">


Expand Down Expand Up @@ -34,6 +35,7 @@
<script setup>
import { useLogin } from '../store/Login';
const loginStore = useLogin();
import { ref, watch } from 'vue'
Expand All @@ -60,7 +62,9 @@ defineProps({
padding-top: 30px;
box-shadow: 0px 4px 5px 0px #dedee0;
}
.title{
font-weight: 600;
}
.blockTimeLine {
height: 100px;
Expand Down

0 comments on commit 47e474a

Please sign in to comment.