From 9806ca2cd1f15c6cf7b595ae455ff61904792b8a Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 21 八月 2023 09:56:14 +0800
Subject: [PATCH] 大屏
---
screen_standard/src/App.vue | 65 ++------------------------------
1 files changed, 4 insertions(+), 61 deletions(-)
diff --git a/screen_standard/src/App.vue b/screen_standard/src/App.vue
index a3a8bdb..9799296 100644
--- a/screen_standard/src/App.vue
+++ b/screen_standard/src/App.vue
@@ -1,73 +1,16 @@
<script setup>
-import { RouterLink, RouterView } from 'vue-router'
+
import AppLayout from './components/AppLayout.vue'
</script>
<template>
<AppLayout />
+<<<<<<< HEAD
+=======
+>>>>>>> 5103535bcd7b012c0eda4cbb26968066b35704d1
</template>
<style scoped>
-header {
- line-height: 1.5;
- max-height: 100vh;
-}
-.logo {
- display: block;
- margin: 0 auto 2rem;
-}
-
-nav {
- width: 100%;
- font-size: 12px;
- text-align: center;
- margin-top: 2rem;
-}
-
-nav a.router-link-exact-active {
- color: var(--color-text);
-}
-
-nav a.router-link-exact-active:hover {
- background-color: transparent;
-}
-
-nav a {
- display: inline-block;
- padding: 0 1rem;
- border-left: 1px solid var(--color-border);
-}
-
-nav a:first-of-type {
- border: 0;
-}
-
-@media (min-width: 1024px) {
- header {
- display: flex;
- place-items: center;
- padding-right: calc(var(--section-gap) / 2);
- }
-
- .logo {
- margin: 0 2rem 0 0;
- }
-
- header .wrapper {
- display: flex;
- place-items: flex-start;
- flex-wrap: wrap;
- }
-
- nav {
- text-align: left;
- margin-left: -1rem;
- font-size: 1rem;
-
- padding: 1rem 0;
- margin-top: 1rem;
- }
-}
</style>
--
Gitblit v1.9.3