From 837acf0b2e74b3dca88aed2ec5440df3aa605541 Mon Sep 17 00:00:00 2001 From: liuboaibc Date: Thu, 28 May 2020 21:23:46 +0800 Subject: [PATCH] add icons --- assets/scss/contribution.scss | 47 +- assets/scss/header.scss | 22 +- assets/scss/index.scss | 55 +- config/_default/config.toml | 68 +-- content/en/_index.md | 3 + content/en/contribution/_index.md | 132 ++--- layouts/contribution/list.html | 14 + layouts/index.html | 13 +- layouts/partials/header.html | 6 +- static/favicon.ico | Bin 0 -> 1150 bytes static/images/contribution/calicq10.svg | 21 + static/images/contribution/calicq11.jpg | Bin 0 -> 11676 bytes static/images/contribution/calicq12.jpg | Bin 0 -> 9957 bytes static/images/contribution/calicq13.jpg | Bin 0 -> 7348 bytes static/images/contribution/calicq14.jpg | Bin 0 -> 7936 bytes static/images/contribution/calicq15.jpg | Bin 0 -> 12927 bytes static/images/contribution/calicq16.jpg | Bin 0 -> 13214 bytes static/images/contribution/calicq17.jpg | Bin 0 -> 8553 bytes static/images/contribution/calicq18.svg | 22 + static/images/contribution/calicq19.jpg | Bin 0 -> 12140 bytes static/images/contribution/calicq20.jpg | Bin 0 -> 10578 bytes static/images/contribution/calicq21.jpg | Bin 0 -> 10337 bytes static/images/contribution/calicq22.jpg | Bin 0 -> 13168 bytes static/images/contribution/calicq23.jpg | Bin 0 -> 9390 bytes static/images/contribution/calicq24.jpg | Bin 0 -> 8111 bytes static/images/contribution/calicq25.jpg | Bin 0 -> 10227 bytes static/images/contribution/calicq26.jpg | Bin 0 -> 15424 bytes static/images/contribution/calicq27.jpg | Bin 0 -> 8886 bytes static/images/contribution/calicq28.jpg | Bin 0 -> 11251 bytes static/images/contribution/calicq29.jpg | Bin 0 -> 11867 bytes static/images/contribution/calicq30.svg | 32 ++ static/images/contribution/calicq31.jpg | Bin 0 -> 14236 bytes static/images/contribution/calicq32.jpg | Bin 0 -> 9128 bytes static/images/contribution/calicq33.jpg | Bin 0 -> 9451 bytes static/images/contribution/calicq34.jpg | Bin 0 -> 13562 bytes static/images/contribution/calicq35.jpg | Bin 0 -> 8606 bytes static/images/contribution/calicq36.jpg | Bin 0 -> 10505 bytes static/images/contribution/calicq37.jpg | Bin 0 -> 11088 bytes static/images/contribution/calicq38.jpg | Bin 0 -> 9334 bytes static/images/contribution/calicq39.jpg | Bin 0 -> 12310 bytes static/images/contribution/calicq4.jpg | Bin 0 -> 7460 bytes static/images/contribution/calicq40.jpg | Bin 0 -> 12272 bytes static/images/contribution/calicq5.svg | 18 + static/images/contribution/calicq6.jpg | Bin 0 -> 8986 bytes static/images/contribution/calicq7.jpg | Bin 0 -> 12227 bytes static/images/contribution/calicq8.svg | 20 + static/images/contribution/calicq9.jpg | Bin 0 -> 8726 bytes static/images/contribution/involve-bg.jpg | Bin 0 -> 565143 bytes static/images/contribution/section5-1.svg | 34 ++ static/images/contribution/section5-2.jpg | Bin 0 -> 25714 bytes static/images/contribution/section5-3.jpg | Bin 0 -> 28482 bytes static/images/contribution/section5-4.jpg | Bin 0 -> 19925 bytes static/images/contribution/section5-5.jpg | Bin 0 -> 16426 bytes static/images/home/12-3.png | Bin 0 -> 77276 bytes static/images/home/46.svg | 18 +- static/images/home/52.png | Bin 0 -> 197364 bytes static/images/home/53.png | Bin 0 -> 448868 bytes static/images/home/bg.png | Bin 0 -> 577963 bytes static/images/home/join-bg1.svg | 25 + static/images/home/join-bg2.svg | 29 + static/images/home/join-right.svg | 640 ++++++++++++++++++++++ static/images/home/section4-left.png | Bin 0 -> 154274 bytes 62 files changed, 1061 insertions(+), 158 deletions(-) create mode 100644 static/favicon.ico create mode 100644 static/images/contribution/calicq10.svg create mode 100644 static/images/contribution/calicq11.jpg create mode 100644 static/images/contribution/calicq12.jpg create mode 100644 static/images/contribution/calicq13.jpg create mode 100644 static/images/contribution/calicq14.jpg create mode 100644 static/images/contribution/calicq15.jpg create mode 100644 static/images/contribution/calicq16.jpg create mode 100644 static/images/contribution/calicq17.jpg create mode 100644 static/images/contribution/calicq18.svg create mode 100644 static/images/contribution/calicq19.jpg create mode 100644 static/images/contribution/calicq20.jpg create mode 100644 static/images/contribution/calicq21.jpg create mode 100644 static/images/contribution/calicq22.jpg create mode 100644 static/images/contribution/calicq23.jpg create mode 100644 static/images/contribution/calicq24.jpg create mode 100644 static/images/contribution/calicq25.jpg create mode 100644 static/images/contribution/calicq26.jpg create mode 100644 static/images/contribution/calicq27.jpg create mode 100644 static/images/contribution/calicq28.jpg create mode 100644 static/images/contribution/calicq29.jpg create mode 100644 static/images/contribution/calicq30.svg create mode 100644 static/images/contribution/calicq31.jpg create mode 100644 static/images/contribution/calicq32.jpg create mode 100644 static/images/contribution/calicq33.jpg create mode 100644 static/images/contribution/calicq34.jpg create mode 100644 static/images/contribution/calicq35.jpg create mode 100644 static/images/contribution/calicq36.jpg create mode 100644 static/images/contribution/calicq37.jpg create mode 100644 static/images/contribution/calicq38.jpg create mode 100644 static/images/contribution/calicq39.jpg create mode 100644 static/images/contribution/calicq4.jpg create mode 100644 static/images/contribution/calicq40.jpg create mode 100644 static/images/contribution/calicq5.svg create mode 100644 static/images/contribution/calicq6.jpg create mode 100644 static/images/contribution/calicq7.jpg create mode 100644 static/images/contribution/calicq8.svg create mode 100644 static/images/contribution/calicq9.jpg create mode 100644 static/images/contribution/involve-bg.jpg create mode 100644 static/images/contribution/section5-1.svg create mode 100644 static/images/contribution/section5-2.jpg create mode 100644 static/images/contribution/section5-3.jpg create mode 100644 static/images/contribution/section5-4.jpg create mode 100644 static/images/contribution/section5-5.jpg create mode 100644 static/images/home/12-3.png mode change 100644 => 100755 static/images/home/46.svg create mode 100644 static/images/home/52.png create mode 100644 static/images/home/53.png create mode 100644 static/images/home/bg.png create mode 100644 static/images/home/join-bg1.svg create mode 100644 static/images/home/join-bg2.svg create mode 100644 static/images/home/join-right.svg create mode 100644 static/images/home/section4-left.png diff --git a/assets/scss/contribution.scss b/assets/scss/contribution.scss index 230a82e73..8d1e3c4d6 100644 --- a/assets/scss/contribution.scss +++ b/assets/scss/contribution.scss @@ -407,18 +407,24 @@ } .section-4 { + position: relative; text-align: center; - background-color: #ffffff; - padding-top: 80px; padding-bottom: 93px; + + & > img { + width: 100%; + height: 445px; + object-fit: cover; + } h2 { height: 52px; + margin-top: -385px; margin-bottom: 60px; text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); font-size: 32px; font-weight: bold; line-height: 1.63; - color: #171c34; + color: #ffffff; } & > div { @@ -428,7 +434,7 @@ & > div { width: 471px; height: 565px; - background-color: #f5f9fa; + background-color: #ffffff; img { width: 168px; height: 168px; @@ -481,4 +487,37 @@ } } } +} + +.section-5 { + width: 1160px; + margin: 0 auto; + + h2 { + height: 52px; + text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); + font-family: Roboto; + font-size: 32px; + font-weight: bold; + line-height: 1.63; + text-align: center; + color: #171c34; + } + + ul { + margin-top: 36px; + text-align: center; + font-size: 0; + + li { + display: inline-block; + margin: 0 10px; + + img { + width: 210px; + height: 100px; + object-fit: contain; + } + } + } } \ No newline at end of file diff --git a/assets/scss/header.scss b/assets/scss/header.scss index e8050eea2..7fdfb4955 100644 --- a/assets/scss/header.scss +++ b/assets/scss/header.scss @@ -112,17 +112,17 @@ color: #55bc8a; } } - &::after { - position: absolute; - top: -20px; - left: 50%; - transform: translateX(-50%); - content: ""; - width: 0; - height: 0; - border: 10px solid transparent; - border-bottom-color: #fff; - } + // &::after { + // position: absolute; + // top: -20px; + // left: 50%; + // transform: translateX(-50%); + // content: ""; + // width: 0; + // height: 0; + // border: 10px solid transparent; + // border-bottom-color: #fff; + // } } .right-menu { diff --git a/assets/scss/index.scss b/assets/scss/index.scss index 1c7fc5b85..ac97d67c2 100644 --- a/assets/scss/index.scss +++ b/assets/scss/index.scss @@ -15,6 +15,7 @@ section { position: absolute; top: 0; right: 0; + height: 431px; } & > .img2 { @@ -93,8 +94,7 @@ section { width: 211px; color: #ffffff; box-shadow: 0 10px 50px 0 rgba(34, 43, 62, 0.1), 0 8px 16px 0 rgba(33, 43, 61, 0.2), 0 10px 50px 0 rgba(76, 169, 134, 0.05); - background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.1) 97%), linear-gradient(to bottom, #000000, #000000); - + background-image: linear-gradient(to bottom,rgba(0,0,0,0),rgba(0,0,0,0.1) 97%),linear-gradient(to bottom,#242e42,#242e42); } .btn2 { @@ -119,7 +119,7 @@ section { } .img2 { - top: 507px; + top: 490px; right: 454px; } @@ -684,7 +684,6 @@ section { .section-6 { position: relative; box-sizing: border-box; - height: 1100px; margin-top: -300px; padding-top: 300px; background-color: #f5f8f9; @@ -781,11 +780,57 @@ section { } } + & > .join-div { + display: block; + position: relative; + box-sizing: border-box; + margin-top: 90px; + height: 110px; + padding: 25px 266px 0 55px; + text-align: left; + border-radius: 12px; + background-color: #ffffff; + box-shadow: 0 4px 8px 0 rgba(36, 46, 66, 0.06), 0 8px 16px 0 rgba(36, 46, 66, 0.05); + + &:hover { + background-image: linear-gradient(99deg, #4a499a 29%, #8552c3 80%); + + .p1, .p2 { + color: #ffffff; + } + } + + .p1 { + height: 24px; + font-size: 20px; + color: #30313b; + } + + .p2 { + height: 32px; + margin-top: 4px; + opacity: 0.8; + font-size: 16px; + line-height: 2; + color: #919aa3; + } + + & > img { + position: absolute; + bottom: 0; + right: 45px; + } + } + .bottom-img { width: 639px; height: 72px; - margin-top: 107px; + margin-top: 95px; object-fit: contain; } } +} + +footer { + background: #ffffff; } \ No newline at end of file diff --git a/config/_default/config.toml b/config/_default/config.toml index 2603c601c..488566cf1 100644 --- a/config/_default/config.toml +++ b/config/_default/config.toml @@ -26,53 +26,23 @@ weight = 2 name = "Scenario" hasChildren = true - [[languages.en.menu.main]] - parent = "Scenario" - name = "Multi-cluster" - URL = "multi-cluster" - weight = 1 - [[languages.en.menu.main]] parent = "Scenario" name = "DevOps" - URL = "devOps" - weight = 2 - - [[languages.en.menu.main]] - parent = "Scenario" - name = "Network" - URL = "network" - weight = 3 + URL = "dev-ops" + weight = 1 [[languages.en.menu.main]] parent = "Scenario" name = "Service Mesh" URL = "service-mesh" - weight = 4 - - [[languages.en.menu.main]] - parent = "Scenario" - name = "Storage" - URL = "storage" - weight = 5 - - [[languages.en.menu.main]] - parent = "Scenario" - name = "AppStore" - URL = "app-store" - weight = 6 - - [[languages.en.menu.main]] - parent = "Scenario" - name = "Multi-tenancy" - URL = "multi-tenancy" - weight = 7 + weight = 2 [[languages.en.menu.main]] parent = "Scenario" name = "Observability" URL = "observability" - weight = 8 + weight = 3 [[languages.en.menu.main]] weight = 3 @@ -146,12 +116,6 @@ weight = 2 name = "Scenario" hasChildren = true - [[languages.zh.menu.main]] - parent = "Scenario" - name = "Multi-cluster" - URL = "multi-cluster" - weight = 1 - [[languages.zh.menu.main]] parent = "Scenario" name = "DevOps" @@ -160,34 +124,10 @@ hasChildren = true [[languages.zh.menu.main]] parent = "Scenario" - name = "Network" - URL = "network" - weight = 3 - - [[languages.en.menu.main]] - parent = "Scenario" name = "Service Mesh" URL = "service-mesh" weight = 4 - [[languages.en.menu.main]] - parent = "Scenario" - name = "Storage" - URL = "storage" - weight = 5 - - [[languages.zh.menu.main]] - parent = "Scenario" - name = "AppStore" - URL = "app-store" - weight = 6 - - [[languages.zh.menu.main]] - parent = "Scenario" - name = "Multi-tenancy" - URL = "multi-tenancy" - weight = 7 - [[languages.zh.menu.main]] parent = "Scenario" name = "Observability" diff --git a/content/en/_index.md b/content/en/_index.md index 3d1803b3c..539bb3fe6 100644 --- a/content/en/_index.md +++ b/content/en/_index.md @@ -164,5 +164,8 @@ section6: btnLink: link: linkContent: Want your logo up there? Just submit a pull request → + joinTitle: Join the Revolution,Partner with KubeSphere + joinContent: We look forward to your joining KubeSphere partner to improve the ecosystem of both, and grow your business. + joinLink: image: /images/home/certification.jpg --- \ No newline at end of file diff --git a/content/en/contribution/_index.md b/content/en/contribution/_index.md index ce999db64..e6b4650bd 100644 --- a/content/en/contribution/_index.md +++ b/content/en/contribution/_index.md @@ -96,176 +96,174 @@ section3: - name: 'App store' icon: '/images/contribution/app-store.svg' iconActive: '/images/contribution/app-store-active.svg' - content: '' + content: 'App Store, App template management' link: '' linkContent: 'Join SIG - App store →' children: - - icon: '/images/contribution/calicq1.jpg' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq4.jpg' + - icon: '/images/contribution/calicq5.svg' + - icon: '/images/contribution/calicq6.jpg' - name: 'Architecture' icon: '/images/contribution/architecture.svg' iconActive: '/images/contribution/architecture-active.svg' - content: '' + content: ' System architecture design and investigation' link: '' linkContent: 'Join SIG - Architecture →' children: - - icon: '' + - icon: '/images/contribution/calicq7.jpg' + - icon: '/images/contribution/calicq8.svg' - name: 'Cloud-Providers' icon: '/images/contribution/cloud-providers.svg' iconActive: '/images/contribution/cloud-providers-active.svg' - content: '' + content: 'Support KubeSphere on multi-cloud ' link: '' linkContent: 'Join SIG - Cloud-Providers →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq9.jpg' + - icon: '/images/contribution/calicq10.svg' + - icon: '/images/contribution/calicq11.jpg' - name: 'Console (Front-end)' icon: '/images/contribution/console.svg' iconActive: '/images/contribution/console-active.svg' - content: '' + content: 'Web console and framework Devlopment' link: '' linkContent: 'Join SIG - Console (Front-end) →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq12.jpg' + - icon: '/images/contribution/calicq13.jpg' + - icon: '/images/contribution/calicq14.jpg' - name: 'DevOps' icon: '/images/contribution/dev-ops.svg' iconActive: '/images/contribution/dev-ops-active.svg' - content: '' + content: 'Pipeline, s2i, b2i, image registry' link: '' linkContent: 'Join SIG - DevOps →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq15.jpg' + - icon: '/images/contribution/calicq16.jpg' + - icon: '/images/contribution/calicq17.jpg' - name: ' Docs' icon: '/images/contribution/docs.svg' iconActive: '/images/contribution/docs-active.svg' - content: '' + content: 'Documentation and Website' link: '' linkContent: 'Join SIG - Docs →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq8.svg' + - icon: '/images/contribution/calicq7.jpg' + - icon: '/images/contribution/calicq18.svg' - name: 'Edge' icon: '/images/contribution/edge.svg' iconActive: '/images/contribution/edge-active.svg' - content: '' + content: 'Support edge computing platforms such as kubeEdge, K3s etc.' link: '' linkContent: 'Join SIG - Edge →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq19.jpg' + - icon: '/images/contribution/calicq20.jpg' - name: 'Installation' icon: '/images/contribution/installation.svg' iconActive: '/images/contribution/installation-active.svg' - content: '' + content: 'KubeSphere installer and deployment' link: '' linkContent: 'Join SIG - Installation →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq21.jpg' + - icon: '/images/contribution/calicq7.jpg' + - icon: '/images/contribution/calicq22.jpg' - name: 'Microservice' icon: '/images/contribution/microservice.svg' iconActive: '/images/contribution/microservice-active.svg' - content: '' + content: ' microservice governance and design' link: '' linkContent: 'Join SIG - Microservice →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq23.jpg' + - icon: '/images/contribution/calicq24.jpg' + - icon: '/images/contribution/calicq25.jpg' - name: 'Multicluster' icon: '/images/contribution/multicluster.svg' iconActive: '/images/contribution/multicluster-active.svg' - content: '' + content: 'multi-cluster and multi-cloud management' link: '' linkContent: 'Join SIG - Multicluster →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq26.jpg' + - icon: '/images/contribution/calicq27.jpg' - name: 'Multitenancy' icon: '/images/contribution/multitenancy.svg' iconActive: '/images/contribution/multitenancy-active.svg' - content: '' + content: 'workspace, IAM, RBAC' link: '' linkContent: 'Join SIG - Multitenancy →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq27.jpg' + - icon: '/images/contribution/calicq28.jpg' + - icon: '/images/contribution/calicq29.jpg' - name: 'Network' icon: '/images/contribution/network.svg' iconActive: '/images/contribution/network-active.svg' - content: '' + content: 'network policy, CNI plugins, SDN' link: '' linkContent: 'Join SIG - Network →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq30.svg' + - icon: '/images/contribution/calicq31.jpg' + - icon: '/images/contribution/calicq32.jpg' - name: 'Observability' icon: '/images/contribution/observability.svg' iconActive: '/images/contribution/observability-active.svg' - content: '' + content: 'Logging, Monitoring, Alerting, Notification, Audit, Events' link: '' linkContent: 'Join SIG - Observability →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq33.jpg' + - icon: '/images/contribution/calicq34.jpg' + - icon: '/images/contribution/calicq35.jpg' - name: 'Release' icon: '/images/contribution/release.svg' iconActive: '/images/contribution/release-active.svg' - content: '' + content: 'Release of each version' link: '' linkContent: 'Join SIG - Release →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq7.jpg' + - icon: '/images/contribution/calicq8.svg' - name: 'Storage' icon: '/images/contribution/storage.svg' iconActive: '/images/contribution/storage-active.svg' - content: '' + content: 'CSI plugins, storage integration' link: '' linkContent: 'Join SIG - Storage →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq36.jpg' + - icon: '/images/contribution/calicq37.jpg' + - icon: '/images/contribution/calicq7.jpg' - name: 'Testing' icon: '/images/contribution/testing.svg' iconActive: '/images/contribution/testing-active.svg' - content: '' + content: 'Effectively and automatically test KubeSphere ' link: '' linkContent: 'Join SIG - Testing →' children: - - icon: '' - - icon: '' - - icon: '' + - icon: '/images/contribution/calicq38.jpg' + - icon: '/images/contribution/calicq39.jpg' + - icon: '/images/contribution/calicq7.jpg' section4: involved: @@ -282,4 +280,14 @@ section4: content: 'KubeSphere is 100% open source and driven by community,we appreciate contributions to our code and documentation!Significant contributions will earn you a contributor t-shirt.' link: '' linkContent: 'Become a KubeSphere Member →' + +section5: + title: Participated organizations + list: + - icon: /images/contribution/section5-1.svg + - icon: /images/contribution/section5-2.jpg + - icon: /images/contribution/section5-3.jpg + - icon: /images/contribution/section5-4.jpg + - icon: /images/contribution/section5-5.jpg + --- \ No newline at end of file diff --git a/layouts/contribution/list.html b/layouts/contribution/list.html index 23ba3b94f..b65b4bc29 100644 --- a/layouts/contribution/list.html +++ b/layouts/contribution/list.html @@ -113,6 +113,7 @@
{{ with .Params.section4.involved }} +

{{ .title }}

{{ range .children}} @@ -129,6 +130,19 @@ {{ end }}
+
+ {{ with .Params.section5 }} +

{{ .title }}

+ + {{ end }} +
+