packages/A-Ops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync branch

Browse Source
This commit is contained in:
gitee-cmd 2021-09-30 11:00:25 +08:00
parent 72909bf0dc
commit a8dba36162
5 changed files with 65 additions and 1304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
0004-fix-logos-instructions-and-size.patch
View File

@ -1,56 +1,55 @@
From b0674ab2e6390ebdf778a32a69716f1e4195fabd Mon Sep 17 00:00:00 2001
From: gitee-cmd <chemingdao@huawei.com>
Date: Wed, 29 Sep 2021 21:14:03 +0800
Subject: [PATCH 1/2] fix logos' instructions and size
---
aops-web/src/appCore/components/GlobalFooter/index.vue | 2 +-
aops-web/src/appCore/layouts/BasicLayout.vue | 6 +++++-
aops-web/src/appCore/layouts/UserLayout.vue | 1 -
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/aops-web/src/appCore/components/GlobalFooter/index.vue b/aops-web/src/appCore/components/GlobalFooter/index.vue
index 839ddc8..d0433cc 100644
--- a/aops-web/src/appCore/components/GlobalFooter/index.vue
+++ b/aops-web/src/appCore/components/GlobalFooter/index.vue
@@ -11,7 +11,7 @@
</div>
</template>
<template v-slot:copyright>
- logo
+ <img src="~@/assets/horizontal-left.png" style="height: 20px" class="logo" alt="logo">
</template>
</global-footer>
</template>
diff --git a/aops-web/src/appCore/layouts/BasicLayout.vue b/aops-web/src/appCore/layouts/BasicLayout.vue
index e4fd9f8..b7b7a15 100644
--- a/aops-web/src/appCore/layouts/BasicLayout.vue
+++ b/aops-web/src/appCore/layouts/BasicLayout.vue
@@ -139,6 +139,10 @@ export default {
}
</script>
-<style lang="less">
+<style lang="less" scoped>
@import "./BasicLayout.less";
+.logo {
+ height: auto;
+ width: 32px;
+}
</style>
diff --git a/aops-web/src/appCore/layouts/UserLayout.vue b/aops-web/src/appCore/layouts/UserLayout.vue
index 36826de..15eb79d 100644
--- a/aops-web/src/appCore/layouts/UserLayout.vue
+++ b/aops-web/src/appCore/layouts/UserLayout.vue
@@ -126,7 +126,6 @@ export default {
.logo {
height: 80px;
vertical-align: top;
- margin-right: 16px;
border-style: none;
}
--
2.30.0
From 1e99582df4fd558ed52ee3d3c4b6522b2251000f Mon Sep 17 00:00:00 2001
From: gitee-cmd <chemingdao@huawei.com>
Date: Thu, 30 Sep 2021 09:33:56 +0800
Subject: [PATCH] fix logos' instructions and size
---
aops-web/src/appCore/components/GlobalFooter/index.vue | 2 +-
aops-web/src/appCore/layouts/BasicLayout.vue | 6 +++++-
aops-web/src/appCore/layouts/UserLayout.vue | 1 -
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/aops-web/src/appCore/components/GlobalFooter/index.vue b/aops-web/src/appCore/components/GlobalFooter/index.vue
index 839ddc8..b485907 100644
--- a/aops-web/src/appCore/components/GlobalFooter/index.vue
+++ b/aops-web/src/appCore/components/GlobalFooter/index.vue
@@ -11,7 +11,7 @@
</div>
</template>
<template v-slot:copyright>
- logo
+ <img src="~@/assets/horizontal-left.png" style="height: 20px" class="logo" alt="logo">
</template>
</global-footer>
</template>
diff --git a/aops-web/src/appCore/layouts/BasicLayout.vue b/aops-web/src/appCore/layouts/BasicLayout.vue
index e4fd9f8..ca29cdc 100644
--- a/aops-web/src/appCore/layouts/BasicLayout.vue
+++ b/aops-web/src/appCore/layouts/BasicLayout.vue
@@ -139,6 +139,10 @@ export default {
}
</script>
-<style lang="less">
+<style lang="less" scoped>
@import "./BasicLayout.less";
+.logo {
+ height: auto;
+ width: 32px;
+}
</style>
diff --git a/aops-web/src/appCore/layouts/UserLayout.vue b/aops-web/src/appCore/layouts/UserLayout.vue
index 36826de..15eb79d 100644
--- a/aops-web/src/appCore/layouts/UserLayout.vue
+++ b/aops-web/src/appCore/layouts/UserLayout.vue
@@ -126,7 +126,6 @@ export default {
.logo {
height: 80px;
vertical-align: top;
- margin-right: 16px;
border-style: none;
}
--
2.30.0

1244
0005-switch-logo-images.patch
View File

File diff suppressed because it is too large Load Diff

14
A-Ops.spec
View File

@ -1,16 +1,18 @@
Name: A-Ops
Version: v1.1.1
Release: 4
Release: 5
Summary: The intelligent ops toolkit for openEuler
License: MulanPSL2
URL: https://gitee.com/openeuler/A-Ops
Source0: %{name}-%{version}.tar.gz
Source1: A-Ops-web-node-modules.tar.gz
Source2: vertical-left.png
Source3: horizontal-left.png
patch0001: 0001-fix-diag-return.patch
patch0002: 0002-fix-log-of-task-execution.patch
patch0003: 0003-add-permission-control-in-ragdoll.patch
patch0004: 0004-fix-logos-instructions-and-size.patch
patch0005: 0005-switch-logo-images.patch
# build for gopher
BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel
@ -175,8 +177,9 @@ website for A-Ops, deployed by Nginx
%patch0002 -p1
%patch0003 -p1
%patch0004 -p1
git apply $RPM_SOURCE_DIR/0005-switch-logo-images.patch --binary
cp -r A-Ops-web-node-modules/node_modules aops-web/
cp -f $RPM_SOURCE_DIR/vertical-left.png aops-web/src/assets/
cp -f $RPM_SOURCE_DIR/horizontal-left.png aops-web/src/assets/
%build
# build for aops-utils
@ -497,6 +500,9 @@ fi
%changelog
* Thu Sep 30 2021 chemingdao<chemingdao@huawei.com> - v1.1.1-5
- Using image source overwrite instead of patching image binaries.
* Wed Sep 29 2021 chemingdao<chemingdao@huawei.com> - v1.1.1-4
- switch logo images and modify logo size.
@ -552,4 +558,4 @@ fi
- Update spec
* Sat Jul 31 2021 orange-snn<songnannan2@huawei.com> - 1.0.0-1
- Package init
- Package init

BIN
horizontal-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
vertical-left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB