From b88f52e5423c822f409a5460e99036d10e23cf09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20BUG=C3=96L?= <60687576+halil-bugol@users.noreply.github.com> Date: Sat, 6 Jun 2020 12:30:59 +0300 Subject: [PATCH 1/8] TR Translate Turkish translation of Kubesphere is the first version. --- config.toml | 50 ++-- content/tr/_index.md | 145 +++++---- content/tr/blogs/_index.md | 5 + content/tr/case/_index.md | 73 ++++- content/tr/conferences/_index.md | 49 +++ content/tr/conferences/admin-quick-start.md | 145 +++++++++ content/tr/conferences/app-template.md | 87 ++++++ content/tr/conferences/canary-release.md | 146 +++++++++ content/tr/conferences/cicd-jenkinsfile.md | 37 +++ content/tr/conferences/hpa.md | 161 ++++++++++ content/tr/contribution/_index.md | 283 +++++++++++++++++- content/tr/docs/_index.md | 4 + content/tr/docs/introductions/_index.md | 9 + content/tr/docs/introductions/all-in-one.md | 11 + .../docs/introductions/what-is-kubesphere.md | 9 + content/tr/docs/quick-start/_index.md | 7 + .../tr/docs/quick-start/quick-start-guide.md | 8 + content/tr/docs/quick-start/second/_index.md | 6 + content/tr/docs/quick-start/second/a.md | 9 + .../docs/quick-start/second/third/_index.md | 7 + .../tr/docs/quick-start/second/third/aaa.md | 8 + content/tr/forum/_index.md | 4 + content/tr/install/_index.md | 4 + content/tr/partner/_index.md | 61 +++- content/tr/projects/_index.md | 34 +++ content/tr/reason/_index.md | 4 + content/tr/trends/_index.md | 4 + content/tr/videos/_index.md | 4 + data/tr/footer.yaml | 44 +-- i18n/tr.yaml | 20 +- 30 files changed, 1311 insertions(+), 127 deletions(-) create mode 100644 content/tr/blogs/_index.md create mode 100644 content/tr/conferences/_index.md create mode 100644 content/tr/conferences/admin-quick-start.md create mode 100644 content/tr/conferences/app-template.md create mode 100644 content/tr/conferences/canary-release.md create mode 100644 content/tr/conferences/cicd-jenkinsfile.md create mode 100644 content/tr/conferences/hpa.md create mode 100644 content/tr/docs/_index.md create mode 100644 content/tr/docs/introductions/_index.md create mode 100644 content/tr/docs/introductions/all-in-one.md create mode 100644 content/tr/docs/introductions/what-is-kubesphere.md create mode 100644 content/tr/docs/quick-start/_index.md create mode 100644 content/tr/docs/quick-start/quick-start-guide.md create mode 100644 content/tr/docs/quick-start/second/_index.md create mode 100644 content/tr/docs/quick-start/second/a.md create mode 100644 content/tr/docs/quick-start/second/third/_index.md create mode 100644 content/tr/docs/quick-start/second/third/aaa.md create mode 100644 content/tr/forum/_index.md create mode 100644 content/tr/install/_index.md create mode 100644 content/tr/projects/_index.md create mode 100644 content/tr/reason/_index.md create mode 100644 content/tr/trends/_index.md create mode 100644 content/tr/videos/_index.md diff --git a/config.toml b/config.toml index 2603c601c..f1e1b6f0b 100644 --- a/config.toml +++ b/config.toml @@ -256,118 +256,118 @@ name = "Community" weight = 3 contentDir = "content/tr" languageCode = "tr-TR" -languageName = "Türk" +languageName = "Türkçe" [[languages.tr.menu.main]] weight = 1 -name = "Why KubeSphere" +name = "Neden KubeSphere" URL = "reason" [[languages.tr.menu.main]] weight = 2 -name = "Scenario" +name = "Senaryolar" hasChildren = true [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "Multi-cluster" URL = "multi-cluster" weight = 1 [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "DevOps" URL = "devOps" weight = 2 [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "Network" URL = "network" weight = 3 [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "Service Mesh" URL = "service-mesh" weight = 4 [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "Storage" URL = "storage" weight = 5 [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "AppStore" URL = "app-store" weight = 6 [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "Multi-tenancy" URL = "multi-tenancy" weight = 7 [[languages.tr.menu.main]] - parent = "Scenario" + parent = "Senaryolar" name = "Observability" URL = "observability" weight = 8 [[languages.tr.menu.main]] weight = 3 -name = "Resources" +name = "Kaynaklar" hasChildren = true [[languages.tr.menu.main]] - parent = "Resources" - name = "Open Source Projects" + parent = "Kaynaklar" + name = "Open Source Projeler" URL = "projects" weight = 1 [[languages.tr.menu.main]] - parent = "Resources" + parent = "Kaynaklar" name = "KubeCon & QCon" URL = "conferences" weight = 2 [[languages.tr.menu.main]] - parent = "Resources" - name = "Technology Blogs" + parent = "Kaynaklar" + name = "Blog Yazıları" URL = "blogs" weight = 3 [[languages.tr.menu.main]] - parent = "Resources" - name = "Video Resources" + parent = "Kaynaklar" + name = "Videolar" URL = "videos" weight = 4 [[languages.tr.menu.main]] weight = 4 -name = "Documentation" +name = "Dokümantasyon" URL = "docs" [[languages.tr.menu.main]] weight = 5 hasChildren = true -name = "Community" +name = "Topluluk" [[languages.tr.menu.main]] - parent = "Community" + parent = "Topluluk" name = "Contribution" URL = "contribution" weight = 1 [[languages.tr.menu.main]] - parent = "Community" + parent = "Topluluk" name = "Case Studies" URL = "case" weight = 2 [[languages.tr.menu.main]] - parent = "Community" - name = "Partner" + parent = "Topluluk" + name = "Partnerler" URL = "partner" weight = 3 \ No newline at end of file diff --git a/content/tr/_index.md b/content/tr/_index.md index 2ebe2f519..4e4eca936 100644 --- a/content/tr/_index.md +++ b/content/tr/_index.md @@ -1,145 +1,144 @@ --- -title: -description: +title: KubeSphere | Açık Kaynak Container Platformu +description: KubeSphere, kurumsal/bireysel uygulama geliştirme ve dağıtımı için Kubernetes tabanlı açık kaynaklı bir konteyner platformudur. css: scss/index.scss section1: - title: - topic: - content: - btnContent1: - btnContent2: + title: KubeSphere Container Platform + topic: Hibrit Bulut İçin Tasarlandı + content: KubeSphere, Kubernetes çekirdeğini kullanan, üçüncü taraf uygulamalar için sorunsuz entegrasyon sunmayı amaçlayan açık kaynak kodlu container platformudur. + btnContent1: Kubernetes Üzerinde Kurulum + btnContent2: Linux Üzerinde Kurulum section2: - title: - content: + title: Tek Platform Onlarca Çözüm + content: KubeSphere, yığın otomatik BT operasyonuna ve modern DevOps iş akışlarına sahip multi-tenant kurumsal sınıf bir konteyner platformudur. Ayrıca işletmelerin Kubernetes stratejisi için gereken en yaygın işlevleri içeren daha sağlam ve zengin özellikli bir platform oluşturmalarına yardımcı olan geliştirici dostu web kullanıcı arayüzü sağlar. children: - - name: + - name: Açık Kaynak icon: /images/home/open-source.svg - content: + content: 100% açık kaynaklı kendisini topluluğa adamış CNCF sertifikalı Kubernetes platform - - name: + - name: Kolay Kurulum icon: /images/home/easy-to-run.svg - content: + content: Kubernetes cluster veya Linux serverlara kurulabilir, çevrimiçi ve air-gapped kurulum destekler - - name: + - name: Öne Çıkaran Özellikler icon: /images/home/feature-rich.svg - content: + content: Tek platformda DevOps, service mesh, multi-tenancy, storage and network yönetimi sunar - - name: + - name: Modüler & Tak-Çıkar icon: /images/home/modular-pluggable.svg - content: - + content: Tüm modüller tak-çıkar yapıya uygun olarak geliştirilmiştir, kolayca yönetilebilir section3: - title: - content: + title: Farklı Ekiplere Faydaları + content: Farklı ekiplerin birbirine entegre olarak çalışmasını sağlar. Geliştiriciler web konsolda tek tıkla kodunu dağıtabilir, Operasyon ekibi için merkezi gözlemlenebilirlik ve güçlü DevOps stratejisine uygun ortamı sunar, Altyapı ekibinin esnek ağ ve çözüm çözümleriyle Kubernetes cluster kurmasına ve korumasına yardımcı olur. children: - - name: - content: + - name: Altyapı Takımı + content: Otomatik kurulum, ölçekleme ve yükseltme işlemlerini zahmetsiz gerçekleştirin icon: /images/home/7.svg children: - - content: - - content: - - content: - - content: + - content: Kullanımınızı geliştirir ve altyapı maaliyetlerinizi azaltır + - content: Tek arayüzde multi-cluster container platformu kontrolü sağlayın + - content: Kusursuz güvenlik geliştirmeleri sağlar, birden çok depolama ve ağ çözümünü destekler + - content: Tamamen güvenilir, sertifikalı bir Kubernetes platformu ve uygulama dağıtımı sunar - - name: - content: + - name: Geliştiriciler + content: Kodunuza odaklanın, brakın gerisini KubeSphere halletsin icon: /images/home/74.png children: - - content: - - content: - - content: - - content: + - content: Smooth kullanıcı deneyimi ile karmaşıklığın önüne gerçer + - content: Her uygulama ortamına uyarlanmış toolkit ve dağıtım otomasyonu sağlar + - content: Kullanıma hazır log kaydı, monitoring ve multi-tenant yapı, geliştirme verimliliğini artırır + - content: Uygulama yaşam döngüsü yönetimini destekleyerek pazara giriş süresini hızlandırın - - name: - content: + - name: Operasyon Takımı + content: Tek tıkla kurumsal seviye container platformu kurun icon: /images/home/71.svg children: - - content: - - content: - - content: - - content: + - content: Altyapıdan uygulamalara merkezi günlük log kaydı, monitoring ve uyarı servisleri + - content: Kolaylaştırılmış dağıtım, test, sürüm, yükseltme ve ölçeklendirme + - content: Bulut uygulamaları için Kubernetes'i iyi izleyin, yönlendirin ve optimize edin + - content: Farklı kullanıcıların alışkanlıkları için optimize edilmiş, kullanımı kolay web konsolu ve grafik paneli section4: - title: - content: + title: Öne Çıkan Özellikler + content: Açık kaynaklı bir ürün kullanmak ve bu ürünün kurumunuza uygun olmasını istiyorsanız doğru yerdesiniz children: - - name: + - name: Kolay Provizyon icon: /images/home/provisioning-kubernetes.svg - content: + content: Kubernetes ya da herhangi bir altyapıya, kolayca deploy edin, GPU node desteği mevcuttur - - name: + - name: K8s Kaynak Yönetimi icon: /images/home/k-8-s-resource-management.svg - content: + content: Güçlü gözlemlenebilirlik ile web console kullanarak kaynaklarınızı kolayca yönetin - - name: + - name: Multi-tenant Yönetim icon: /images/home/multi-tenant-management.svg - content: + content: Kullanıcı yetkilendirmesi, alt hesaplar oluşturulması, LDAP desteği ile muteşem çözüm features: - - name: + - name: Uygulama Mağazası icon: /images/home/store.svg - content: + content: Helm tabanlı uygulamalar için uygulama deposu sağlayın ve uygulama yaşam döngüsünü zahmetsiz sağlayın color: grape - - name: + - name: Service Mesh (Istio Tabanlı) icon: /images/home/service.svg - content: + content: Ayrıntılı trafik yönetimi ve gözlemlenebilirliği arayüzü kullanarak kontrol altında tutun color: red - - name: + - name: Zengin Gözlemlenebilirlik icon: /images/home/rich.svg - content: + content: Çok boyutlu monitoring grafikleri, multi-tenant log dosyaları, uyarılar ve bildirimler color: green - - name: + - name: DevOps Modülü icon: /images/home/dev-ops.svg - content: + content: Jenkins temelli kullanıma hazır CI / CD ve S2I ve B2I dahil otomatik workflow araçları sunar color: orange - - name: + - name: Birden Fazla Storage Çözümü icon: /images/home/multiple.svg - content: + content: GlusterFS, CephRBD, NFS, LocalPV çözümlerini destekler, birden çok depolama alanı desteği sunar color: grape - - name: + - name: Birden Fazla Network Çözümü icon: /images/home/network.svg - content: + content: Calico ve Flannel destekler, Porter LB desteği vardır color: green - - name: + - name: Multi-cluster Yönetimi icon: /images/home/management.svg - content: + content: Uygulamaları birden çok cluster ve bulut sağlayıcıya dağıtın ve olağanüstü durum kurtarma için hazırlıklı olun color: orange section5: - title: + title: KubeSphere ile Cloud Native Çözümler frontEnd: - title: - project: + title: Front-End + project: KubeSphere Web Konsol children: - icon: /images/home/mobx.jpg - icon: /images/home/koa.jpg - icon: /images/home/react.png backEnd: - title: - project: + title: Back end （REST API） + project: KubeSphere Back Sistem group: - - name: - - name: - - name: - - name: + - name: API Sunucusu + - name: API Geçiş Kapısı + - name: Kontroller Yönetimi + - name: Hesap Yönetimi section6: - title: - content: + title: KubeSphere'i Tercih Edenler + content: Müşteri senaryoları, daha ayrıntılı kullanıcı senaryoları ve bulut yerel dönüşüm hikayelerini sizler için listeledik.
Çeşitli işletme ve kuruluşlar araştırma, üretim ve ticari ürünler için KubeSphere Container Platform'u kullanıyor. children: - icon: /images/home/section6-1.jpg - icon: /images/home/section6-2.jpg @@ -151,9 +150,9 @@ section6: - icon: /images/home/section6-8.jpg - icon: /images/home/section6-9.jpg - icon: /images/home/section6-10.jpg - btnContent: + btnContent: Müşteri Senaryoları btnLink: link: - linkContent: + linkContent: Logonuzun burada yer almasını ister misiniz? Hemen istek gönderin. → image: /images/home/certification.jpg --- \ No newline at end of file diff --git a/content/tr/blogs/_index.md b/content/tr/blogs/_index.md new file mode 100644 index 000000000..3ff9eee83 --- /dev/null +++ b/content/tr/blogs/_index.md @@ -0,0 +1,5 @@ +--- +title: blogs + +css: scss/blogs.scss +--- \ No newline at end of file diff --git a/content/tr/case/_index.md b/content/tr/case/_index.md index 280ebc566..f0212e395 100644 --- a/content/tr/case/_index.md +++ b/content/tr/case/_index.md @@ -1,6 +1,75 @@ --- -title: +title: "case" +css: "scss/case.scss" -css: scss/case.scss +section1: + title: User Case Studies + content: KubeSphere is trusted by various enterprises and organizations to the innovators driving the future of software. + topImage: "images/case/case-top.jpg" + +section2: + tip: Read Case Study → + caseList: + - icon: "images/case/case1.jpg" + content: "KubeSphere is trusted by various enterprises and organizations to the innovators driving the future + of software." + link: "" + + - icon: "images/case/case2.jpg" + content: "KubeSphere is trusted by various enterprises and organizations to the innovators driving the future + of software." + link: "" + + - icon: "images/case/case3.jpg" + content: "KubeSphere is trusted by various enterprises and organizations to the innovators driving the future + of software." + link: "" + + - icon: "images/case/case4.jpg" + content: "KubeSphere is trusted by various enterprises and organizations to the innovators driving the future + of software." + link: "" + + - icon: "images/case/case5.jpg" + content: "KubeSphere is trusted by various enterprises and organizations to the innovators driving the future + of software." + link: "" + + - icon: "images/case/case6.jpg" + content: "KubeSphere is trusted by various enterprises and organizations to the innovators driving the future + of software." + link: "" + +section3: + title: 'Various Industries are Powered by KubeSphere' + tip: ALL + caseType: + - name: 'Financial' + children: + - name: 'sina' + icon: 'images/case/v1.jpg' + - name: 'benlai' + icon: 'images/case/v2.jpg' + + - name: 'T Service' + children: + - name: 'inaccel' + icon: 'images/case/v3.jpg' + - name: 'founder' + icon: 'images/case/v4.jpg' + + - name: 'E-Business' + children: + - name: 'huaxia' + icon: 'images/case/v5.jpg' + - name: 'aqara' + icon: 'images/case/v6.jpg' + + - name: 'Manufacture' + children: + - name: 'powersmart' + icon: 'images/case/v7.jpg' + - name: 'anchnet' + icon: 'images/case/v8.jpg' --- \ No newline at end of file diff --git a/content/tr/conferences/_index.md b/content/tr/conferences/_index.md new file mode 100644 index 000000000..3434324e9 --- /dev/null +++ b/content/tr/conferences/_index.md @@ -0,0 +1,49 @@ +--- +title: "page1" + + +css: "scss/conferences.scss" + +viewDetail: View Details + +list: + - name: KubeCon + content: KUBECON_DESC + icon: images/conferences/kubecon.svg + bg: images/conferences/kubecon-bg.svg + children: + - name: 'Multi-tenant Management: Creating Accounts, Roles, Workspaces, Projects and DevOps Projects' + summary: ObjectiveIn this quickstart, as a cluster admin, you will learn how to create workspaces, roles and user accounts, and then invite new users… + author: xxx + link: admin-quick-start + image: + + - name: Managing Canary Release of Microservice Application on Kubernetes with Istio + summary: Istio’s service mesh is able to manage traffic distribution with complete independence from deployment scaling, which enables a simpler, yet… + author: xxx + link: canary-release + image: + + - name: Deploying a Grafana Application to Kubernetes Using Application Template + summary: ObjectiveThis tutorial shows you how to quickly deploy a Grafana application in KubeSphere via App Template, demonstrating the basic… + author: xxx + link: app-template + image: + + - name: QCon International Software Development Conference + content: QCON_DESC + icon: images/conferences/qcon.svg + bg: images/conferences/qcon-bg.svg + children: + - name: Creating a CI/CD Pipeline to Deploy Spring Boot App to Kubernetes + summary: ObjectiveThis tutorial shows you how to create a CI/CD Pipeline within DevOps project, which is intended for deploying a Spring Boot sample… + author: xxx + link: cicd-jenkinsfile + image: + + - name: Creating Horizontal Pod Autoscaler for Deployment + summary: The Horizontal Pod Autoscaler automatically scales the number of pods in a deployment based on observed CPU utilization or Memory usage. The… + author: xxx + link: hpa + image: +--- \ No newline at end of file diff --git a/content/tr/conferences/admin-quick-start.md b/content/tr/conferences/admin-quick-start.md new file mode 100644 index 000000000..09b4dd913 --- /dev/null +++ b/content/tr/conferences/admin-quick-start.md @@ -0,0 +1,145 @@ +--- +title: 'Multi-tenant Management: Creating Accounts, Roles, Workspaces, Projects and DevOps Projects' +author: 'xxx' +date: '2019-06-24' +--- + +## Objective + +In this quickstart, as a cluster admin, you will learn how to create workspaces, roles and user accounts, and then invite new users into the workspace to create their projects and DevOps projects. This tutorial is used to help beginners to become familiar with multi-tenant management. + +## Prerequisites + +- You need to [install KubeSphere](https://kubesphere.io/en/install). +- You need a default admin account. + +## Hands-on Lab + +Generally, the hierarchy relationship of Cluster, Workspace, Project and DevOps Project showing as the following graph, and there are common built-in roles existed in these orgnizations within each level. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716231511.png) + +### Cluster Admin + +The role of cluster-admin is able to create accounts for other users and assign roles to them. There are three common roles in cluster level, it also supports customizing new roles. + +| Built-in Roles | Responsibility | +| ------------------ | ---------------------------------------------------------------------------------------------------------- | +| cluster-admin | Have the highest privileges for the cluster, can manage any resources | +| workspaces-manager | The workspace managers, can manage all of the resources, e.g. projects, DevOps projects, members and roles | +| cluster-regular | The regular users in the cluster, they are not authorized until they have been invited to the workspace | + +#### Step 1: Create roles and accounts + +First, we will create a new role (user-manager), grants account management and role management authority to this role, then we will create an account and grant the user-manager role to this account. + +| Account Name | Cluster Role | Responsibility | +| ------------ | ------------ | --------------------------------- | +| user-manager | user-manager | Manage cluster accounts and roles | + +1.1 To get started, login KubeSphere with the `admin` account, click **Platform** and then navigate to **Platform Roles** page, click **Create** to create a role which is used to manage all accounts and roles. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716112614.png) + +1.2. Fill in the basic information and authority settings of the role, e.g. `Name : user-manager`. + +1.3. Check all the boxes for both **Account Management** and **Role Management**, then click **Create**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716112826.png) + +1.4. Click **Platform**, then navigate to **Accounts** page and click **Create** to create an account. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716112945.png) + +1.5. Fill in the basic information, notice that select `user-manger` as its role. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716113050.png) + +1.6. Log out and Sign in with the `user-manager` account, then navigate to **Account** and create 4 accounts according to the following table. Please reference the above steps to create these 4 accounts. + +| Account Name | Cluster Role | Responsibility | +| --------------- | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| ws-manager | workspaces-manager | Create and manage all workspaces | +| ws-admin | cluster-regular | Manage all resources under the specified workspace
(This example is used to invite new members to join the workspace.) | +| project-admin | cluster-regular | Create and manage projects, DevOps projects, invite new members | +| project-regular | cluster-regular | The regular user will be invited to the project and DevOps project by the project-admin,
we use this account to create workloads, pipelines and other resources under the specified project | + +1.7. Verify the 4 accounts that we created in step 1.6. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716114245.png) + +### Workspace Admin + +#### Step 2: Create a Workspace + +Workspace is the base of implementing the multi-tenant mechanism, it's also the base unit for projects and DevOps projects managment. + +2.1. Sign in with `ws-manager` that we created in Step 1, then click **Workspace** and click **Create Workspace**, name it as demo-workspace and appoint `ws-admin` as Workspace Manager, who has the highest administrative authority of the workspace. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716130007.png) + +2.2. Logout and sign in with `ws-admin` after `demo-workspace` has been created. Then click **View Workspace**, select **Worksapce Management → Members Management** and click **Invite Member**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716130330.png) + +2.3. Invite both `project-admin` and `project-regular` and grant them `workspace-regular` accordingly, click **OK** to save it. Now there are 3 members in the `demo-workspace`. + +| User Name | Role in the Workspace | Responsibility | +| --------------- | --------------------- | ------------------------------------------------------------------------------------------------------------------------------------- | +| ws-admin | workspace-admin | Manage all resources under the workspace
(We use this account to invite new members into the workspace) | +| project-admin | workspace-regular | Create and manage projects, DevOps projects, and invite new members to join | +| project-regular | workspace-viewer | Will be invited by project-admin to join the project and DevOps project.
we use this account to create workloads, pipelines, etc | + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716130517.png) + +### Project Admin and DevOps Admin + +#### Step 3: Create a Project + +3.1. Sign in with `project-admin` that we created in Step 1, then click **Create** and select **Create a resource project**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716131852.png) + +3.2. Name it as `demo-project` and keep the advanced settings as the default values, then click **Create**. + +3.3. Choosing **Project Settings → Project Members** and click **Invite Member**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716132750.png) + +3.4. Invite `project-regular` to this project and grant this user **operator** accordingly. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716132840.png) + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716132920.png) + +#### Step 4: Set the Gateway + +Before creating a route, you need to enable a gateway for this project. + +4.1. We still use `project-admin`, Choose **Project Settings → Internet Access** and click **Set Gateway**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716134430.png) + +4.2. Keep the access method as `NodePort` and click `Save`. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716134742.png) + +4.3. Now we are able to see the Gateway Address (192.168.0.88), the NodePort of http and https respectively. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716134849.png) + +#### Step 5: Create DevOps Project + +5.1. In this step, click **Projects** and click `Create Project` button, then select **Create a DevOps project**. + +5.2. Fill in the basic information, e.g. `demo-devops`, then click **Create** button, it will jump to `demo-devops` page. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716133420.png) + +5.3. Similarly, navigate to **Project Management → Project Members**, then click **Invite Member** and grant `project-regular` as the role of `maintainer`, which is used to create pipeline, credentials, etc. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716133626.png) + + diff --git a/content/tr/conferences/app-template.md b/content/tr/conferences/app-template.md new file mode 100644 index 000000000..3aea6d1da --- /dev/null +++ b/content/tr/conferences/app-template.md @@ -0,0 +1,87 @@ +--- +title: 'Deploying a Grafana Application to Kubernetes Using Application Template' + +author: 'xxx' +--- + +## Objective + +This tutorial shows you how to quickly deploy a [Grafana](https://grafana.com/) application in KubeSphere via App Template, demonstrating the basic functionality of the application repository, application templates, and application management. + +## Prerequisites + +You've completed all steps in [Tutorial 1](admin-quick-start.md). + +## Hands-on Lab + +### Step 1: Add a Application Repository + +> Note: The application repository can be either the Object Storage, e.g. [QingStor Object Storage](https://www.qingcloud.com/products/qingstor/), [AWS S3](https://aws.amazon.com/cn/what-is-cloud-object-storage/), or [GitHub Repository](https://github.com/). The packages are composed of Helm Chart template files of the applications. Therefore, before adding an application repository to KubeSphere, you need to create an object storage and upload Helm packages in advance. This tutorial prepares a demo repository based on QingStor Object Storage. + +1.1. Sign in with `admin` account and navigate to **Platform → Platform Settings → App Repositories**, then Click **Add App Repository**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717133759.png) + +1.2. Fill in the basic information, name it as demo-repo and input the URL with `https://helm-chart-repo.pek3a.qingstor.com/kubernetes-charts/`, you can validate if this URL is available, choose **OK** when you've done. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717134319.png) + +1.3. Click **App Templates** on the top of this page, it will automatically import all of the applications from the demo repository. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717134714.png) + +### Step 2: Deploy the Grafana Application + +2.1. When you've already added the repository, you can logout and sign in with `project-regular` account. Then select **App Templates** on the top of this page, input "grafana" in the search box to find the application. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717145209.png) + +2.2. Click into grafana, **Deploy App** and fill in the basic information. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717145338.png) + +2.3. **Name** can be customized by yourself, choose the corresponding Workspace (e.g. `demo-workspace`) and Project (e.g. `demo-project`) as the environment. Then choose **Deploy** to deploy Grafana to KubeSphere. + +2.4. Back to the `demo-project` and choose **Applications**, then you can see the application `grafana` showing `active` from the application list. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717145741.png) + +### Step 3: View App Details + +3.1. Click into `grafana` application, you will be able to see its Services and Workloads in `Resource Status` page, as well as Environmental Variables and App Template information. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717150124.png) + +3.2. Next we are going to expose this service outside of the cluster via NodePort. Enter into its service e.g. `grafana-l47bmc`, then click **More → Edit Internet Access**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717150338.png) + +3.3. Select `NodePort` from the drop down list. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717150427.png) + +3.4. Therefore it will generate a Node Port, for example, here is `31126` that we can access this service using `<$NodeIP>:<$NodePort>`. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717150540.png) + +### Step 4: Access the Grafana Service + +At this point, you will be able to access the Nginx service via `${Node IP}:${NODEPORT}`, e.g. `http://192.168.0.88:31126`, or click the button **Click to visit** to access the Grafana dashboard. + +4.1. Note that you have to obtain the account and password from the grafana secret in advance. Navigate to **Configuration Center → Secrets**, click into **grafana-l47bmc (Type: Default)**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717152250.png) + +4.2. Click the button to display the secret information, then copy and paste the value of **admin-user** and **admin-password**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717152352.png) + +4.3. Open the Grafana log in page, sign in with the **admin** account. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717152831.png) + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190717152929.png) + +## Next Step + +Tutorial 7 - [Create Horizontal Pod Autoscaler for Deployment](hpa.md). diff --git a/content/tr/conferences/canary-release.md b/content/tr/conferences/canary-release.md new file mode 100644 index 000000000..b9984a770 --- /dev/null +++ b/content/tr/conferences/canary-release.md @@ -0,0 +1,146 @@ +--- +title: 'Managing Canary Release of Microservice Application on Kubernetes with Istio' + +author: 'xxx' +--- + +Istio’s service mesh is able to manage traffic distribution with complete independence from deployment scaling, which enables a simpler, yet significantly more functional way to realize canary release and rollout. It allows users to introduce a new version of a service by first testing it using a small percentage of user traffic, and then if all goes well, increase, possibly gradually in increments, the percentage while simultaneously phasing out the old version. + +KubeSphere provides three kind of grayscale strategies based on Istio, including blue-green deployment, canary release and traffic mirroring. Without modifying the source code, KubeSphere can realize grayscale, traffic governance, tracing, traffic monitoring and other service mesh features. + +## What is Bookinfo Application + +The Bookinfo application is broken into four separate microservices (There are 3 versions of the reviews microservice): + +- productpage. The productpage microservice calls the details and reviews microservices to populate the page. +- details. The details microservice contains book information. +- reviews. The reviews microservice contains book reviews. It also calls the ratings microservice. +- ratings. The ratings microservice contains book ranking information that accompanies a book review. + +The end-to-end architecture of the application is shown below, see [Bookinfo Application](https://istio.io/docs/examples/bookinfo/) for more details. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718152533.png) + +## Objective + +In this tutorial, we're going to deploy a Bookinfo sample application composed of four separate microservices used to demonstrate the canary release, tracing and traffic monitoring using Istio on KubeSphere. + +## Prerequisites + +- You've completed all steps in [Tutorial 1](admin-quick-start.md). +- You need to turn on the **Application Governance** to enable the tracing feature. (Choose **Project Settings → Internet Access → Edit Gateway → Turn it On**) + +## Hands-on Lab + +### Step 1: Deploy Bookinfo Application + +1.1. Sign in with `project-regular` account and enter into the `demo-project`, navigate to **Application**, click on the **Deploy New Application** then choose **Deploy sample app Bookinfo**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718154143.png) + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718154251.png) + +1.2. Click **Create** in the pop-up window, then Bookinfo application has been deployed successfully, application components are listed in this following page, as well as the routes and hostname. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718154424.png) + +1.3. Next you can access the Bookinfo homepage as following screenshot via **Click to visit** button. Click on the **Normal user** to enter into the summary page. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718161448.png) + +1.4. Notice that at this point it only shows **- Reviewer1** and **- Reviewer2** without any stars at the Book Reviews section, this is the initial status of this section. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718161819.png) + +### Step 2: Create Canary Release for reviews service + +2.1. Back to KubeSphere console, choose **Grayscale Release** and click on the **Create Canary Release Job**, then select **Canary Release** and click **Create Job** + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718162152.png) + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718162308.png) + +2.2. Fill in the basic information, e.g. `canary-release`, click **Next** and select **reviews** as the canary service, then click **Next**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718162550.png) + +2.3. Enter `v2` as **Grayscale Release Version Number** and fill in the new image blank with `kubesphere/examples-bookinfo-reviews-v2:1.13.0` (i.e. Modify v1 to v2), then click **Next**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718162840.png) + +2.4. The canary release supports **Forward by traffic ratio** and **Forward by request content**, in this tutorial we choose adjust the traffic ratio to manage traffic distribution between v1 and v2. Drag the slider to adjust v2 takes up 30% traffic, and v2 takes up 70%. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718163639.png) + +2.5. Click **Create** when you've completed configuration, then you're able to see the `canary-release` has been created successfully. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718164216.png) + +### Step 3: Verify the Canary Release + +When you visit the Bookinfo website again and refresh your browser repeatedly, you'll be able to see that the Bookinfo reviews section will switch between v1 and v2 at a random rate of about 30% and 70% respectively. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/bookinfo-canary.gif) + +### Step 4: Inspect the Traffic Topology Graph + +4.1. Connect to your SSH Client, use the following command to introduce real traffic to simulate the access to a bookinfo application every 0.5 seconds. + +``` +$ curl http://productpage.demo-project.192.168.0.88.nip.io:32565/productpage?u=normal + + % Total % Received % Xferd Average Speed Time Time Time Current + Dload Upload Total Spent Left Speed + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0< 74 5183 74 3842 0 0 73957 0 --:--:-- --:--:-- --:--:-- 73884 + ··· +``` + +4.2. From the traffic management diagram, you can easily see the service invocation and dependencies, health, performance between different microservices. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718170256.png) + +4.3. Click on the reviews card, the traffic monitoring graph will come out, including real-time data of **Success rate**, **Traffic** and **Duration**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718170727.png) + +### Step 5: Inspect the Tracing Details + +KubeSphere provides distributed tracing feature based on [Jaeger](https://www.jaegertracing.io/), which is used for monitoring and troubleshooting microservices-based distributed application. + +5.1. Choose **Tracing** tab, you can clearly see all phases and internal calls of a request, as well as the period in each phase. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718171052.png) + +5.2. Click into any one item, you can even drill down to see the request details and this request is being processed by which machine (or container). + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718173117.png) + +### Step 6: Take over all traffic + +6.1. As mentioned previously, when the canary version (v2) is released, it could be used to send 70% of traffic to the canary version. Publishers can test the new version online and collect user feedback. + +Switch to **Grayscale Release** tab, click into `canary-release`. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718181326.png) + +6.2. Click **···** and select **Take Over** at `reviews-v2`, then 100% of traffic will be sent to the new version (v2). + +> Note: If anything goes wrong along the way, we can abort and rollback to the previous version (v1) in time. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718181413.png) + +6.3. Open the bookinfo page again and refresh the browsers several times, we can find that it only shows the v2 (ratings with black stars) in reviews module. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190718235627.png) + +### Step 7: Take Down the Old Version + +When the new version v2 jas been totally released online and takes over all the traffic, also the testing results and online users feedback are confirmed to be correct, you can take down the old version and remove the resources of v1. + +Click on the **Job Offline** button to take down the old version, + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190719001803.png) + +> Notice: If take down a specific version of the component, the associated workloads and istio related configuration resources will be removed simultaneously, it turns out that v1 is being replaced by v2. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190719001945.png) diff --git a/content/tr/conferences/cicd-jenkinsfile.md b/content/tr/conferences/cicd-jenkinsfile.md new file mode 100644 index 000000000..ad32a2324 --- /dev/null +++ b/content/tr/conferences/cicd-jenkinsfile.md @@ -0,0 +1,37 @@ +--- +title: 'Creating a CI/CD Pipeline to Deploy Spring Boot App to Kubernetes' + +author: 'xxx' +--- + +## Objective + +This tutorial shows you how to create a CI/CD Pipeline within DevOps project, which is intended for deploying a Spring Boot sample application to Kubernetes. + +## Overview + +Based on the existing Jenkinsfile in the sample GitHub repository, we can create a pipeline to build and complete the stages and steps (e.g. unit test, sonarqube analysis), which totally consists of eight stages as shown below. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190719005547.png) + +## Prerequisites + +You've completed all steps in [Tutorial 1](admin-quick-start.md). + +## Hands-on Lab + +### Step 1: Create Credentials + +To get started, we need to create 3 credentials, i.e. DockerHub、GitHub and kubeconfig. + +1.1. Sign in with `project-regular` account and enter into the `demo-devops`, navigate to **Credentials**, then click on the **Create Credentials**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190719010621.png) + +| Credential ID | Type | Username/Password/Secret | Content | +| --------------- | ------------------- | -------------------------------------------------------------------- | ------- | +| dockerhub-id | Account Credentials | Enter your personal DockerHub account information | \| | +| github-id | Account Credentials | Enter your personal GitHub account information | \| | +| kube-config | +| demo-kubeconfig | kubeconfig | \|It will be automatically filled with the kubeconfig of the cluster | +| sonar-token | secret_text | You can get secret by creating SonarQube token | \ | diff --git a/content/tr/conferences/hpa.md b/content/tr/conferences/hpa.md new file mode 100644 index 000000000..2fb53db4f --- /dev/null +++ b/content/tr/conferences/hpa.md @@ -0,0 +1,161 @@ +--- +title: 'Creating Horizontal Pod Autoscaler for Deployment' + +author: 'xxx' +--- + +The Horizontal Pod Autoscaler automatically scales the number of pods in a deployment based on observed CPU utilization or Memory usage. The controller periodically adjusts the number of replicas in a deployment to match the observed average CPU utilization to the target value specified by user. + +## How does the HPA work + +The Horizontal Pod Autoscaler is implemented as a control loop, with a period controlled by the controller manager’s HPA sync-period flag (with a default value of 15 seconds). For per-pod resource metrics (like CPU), the controller fetches the metrics from the resource metrics API for each pod targeted by the Horizontal Pod Autoscaler. See [Horizontal Pod Autoscaler](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) for more details. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716214909.png) + +## Objective + +This document walks you through an example of configuring Horizontal Pod Autoscaler for the hpa-example deployment. + +We will create a deployment to send an infinite loop of queries to the hpa example application, demonstrating its autoscaling function and the HPA Principle. + +## Prerequisites + +- You need to create a workspace and project, see the [Tutorial 1](admin-quick-start.md) if not yet. +- You need to sign in with `project-regular` and enter into the corresponding project. + +## Hands-on Lab + +### Step 1: Create a Deployment + +1.1. Enter into `demo-project`, then select **Workload → Deployments** and click **Create Deployment** button. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716215848.png) + +1.2. Fill in the basic information in the pop-up window. e.g. `Name: hpa-example`, then click **Next** when you've done. + +### Step 2: Configure the HPA + +2.1. Choose **Horizontal Pod Autoscaling**, and fill in the table as following: + +- Min Replicas Number: 2 +- Max Replicas Number: 10 +- CPU Request Target(%): 50 (represents the percent of target CPU utilization) + +Then click on the **Add Container** button. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716220122.png) + +2.2. Fill in the Pod Template with following values, then click **Save** to save these settings. + +- Image: `mirrorgooglecontainers/hpa-example` +- Service Settings + - Name: port + - port: 80 (TCP protocol by default) + +![Add a Container](https://pek3b.qingstor.com/kubesphere-docs/png/20190321234139.png) + +2.3. Skip the Volume and Label Settings, click the **Create** button directly. Now the hpa-example deployment has been created successfully. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716221028.png) + +### Step 3: Create a Service + +3.1. Choose **Network & Services → Services** on the left menu, then click on the **Create Service** button. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716221110.png) + +3.2. Fill in the basic information, e.g. `name : hpa-example`, then click **Next**. + +3.3. Choose the first item `Virtual IP: Access the service through the internal IP of the cluster` for the service Settings. + +3.4. In Selector blanks, click **Specify Workload** and select the `hpa-example` as the backend workload. Then choose **Save** and fill in the Ports blanks. + +- Ports: + - Name: port + - Protocol: TCP + - Port: 80 + - Target port: 80 + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716221536.png) + +Click **Next → Create** to complete the creation. Now the hpa-example service has been created successfully. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716221828.png) + +### Step 4: Create Load-generator + +4.1. In the current project, redirect to **Workload → Deployments**. Click **Create** button and fill in the basic information in the pop-up window, e.g. `Name : load-generator`. Click **Next** when you've done. + +4.2. Click on **Add Container** button, and fill in the Pod template as following: + +- Image: busybox +- Scroll down to **Start command**, add commands and parameters as following: + +``` +# Commands +sh +-c + +# Parameters (Note: the http service address like http://{$service name}.{$project name}.svc.cluster.local) +while true; do wget -q -O- http://hpa-example.demo-project.svc.cluster.local; done +``` + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716222521.png) + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716222549.png) + +Click on the **Save** button when you've done, then click **Next**. + +4.3. Click **Next → Create** to complete creation. + +So far, we've created 2 deployments (i.e. hpa-example and load-generator) and 1 service (i.e. hpa-example). + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716222833.png) + +### Step 5: Verify the HPA + +5.1. Click into `hpa-example` and inspect the changes, please pay attention to the HPA status and the CPU utilization, as well as the Pods monitoring graphs. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190322010021.png) + +### Step 6: Verify the Auto Scaling + +6.1. When all of the load-generator pods are successfully created and begin to access the hpe-example service, as shown in the following figure, the CPU utilization is significantly increased after refreshing the page, currently rising to `722%`, and the desired replicas and current replicas is rising to `10/10`. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716223104.png) + +> Note: Since the Horizontal Pod Autoscaler is working right now, the load-generator looply requests the hpa-example service to make the CPU utilization rised rapidly. After the HPA starts working, it makes the backend of the service increases fast to handle a large number of requests together. Also the replicas of hpa-example continues to increase follow with the CPU utilization increases, which demonstrates the working principle of HPA. + +6.2. In the monitoring graph, it can be seen that the CPU usage of the first Pod that we originally created, showing a significant upward trend. When HPA started working, the CPU usage has a significant decreased trend, finally it tends to be smooth. Accordingly, the CPU usage is increasing on the newly created Pods. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716223415.png) + +### Step 7: Stop the Load Generation + +7.1. Redirect to **Workload → Deployments** and delete `load-generator` to cease the load increasing. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716225225.png) + +7.2. Inspect the status of the `hpa-example` again, you'll find that its current CPU utilization has slowly dropped to 10% in a few minutes, eventually the HPA has reduced its deployment replicas to 1 (initial value). The trend reflected by the monitoring curve can also help us to further understand the working principle of HPA; + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716230725.png) + +7.3. It enables user to inspect the monitoring graph of Deloyment, see the CPU utilization and Network inbound/outbound trend, they just match with the HPA example. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716230333.png) + +## Modify HPA Settings + +If you need to modify the settings of the HPA, you can click into the deployment, and click **More → Horizontal Pod Autoscaler**. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716225918.png) + +## Cancel HPA + +Click **···** button on the right and **Cancel** if you don't need HPA within this deployment. + +![](https://pek3b.qingstor.com/kubesphere-docs/png/20190716225953.png) + +## Next Step + +Tutorial 8 - [Source-to-Image: Build Reproducible Images from Source Code](s2i.md). diff --git a/content/tr/contribution/_index.md b/content/tr/contribution/_index.md index 38c696058..6bc5bd4fe 100644 --- a/content/tr/contribution/_index.md +++ b/content/tr/contribution/_index.md @@ -1,6 +1,285 @@ --- -title: +title: "contribution" -css: scss/contribution.scss +css: "scss/contribution.scss" +section1: + title: 'Community is the Soul of KubeSphere' + content: 'Join the community to get help, get involved, or to get updates and KubeSphere news!' + topImage: "images/contribution/contribution-top.jpg" + +section2: + topType: + - name: 'Download' + icon1: 'images/contribution/download.svg' + icon2: 'images/contribution/37.png' + children: + - content: 'Download KubeSphere' + link: '' + - content: 'Quickstart' + link: '' + - content: 'Tutorial Videos' + link: '' + + - name: 'Contribute' + icon1: 'images/contribution/contribute.svg' + icon2: 'images/contribution/38.png' + children: + - content: 'Join the SIGs and WGs' + link: '' + - content: 'Improve the Docs' + link: '' + - content: 'Submit a Bug or Suggestion' + link: '' + + - name: 'Get in Touch' + icon1: 'images/contribution/business.svg' + icon2: 'images/contribution/39.png' + children: + - content: 'Join KubeSphere Slack' + link: '' + - content: 'Join the Mailing List' + link: '' + - content: 'Follow us on Twitter' + link: '' + + organization: + topic: 'Community Organization' + name: 'KubeSphere Community' + icon: 'images/contribution/28.svg' + topIcon: 'images/contribution/8.svg' + type: + - name: 'TOC' + icon: 'images/contribution/toc.svg' + + - name: 'Developer Group' + icon: 'images/contribution/developer-group.svg' + children: + - name: 'Owner / Lead' + content: 'A lead is also the member of the project who is an experienced and acrive reciewer of the project.' + + - name: 'Member' + content: 'A lead is also the member of the project who is an experienced and acrive reciewer of the project.' + + - name: 'Contributor' + content: 'A lead is also the member of the project who is an experienced and acrive reciewer of the project.' + + - name: 'User Research Group' + icon: 'images/contribution/user.svg' + children: + - name: 'Champion' + content: 'A lead is also the member of the project who is an experienced and acrive reciewer of the project.' + + - name: 'Ambassador' + content: 'A lead is also the member of the project who is an experienced and acrive reciewer of the project.' + + + - name: 'Steering Committee' + icon: 'images/contribution/steering.svg' + +section3: + interestGroup: + title: 'Find Your Special Interest Group' + content: 'SIGs are designed to let you can find everything you need in one place around a central topic. Find your commonality and join the SIG.' + children: + - name: 'Apps' + icon: '/images/contribution/apps.svg' + iconActive: '/images/contribution/apps-active.svg' + content: 'App charts for the built-in App Store' + link: '' + linkContent: 'Join SIG - Apps →' + children: + - icon: '/images/contribution/calicq1.jpg' + - icon: '/images/contribution/calicq2.jpg' + - icon: '/images/contribution/calicq3.jpg' + + - name: 'App store' + icon: '/images/contribution/app-store.svg' + iconActive: '/images/contribution/app-store-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - App store →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Architecture' + icon: '/images/contribution/architecture.svg' + iconActive: '/images/contribution/architecture-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Architecture →' + children: + - icon: '' + + - name: 'Cloud-Providers' + icon: '/images/contribution/cloud-providers.svg' + iconActive: '/images/contribution/cloud-providers-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Cloud-Providers →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Console (Front-end)' + icon: '/images/contribution/console.svg' + iconActive: '/images/contribution/console-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Console (Front-end) →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'DevOps' + icon: '/images/contribution/dev-ops.svg' + iconActive: '/images/contribution/dev-ops-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - DevOps →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: ' Docs' + icon: '/images/contribution/docs.svg' + iconActive: '/images/contribution/docs-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Docs →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Edge' + icon: '/images/contribution/edge.svg' + iconActive: '/images/contribution/edge-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Edge →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Installation' + icon: '/images/contribution/installation.svg' + iconActive: '/images/contribution/installation-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Installation →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Microservice' + icon: '/images/contribution/microservice.svg' + iconActive: '/images/contribution/microservice-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Microservice →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Multicluster' + icon: '/images/contribution/multicluster.svg' + iconActive: '/images/contribution/multicluster-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Multicluster →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Multitenancy' + icon: '/images/contribution/multitenancy.svg' + iconActive: '/images/contribution/multitenancy-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Multitenancy →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Network' + icon: '/images/contribution/network.svg' + iconActive: '/images/contribution/network-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Network →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Observability' + icon: '/images/contribution/observability.svg' + iconActive: '/images/contribution/observability-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Observability →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Release' + icon: '/images/contribution/release.svg' + iconActive: '/images/contribution/release-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Release →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Storage' + icon: '/images/contribution/storage.svg' + iconActive: '/images/contribution/storage-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Storage →' + children: + - icon: '' + - icon: '' + - icon: '' + + - name: 'Testing' + icon: '/images/contribution/testing.svg' + iconActive: '/images/contribution/testing-active.svg' + content: '' + link: '' + linkContent: 'Join SIG - Testing →' + children: + - icon: '' + - icon: '' + - icon: '' + +section4: + involved: + title: 'Get involved' + children: + - title: 'Be a Champion' + icon: 'images/contribution/group-1.png' + content: 'Join me tomorrow and start putting in the time to get your campaign ready with a landing page!' + link: '' + linkContent: 'Become a KubeSphere Champion →' + + - title: 'Be a Member' + icon: 'images/contribution/group-2.png' + 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 →' --- \ No newline at end of file diff --git a/content/tr/docs/_index.md b/content/tr/docs/_index.md new file mode 100644 index 000000000..89c936b90 --- /dev/null +++ b/content/tr/docs/_index.md @@ -0,0 +1,4 @@ +--- +title: "docs" + +--- \ No newline at end of file diff --git a/content/tr/docs/introductions/_index.md b/content/tr/docs/introductions/_index.md new file mode 100644 index 000000000..30c975101 --- /dev/null +++ b/content/tr/docs/introductions/_index.md @@ -0,0 +1,9 @@ +--- +title: "introductions" +weight: 1 +_build: + render: false + +description: "Help you to better understand KubeSphere with detailed graphics and contents" + +--- \ No newline at end of file diff --git a/content/tr/docs/introductions/all-in-one.md b/content/tr/docs/introductions/all-in-one.md new file mode 100644 index 000000000..dcae6e01c --- /dev/null +++ b/content/tr/docs/introductions/all-in-one.md @@ -0,0 +1,11 @@ +--- +title: "all-in-one" +weight: 2 +--- + +## test + +test + + + diff --git a/content/tr/docs/introductions/what-is-kubesphere.md b/content/tr/docs/introductions/what-is-kubesphere.md new file mode 100644 index 000000000..32a0d798a --- /dev/null +++ b/content/tr/docs/introductions/what-is-kubesphere.md @@ -0,0 +1,9 @@ +--- +title: "what-is-kubesphere" +weight: 1 + +--- + +## test + +test \ No newline at end of file diff --git a/content/tr/docs/quick-start/_index.md b/content/tr/docs/quick-start/_index.md new file mode 100644 index 000000000..bdb90d379 --- /dev/null +++ b/content/tr/docs/quick-start/_index.md @@ -0,0 +1,7 @@ +--- +title: "quick-start" +weight: 2 +description: "Get a quick overview of the basic features of KubeSphere with several quick-start examples." +_build: + render: false +--- \ No newline at end of file diff --git a/content/tr/docs/quick-start/quick-start-guide.md b/content/tr/docs/quick-start/quick-start-guide.md new file mode 100644 index 000000000..eacddcb68 --- /dev/null +++ b/content/tr/docs/quick-start/quick-start-guide.md @@ -0,0 +1,8 @@ +--- +title: "quick-start-guide" +weight: 1 +--- + +## test + +test \ No newline at end of file diff --git a/content/tr/docs/quick-start/second/_index.md b/content/tr/docs/quick-start/second/_index.md new file mode 100644 index 000000000..9bc12902a --- /dev/null +++ b/content/tr/docs/quick-start/second/_index.md @@ -0,0 +1,6 @@ +--- +title: "second" +weight: 2 +_build: + render: false +--- \ No newline at end of file diff --git a/content/tr/docs/quick-start/second/a.md b/content/tr/docs/quick-start/second/a.md new file mode 100644 index 000000000..3d69380da --- /dev/null +++ b/content/tr/docs/quick-start/second/a.md @@ -0,0 +1,9 @@ +--- +title: "second-a" +weight: 2 +--- + + +## test + +test \ No newline at end of file diff --git a/content/tr/docs/quick-start/second/third/_index.md b/content/tr/docs/quick-start/second/third/_index.md new file mode 100644 index 000000000..558f6d563 --- /dev/null +++ b/content/tr/docs/quick-start/second/third/_index.md @@ -0,0 +1,7 @@ +--- +title: "third" +weight: 1 + +_build: + render: false +--- \ No newline at end of file diff --git a/content/tr/docs/quick-start/second/third/aaa.md b/content/tr/docs/quick-start/second/third/aaa.md new file mode 100644 index 000000000..3bc1eb1b4 --- /dev/null +++ b/content/tr/docs/quick-start/second/third/aaa.md @@ -0,0 +1,8 @@ +--- +title: "aaaaaa" +weight: 1 +--- + +## test + +test \ No newline at end of file diff --git a/content/tr/forum/_index.md b/content/tr/forum/_index.md new file mode 100644 index 000000000..483c3f8db --- /dev/null +++ b/content/tr/forum/_index.md @@ -0,0 +1,4 @@ +--- +title: "page1" + +--- \ No newline at end of file diff --git a/content/tr/install/_index.md b/content/tr/install/_index.md new file mode 100644 index 000000000..483c3f8db --- /dev/null +++ b/content/tr/install/_index.md @@ -0,0 +1,4 @@ +--- +title: "page1" + +--- \ No newline at end of file diff --git a/content/tr/partner/_index.md b/content/tr/partner/_index.md index cedfae8f7..3d2ca5baf 100644 --- a/content/tr/partner/_index.md +++ b/content/tr/partner/_index.md @@ -1,6 +1,63 @@ --- -title: +title: "page1" -css: scss/partner.scss +css: "scss/partner.scss" +section1: + title: 'Join the Revolution,Partner with KubeSphere' + content: 'We look forward to your joining KubeSphere partner to improve the ecosystem of both, and grow your business. KubeSphere provide resources and rights for partners to help them increase their expertise, deliver open source technology, and resell product.' + topImage: 'images/partner/partner-top.jpg' + +section2: + title: 'Together, build partnership for success all over the world' + content: 'KubeSphere partners play a critical role in KubeSphere go-to-market strategy. KubeSphere partners are located all over the world, we are looking forward to the global cooperation, your success is our success.' + name1: 'USA' + name2: 'European' + name3: 'China' + mapImage: 'images/partner/map.svg' + +section3: + title: 'Partner Types' + tip: Request now → + partnerType: + - title: "App Providers" + content: "KubeSphere Application Store is a great place to showcase your application, KubeSphere bring your applications to tens of thousands of users, making them deploy your App to Kubernetes with one click." + link: "" + + - title: "Consulting" + content: "KubeSphere Application Store is a great place to showcase your application, users can quickly deploy your application to Kubernetes using KubeSphere. Submit your application to KubeSphere Application Store now!" + link: "" + + - title: "Cloud Providers" + content: "KubeSphere Application Store is a great place to showcase your application, users can quickly deploy your application to Kubernetes using KubeSphere. Submit your application to KubeSphere Application Store now!" + link: "" + + - title: "Go-To-Market" + content: "KubeSphere Application Store is a great place to showcase your application, users can quickly deploy your application to Kubernetes using KubeSphere. Submit your application to KubeSphere Application Store now!" + link: "" + +section4: + title: 'Featured Partners' + content: 'KubeSphere is trusted by various enterprises and organizations to the innovators driving the future of software.' + featuredPartnerList: + - icon: "images/partner/partner1.jpg" + partnerType: "Go-To-Market" + + - icon: "images/partner/partner2.jpg" + partnerType: "Go-To-Market" + + - icon: "images/partner/partner3.jpg" + partnerType: "Go-To-Market" + + - icon: "images/partner/partner4.jpg" + partnerType: "Go-To-Market" + + - icon: "images/partner/partner5.jpg" + partnerType: "Go-To-Market" + + - icon: "images/partner/partner6.jpg" + partnerType: "Go-To-Market" + + - icon: "images/partner/partner7.jpg" + partnerType: "Go-To-Market" --- \ No newline at end of file diff --git a/content/tr/projects/_index.md b/content/tr/projects/_index.md new file mode 100644 index 000000000..a658a359a --- /dev/null +++ b/content/tr/projects/_index.md @@ -0,0 +1,34 @@ +--- +title: "About" + + +css: "scss/projects.scss" +name: Open Source Projects +groups: + - name: Container Platform + children: + - title: KubeSphere + icon: 'images/kubesphere.svg' + link: '' + description: 基于 Kubernetes 之上构建的以应用为中心的多租户容器平台，支持部署运行在任何基础设施之上，提供简单易用的操作界面以及向导式 UI，旨在解决 Kubernetes 的存储、网络、安全与易用性等痛点。 + + - name: App Management + children: + - title: OpenPitrix + icon: '' + link: '' + description: 开源的多云应用管理平台，用来在多云环境下打包、部署和管理不同类型的应用，包括传统应用、微服务应用以及 Serverless 应用等，其中云平台包括 AWS、Kubernetes、QingCloud、VMWare。 + + - name: Storage Plugins + children: + - title: QingStor-CSI + icon: '' + link: '' + description: QingStor CSI 插件实现 CSI 接口，使容器编排平台（如 Kubernetes）能够使用 NeonSAN 分布式存储的资源。目前，QingStor CSI 插件实现了存储卷管理和快照管理功能，并在 Kubernetes v1.12 环境中通过了 CSI Sanity 测试。 + + - title: QingCloud-CSI + icon: '' + link: '' + description: QingCloud CSI 插件实现了 CSI 接口，并使容器管理平台能够使用 QingCloud 云平台的块存储资源。目前，QingCloud CSI 插件已经在 Kubernetes v1.14/v1.15 环境中通过了 CSI 测试。 + +--- \ No newline at end of file diff --git a/content/tr/reason/_index.md b/content/tr/reason/_index.md new file mode 100644 index 000000000..e9ce638d8 --- /dev/null +++ b/content/tr/reason/_index.md @@ -0,0 +1,4 @@ +--- +title: "reason" + +--- \ No newline at end of file diff --git a/content/tr/trends/_index.md b/content/tr/trends/_index.md new file mode 100644 index 000000000..483c3f8db --- /dev/null +++ b/content/tr/trends/_index.md @@ -0,0 +1,4 @@ +--- +title: "page1" + +--- \ No newline at end of file diff --git a/content/tr/videos/_index.md b/content/tr/videos/_index.md new file mode 100644 index 000000000..c15f8d37b --- /dev/null +++ b/content/tr/videos/_index.md @@ -0,0 +1,4 @@ +--- +title: "page1" +css: "scss/videos.scss" +--- \ No newline at end of file diff --git a/data/tr/footer.yaml b/data/tr/footer.yaml index f183646a7..f0166c22d 100644 --- a/data/tr/footer.yaml +++ b/data/tr/footer.yaml @@ -1,51 +1,51 @@ footer: list: - - title: + - title: Products list: - - content: + - content: KubeSphere link: '' - - content: + - content: Porter link: '' - - content: + - content: OpenPitrix link: '' - - content: + - content: Fluentbit-Operator link: '' - - content: + - content: KubeKey link: '' - - content: + - content: Notification Manager link: '' - - title: + - title: Kaynaklar list: - - content: + - content: Projeler link: - - content: + - content: Blog Yazıları link: - - content: + - content: KubeCon & QCon link: - - content: + - content: Videolar link: - - title: + - title: KubeSphere Dokümantasyon list: - - content: + - content: Giriş/Önsöz link: '' - - content: + - content: Kurulum link: '' - - content: + - content: Eğitim link: '' - - content: + - content: API Dokümantasyonu link: '' - - title: + - title: Topluluk list: - - content: + - content: Contribution link: - - content: + - content: Müşteri Senaryoları link: - - content: + - content: Partnerler link: - - content: + - content: Yol Haritası link: \ No newline at end of file diff --git a/i18n/tr.yaml b/i18n/tr.yaml index d90059cc6..362961ee6 100644 --- a/i18n/tr.yaml +++ b/i18n/tr.yaml @@ -1,2 +1,20 @@ - id: introduction2 - translation: '' + translation: KubeSphere®️ 2020 Tüm Hakları Saklıdır. +- id: introduction3 + translation: Published at +- id: introduction4 + translation: KubeCon & QCon +- id: introduction5 + translation: Abone Ol +- id: introduction6 + translation: Lütfen e-posta adresinizi girin. +- id: introduction7 + translation: KubeSphere'den son haberleri almak için haber ağımıza abone olabilirsiniz. +- id: introduction8 + translation: KubeSphere Dokümantasyon'a Hoşgeldiniz +- id: introduction9 + translation: KubeSphere servislerini ve size sunduklarını mümkün olduğunda açık anlatacağız. +- id: introduction10 + translation: Open Source Topluluk +- id: introduction11 + translation: KubeSphere, açık kaynak topluluğunun ekolojisini zenginleştirerek bulut yerel teknolojisinin, açık kaynak katkısına kendini adamıştır. From e9861c98f3fd9121f5932ed066de270b2fe6e468 Mon Sep 17 00:00:00 2001 From: liuboaibc Date: Mon, 8 Jun 2020 18:18:40 +0800 Subject: [PATCH 2/8] add common css --- assets/scss/case.scss | 33 ---------- assets/scss/common.scss | 73 ++++++++++++++++++++- assets/scss/contribution.scss | 62 +----------------- assets/scss/index.scss | 113 ++------------------------------ assets/scss/mixin.scss | 37 ----------- assets/scss/partner.scss | 34 +--------- assets/scss/projects.scss | 4 +- assets/scss/service-mesh.scss | 31 --------- layouts/case/list.html | 16 ++--- layouts/contribution/list.html | 52 ++++++++------- layouts/index.html | 50 +++++++------- layouts/observability/list.html | 22 +++---- layouts/partner/list.html | 28 ++++---- layouts/projects/list.html | 2 +- layouts/service-mesh/list.html | 22 +++---- 15 files changed, 179 insertions(+), 400 deletions(-) diff --git a/assets/scss/case.scss b/assets/scss/case.scss index c88a83f52..8a58b9d4a 100644 --- a/assets/scss/case.scss +++ b/assets/scss/case.scss @@ -4,13 +4,6 @@ .section-1 { position: relative; height: 300px; - min-width: 1160px; - - img { - width: 100%; - height: 100%; - object-fit:cover; - } .title-div { position: absolute; @@ -20,17 +13,8 @@ text-align: center; } - h1 { - font-size: 40px; - font-weight: bold; - line-height: 1; - letter-spacing: -0.11px; - color: #ffffff; - } p { margin-top: 12px; - font-size: 16px; - line-height: 1.5; letter-spacing: -0.04px; color: #ffffff; } @@ -44,8 +28,6 @@ justify-content: space-between; position: relative; top: -60px; - width: 1160px; - margin: 0 auto; z-index: 2; li { @@ -65,7 +47,6 @@ } p { - @include common-p-style; width: 293px; height: 128px; margin: 0 auto; @@ -79,10 +60,6 @@ font-size: 16px; font-weight: 600; line-height: 1.5; - - a { - color: #00a971; - } } } } @@ -105,12 +82,6 @@ h2 { margin-bottom: 40px; text-align: center; - height: 52px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 32px; - font-weight: bold; - line-height: 1.63; - color: #171c34; } & > div { @@ -175,10 +146,6 @@ & > p { margin-top: 40px; text-align: center; - - a { - color: #00a971; - } } } diff --git a/assets/scss/common.scss b/assets/scss/common.scss index 75906ba7b..4ecf04418 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -15,11 +15,21 @@ html { background-color: #f5f8f9; } +section { + min-width: 1160px; +} + .common-layout { width: 1160px; margin: 0 auto; } +.common-flex-layout { + display: flex; + flex-wrap: wrap ; + justify-content: space-between; +} + .title-h1 { font-size: 40px; line-height: 1; @@ -28,11 +38,20 @@ html { text-shadow: 0 2px 6px rgba(0, 0, 0, 0.15); } +.title-center-h1 { + font-size: 40px; + line-height: 1; + letter-spacing: -0.11px; + color: #ffffff; + text-shadow: 0 2px 6px rgba(0, 0, 0, 0.15); + text-align: center; +} + .title-black-h2 { text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); font-size: 32px; font-weight: bold; - line-height: 1.63; + line-height: 52px; color: #171c34; } @@ -44,6 +63,22 @@ html { color: #ffffff; } +.title-black-h3 { + text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); + font-size: 24px; + font-weight: bold; + line-height: 32px; + color: #31383e; +} + +.title-white-h3 { + height: 24px; + font-size: 20px; + font-weight: 600; + line-height: 1.2; + color: #ffffff; +} + .title-p { font-size: 16px; line-height: 2; @@ -51,6 +86,12 @@ html { color: #919aa3; } +.common-p { + font-size: 16px; + line-height: 1.5; + color: #8f94a1; +} + .common-center-p { font-size: 16px; line-height: 1.5; @@ -58,6 +99,20 @@ html { color: #8f94a1; } +.common-content { + font-size: 20px; + font-weight: 600; + line-height: 1.2; + letter-spacing: -0.06px; + color: #3e464c; +} + +.common-li { + font-size: 16px; + line-height: 20px; + color: #36435c; +} + .common-btn { border: none; font-size: 14px; @@ -99,3 +154,19 @@ html { color: #55bc8a; } } + +.common-middle-inline { + display: inline-block; + vertical-align: middle; +} + +.common-top-inline { + display: inline-block; + vertical-align: top; +} + +.top-cover-img { + width: 100%; + height: 100%; + object-fit: cover; +} diff --git a/assets/scss/contribution.scss b/assets/scss/contribution.scss index 8d1e3c4d6..f766788aa 100644 --- a/assets/scss/contribution.scss +++ b/assets/scss/contribution.scss @@ -5,13 +5,6 @@ .section-1 { position: relative; height: 300px; - min-width: 1160px; - - img { - width: 100%; - height: 100%; - object-fit:cover; - } .title-div { position: absolute; @@ -21,17 +14,8 @@ text-align: center; } - h1 { - font-size: 40px; - font-weight: bold; - line-height: 1; - letter-spacing: -0.11px; - color: #ffffff; - } p { margin-top: 12px; - font-size: 16px; - line-height: 1.5; letter-spacing: -0.04px; color: #ffffff; } @@ -42,9 +26,7 @@ background-position: center bottom; background-repeat: no-repeat; & > div { - @include common-content-div-style; & > ul { - @include common-flex-style; position: relative; transform: translateY(-40px); & > li { @@ -114,13 +96,7 @@ margin-top: 60px; text-align: center; h2 { - height: 52px; margin-bottom: 40px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 32px; - font-weight: bold; - line-height: 52px; - color: #171c34; } & > div { @@ -146,7 +122,6 @@ left: 50%; width: 896px; transform: translateX(-50%); - @include common-flex-style; & > li { width: 200px; @@ -258,26 +233,14 @@ .section-3 { text-align: center; - h2 { - height: 52px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 32px; - font-weight: bold; - line-height: 1.63; - color: #171c34; - } + padding-top: 40px; + & > p { width: 964px; - height: 64px; margin: 12px auto 0; - font-size: 16px; - line-height: 2; - color: #919aa3; } & > ul { - width: 1160px; - margin: 0 auto; padding-bottom: 30px; text-align: left; border-bottom: solid 2px #e5e5e5; @@ -374,15 +337,10 @@ & > a { font-size: 18px; - font-weight: 600; - color: #00a971; } & > p { - height: 24px; margin-top: 4px; - font-size: 16px; - line-height: 1.5; color: #31383e; } @@ -416,19 +374,13 @@ 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: #ffffff; } & > div { - @include common-flex-style; width: 963px; margin: 0 auto; & > div { @@ -444,19 +396,13 @@ } h3 { - height: 29px; margin-top: 55px; - font-size: 20px; - font-weight: 600; - line-height: 1.2; color: #31383e; } p { height: 96px; margin: 13px auto 0; - font-size: 16px; - line-height: 1.5; color: #31383e; } @@ -490,8 +436,6 @@ } .section-5 { - width: 1160px; - margin: 0 auto; h2 { height: 52px; diff --git a/assets/scss/index.scss b/assets/scss/index.scss index 407747c2e..1d2ac91c3 100644 --- a/assets/scss/index.scss +++ b/assets/scss/index.scss @@ -1,10 +1,6 @@ @import 'variables'; @import 'mixin'; -section { - min-width: 1160px; -} - .section-1 { position: relative; height: 884px; @@ -147,8 +143,6 @@ section { & > ul { li { - display: inline-block; - vertical-align: top; width: 274px; height: 358px; @@ -156,21 +150,9 @@ section { margin: 36px auto 20px; } - h3 { - height: 32px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 24px; - font-weight: bold; - line-height: 1.33; - color: #31383e; - } - p { width: 240px; - font-size: 16px; margin: 20px auto 0; - line-height: 1.5; - color: #8f94a1; } } } @@ -183,25 +165,11 @@ section { padding-bottom: 500px; background-color: #f5f8f9; & > div { - width: 1160px; - margin: 0 auto; text-align: center; - & > h2 { - height: 52px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 32px; - font-weight: bold; - line-height: 1.63; - color: #171c34; - } - & > p { width: 964px; margin: 16px auto 50px; - font-size: 16px; - line-height: 2; - color: #919aa3; } & > div { @@ -349,8 +317,6 @@ section { & > div { position: relative; - width: 1160px; - margin: 0 auto; & > div { width: 471px; @@ -367,8 +333,6 @@ section { & > p { height: 96px; opacity: 0.9; - font-size: 16px; - line-height: 1.5; color: #ffffff; } @@ -382,19 +346,8 @@ section { width: 414px; margin-left: 16px; display: inline-block; - - h3 { - height: 24px; - font-size: 20px; - font-weight: 600; - line-height: 1.2; - color: #ffffff; - } - p { opacity: 0.9; - font-size: 16px; - line-height: 1.5; color: #ffffff; } } @@ -441,19 +394,14 @@ section { .img-span-div { margin-top: 23px; margin-left: 30px; - img { - vertical-align: middle; - } - + span { - display: inline-block; height: 24px; margin-left: 16px; font-size: 20px; font-weight: 600; line-height: 1.2; color: #31383e; - vertical-align: middle; } } @@ -461,9 +409,6 @@ section { width: 372px; margin-top: 10px; margin-left: 30px; - font-size: 16px; - line-height: 1.5; - color: #76808a; } .middle-line { @@ -473,22 +418,12 @@ section { width: 2px; height: 114px; background-color: #e4edf6; - } a { position: absolute; top: 71px; right: 35px; - height: 24px; - font-size: 14px; - font-weight: 600; - line-height: 1.71; - color: #00a971; - - &:hover { - color: #008a5c; - } } } @@ -503,16 +438,8 @@ section { background-color: #f5f8f9; & > div { - width: 1160px; - margin: 0 auto; h2 { - height: 52px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 32px; - font-weight: bold; - line-height: 1.63; - color: #171c34; text-align: center; } @@ -522,19 +449,8 @@ section { font-size: 0; .front-div { - display: inline-block; - vertical-align: top; width: 280px; text-align: center; - - h3 { - height: 24px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 24px; - font-weight: 600; - color: #31383e; - } - p { width: 280px; height: 84px; @@ -571,17 +487,10 @@ section { } .back-div { - display: inline-block; - vertical-align: top; width: 867px; margin-left: 13px; h3 { - height: 24px; - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 24px; - font-weight: 600; - color: #31383e; text-align: center; } @@ -689,33 +598,16 @@ section { & > div { position: relative; - width: 1160px; - margin: 0 auto; text-align: center; z-index: 2; - 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; - color: #171c34; - } - & > p { width: 965px; - height: 64px; margin: 12px auto; white-space: pre; - font-size: 16px; - line-height: 2; - color: #919aa3; } ul { - @include common-flex-style; margin-top: 59px; margin-bottom: 45px; li { @@ -758,6 +650,9 @@ section { a { color: #31383e; text-decoration: underline; + &:hover { + color: #55bc8a; + } } } diff --git a/assets/scss/mixin.scss b/assets/scss/mixin.scss index 047133e63..139597f9c 100644 --- a/assets/scss/mixin.scss +++ b/assets/scss/mixin.scss @@ -1,39 +1,2 @@ -@mixin common-center-div-style { - width: 1160px; - margin: 0 auto; -} - -@mixin common-p-style { - font-size: 16px; - line-height: 2; - color: #919aa3; -} - -@mixin common-title-style { - font-size: 20px; - font-weight: 600; - line-height: 1.2; - letter-spacing: -0.06px; - color: #3e464c; -} - -@mixin common-h2-style { - text-shadow: 0 4px 8px rgba(35, 45, 65, 0.1); - font-size: 32px; - font-weight: bold; - line-height: 1.63; - color: #171c34; -} - -@mixin common-flex-style { - display: flex; - flex-wrap: wrap ; - justify-content: space-between; -} - -@mixin common-content-div-style { - width: 1160px; - margin: 0 auto; -} \ No newline at end of file diff --git a/assets/scss/partner.scss b/assets/scss/partner.scss index b53becdfd..308b1ae90 100644 --- a/assets/scss/partner.scss +++ b/assets/scss/partner.scss @@ -4,13 +4,6 @@ .section-1 { position: relative; height: 300px; - min-width: 1160px; - - img { - width: 100%; - height: 100%; - object-fit:cover; - } .title-div { position: absolute; @@ -20,18 +13,9 @@ text-align: center; } - h1 { - font-size: 40px; - font-weight: bold; - line-height: 1; - letter-spacing: -0.11px; - color: #ffffff; - } p { width: 1067px; margin: 12px auto 0; - font-size: 16px; - line-height: 1.5; letter-spacing: -0.04px; color: #ffffff; } @@ -51,8 +35,6 @@ position: relative; z-index: 2; top: -40px; - width: 1160px; - margin: 0 auto; box-shadow: 0 4px 8px 0 rgba(36, 46, 66, 0.06); .left-div { position: relative; @@ -61,16 +43,15 @@ border-radius: 10px 0 0 10px; background-color: #ffffff; div { - @include common-title-style; width: 351px; height: 48px; margin: 38px 80px 12px 40px; } p { - @include common-p-style; width: 391px; height: 160px; margin-left: 40px; + line-height: 2; } .img-1 { position: absolute; @@ -173,15 +154,11 @@ background-repeat: no-repeat; & > div { - width: 1160px; - margin: 0 auto; h2 { - @include common-h2-style; text-align: center; } ul { - @include common-flex-style; margin-top: 20px; li { @@ -194,14 +171,13 @@ h3 { margin: 40px 40px 20px; - @include common-title-style; } p { height: 128px; margin-left: 40px; margin-right: 40px; - @include common-p-style; + line-height: 2; } div { @@ -209,10 +185,6 @@ margin-top: 20px; font-weight: 600; line-height: 1.5; - - a { - color: #00a971; - } } } } @@ -221,10 +193,8 @@ .section-4 { & > div { - @include common-center-div-style; margin-top: 80px; h2 { - @include common-h2-style; text-align: center; } diff --git a/assets/scss/projects.scss b/assets/scss/projects.scss index d9b27725a..e87aaac2f 100644 --- a/assets/scss/projects.scss +++ b/assets/scss/projects.scss @@ -8,9 +8,7 @@ .content { position: relative; - min-height: 380px; - width: 1160px; - margin: 0 auto; + min-height: 580px; padding-bottom: 20px; .left { diff --git a/assets/scss/service-mesh.scss b/assets/scss/service-mesh.scss index cf2b2e6a9..70552db36 100644 --- a/assets/scss/service-mesh.scss +++ b/assets/scss/service-mesh.scss @@ -8,13 +8,6 @@ html { .section-1 { position: relative; height: 350px; - min-width: 1160px; - - img { - width: 100%; - height: 100%; - object-fit:cover; - } .title-div { position: absolute; @@ -25,18 +18,11 @@ html { h1 { width: 1060px; - font-size: 40px; - text-shadow: 0 2px 6px rgba(0, 0, 0, 0.15); - line-height: 1; - letter-spacing: -0.11px; - color: #ffffff; } p { width: 1060px; margin-top: 25px; - font-size: 16px; - line-height: 1.5; letter-spacing: -0.04px; color: #ffffff; text-shadow: 0 2px 6px rgba(0, 0, 0, 0.15); @@ -49,8 +35,6 @@ html { padding-top: 60px; & > div { position: relative; - width: 1160px; - margin: 0 auto; h2 { width: 760px; @@ -63,24 +47,15 @@ html { flex-direction: row-reverse; } & > li { - @include common-flex-style; align-items: center; margin-bottom: 20px; & > div { width: 460px; - h3 { - font-size: 24px; - line-height: 1; - color: #3d3e49; - } - p { margin-top: 24px; opacity: 0.9; - font-size: 16px; - line-height: 1.5; color: #3d3e49; } @@ -88,8 +63,6 @@ html { position: relative; margin-top: 25px; padding-left: 14px; - font-size: 16px; - color: #36435c; &::before { content: ''; @@ -139,8 +112,6 @@ html { & > div { position: relative; - width: 1160px; - margin: 0 auto; img { width: 955px; margin-top: 40px; @@ -148,8 +119,6 @@ html { p { margin-top: 56px; - font-size: 16px; - line-height: 1.5; letter-spacing: -0.04px; color: #31383e; } diff --git a/layouts/case/list.html b/layouts/case/list.html index 80543584b..0139afd22 100644 --- a/layouts/case/list.html +++ b/layouts/case/list.html @@ -1,10 +1,10 @@ {{ define "main" }}
{{ with .Params.section1 }} - +
-

{{ .title }}

-

{{ .content }}

+

{{ .title }}

+

{{ .content }}

{{ end }}
@@ -12,13 +12,13 @@
{{ with .Params.section2 }} {{ $tip := .tip }} - From b912cba858318ca23ef4a41e40513bd17e5dfff6 Mon Sep 17 00:00:00 2001 From: liuboaibc Date: Tue, 9 Jun 2020 21:55:43 +0800 Subject: [PATCH 8/8] change --- assets/scss/index.scss | 2 +- layouts/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/scss/index.scss b/assets/scss/index.scss index 586cee9a9..654619ffe 100644 --- a/assets/scss/index.scss +++ b/assets/scss/index.scss @@ -422,7 +422,7 @@ & > span { position: absolute; top: 71px; - right: 30px; + right: 20px; } & > a { diff --git a/layouts/index.html b/layouts/index.html index a51598591..3add7733f 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -103,7 +103,7 @@
{{ if .check }} - {{ i18n "Coming Soon" }} + {{ i18n "Coming Soon" }} → {{ else }} {{ i18n "Read More" }} → {{ end }}