From 8615aa9334a4818e6ee045bf4751329b10a282d7 Mon Sep 17 00:00:00 2001 From: iamayushdas Date: Tue, 23 Mar 2021 09:12:19 +0530 Subject: [PATCH 1/2] feat: added github link to header #1632 --- web/src/pages/User/Login.less | 11 ++++++++++- web/src/pages/User/Login.tsx | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/web/src/pages/User/Login.less b/web/src/pages/User/Login.less index 6535c1b052..15d797a24d 100644 --- a/web/src/pages/User/Login.less +++ b/web/src/pages/User/Login.less @@ -30,7 +30,15 @@ text-align: right; } -.settings { +a { + color: black; + + &:hover { + color: @primary-color; + } +} + +.github { display: inline-flex; align-items: center; justify-content: center; @@ -95,6 +103,7 @@ .main { width: 368px; margin: 0 auto; + @media screen and (max-width: @screen-sm) { width: 95%; } diff --git a/web/src/pages/User/Login.tsx b/web/src/pages/User/Login.tsx index 14851e5f73..b9b33bbbed 100644 --- a/web/src/pages/User/Login.tsx +++ b/web/src/pages/User/Login.tsx @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { GithubOutlined } from '@ant-design/icons'; import React, { useState } from 'react'; import { Button, notification, Tabs } from 'antd'; import { SelectLang } from '@@/plugin-locale/SelectLang'; @@ -81,6 +82,11 @@ const Page: React.FC = () => { return (
+
+ + + +
From 0d226c35e7373bb35f1b5a0acb2e3408df239ca3 Mon Sep 17 00:00:00 2001 From: iamayushdas Date: Tue, 23 Mar 2021 09:58:03 +0530 Subject: [PATCH 2/2] fix: used google cloud container registry --- api/test/docker-deploy/docker-compose.yaml | 2 +- api/test/docker/docker-compose.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/test/docker-deploy/docker-compose.yaml b/api/test/docker-deploy/docker-compose.yaml index 8f7e8000f0..a78debd471 100644 --- a/api/test/docker-deploy/docker-compose.yaml +++ b/api/test/docker-deploy/docker-compose.yaml @@ -18,7 +18,7 @@ version: "3.6" services: etcd: - image: quay.io/coreos/etcd:v3.4.0 + image: gcr.io/etcd-development/etcd:v3.4.0 ports: - "2379:2379" expose: diff --git a/api/test/docker/docker-compose.yaml b/api/test/docker/docker-compose.yaml index 4378f6c33a..fdc9dd132b 100644 --- a/api/test/docker/docker-compose.yaml +++ b/api/test/docker/docker-compose.yaml @@ -18,7 +18,7 @@ version: "3.6" services: node1: - image: quay.io/coreos/etcd:v3.4.0 + image: gcr.io/etcd-development/etcd:v3.4.0 ports: - "2379:2379" expose: @@ -50,7 +50,7 @@ services: - docker-etcd node2: - image: quay.io/coreos/etcd:v3.4.0 + image: gcr.io/etcd-development/etcd:v3.4.0 networks: apisix_dashboard_e2e: ipv4_address: 172.16.238.11 @@ -80,7 +80,7 @@ services: - docker-etcd node3: - image: quay.io/coreos/etcd:v3.4.0 + image: gcr.io/etcd-development/etcd:v3.4.0 networks: apisix_dashboard_e2e: ipv4_address: 172.16.238.12