Skip to content

Commit

Permalink
style: change color to fit modern theme (#338)
Browse files Browse the repository at this point in the history
* style: change color to fit modern theme

* ci: update adpr flow

* change warning color

* update color
  • Loading branch information
viet-nv authored Jul 28, 2022
1 parent 3bbed52 commit 99a4882
Show file tree
Hide file tree
Showing 15 changed files with 175 additions and 210 deletions.
10 changes: 10 additions & 0 deletions .adpr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
adpr:
image:
repository: asia.gcr.io/kyber-operation/core/dmm-info
tagPrefix: adpr
workflow:
name: "Auto Deploy PR"
ignoreCase: true

container:
port: 80
172 changes: 0 additions & 172 deletions .github/workflows/adpr.yaml

This file was deleted.

132 changes: 132 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
name: "Auto Deploy PR"

concurrency:
group: pr-workflow-${{ github.ref }}
cancel-in-progress: true

on:
pull_request:
types:
- opened
- reopened
- synchronize

env:
SERVICE: dmm-info

jobs:
prepare:
runs-on: ubuntu-18.04
outputs:
current_branch: ${{ steps.current_branch.outputs.value }}
head_sha: ${{ github.event.pull_request.head.sha }}
image_name: "asia.gcr.io/kyber-operation/core/${{ env.SERVICE }}"
image_tag: ${{ steps.get_tag.outputs.image_tag }}
repository: ${{ github.repository }}
pr_number: ${{github.event.number}}
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Extract branch
shell: bash
id: current_branch
run: |
if [[ ! "${{ github.ref }}" = "refs/tags/"* ]]; then
if [[ "${{ github.event_name }}" = "pull_request" ]]; then
HEAD_REF=$(printf "%q" "${{ github.head_ref }}")
HEAD_REF=${HEAD_REF/refs\/heads\//}
BRANCH=$HEAD_REF
else
REF=$(printf "%q" "${{ github.ref }}")
REF_BRANCH=${REF/refs\/pull\//}
REF_BRANCH=${REF_BRANCH/refs\/heads\//}
BRANCH=$REF_BRANCH
fi
else
REF=$(printf "%q" "${{ github.ref }}")
REF_BRANCH=${REF/refs\/tags\//}
BRANCH=$REF_BRANCH
fi
echo "::set-output name=value::$BRANCH"
- name: Extract GitHub HEAD SHA
id: head_sha
run: echo "::set-output name=value::$(git rev-parse HEAD)"

- name: Get Docker image tag
id: get_tag
env:
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
run: |
short_sha="$(echo $HEAD_SHA | head -c7)"
echo "::set-output name=image_tag::adpr-$short_sha"
build:
runs-on: ubuntu-18.04
needs:
- prepare
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Node.js 16.x
uses: actions/setup-node@v1
with:
node-version: 16.x

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@master

- name: Gcloud Auth
uses: google-github-actions/auth@v0
with:
credentials_json: '${{ secrets.GCR_CREDENTIALS }}'

- name: Setup Gcloud SDK
uses: google-github-actions/setup-gcloud@v0

- name: Configure docker
run: gcloud auth configure-docker

- name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-${{ env.SERVICE }}-buildx

- name: Restore node_modules
uses: actions/cache@v2
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

- name: Install dependences
uses: bahmutov/npm-install@HEAD

- name: Yarn Build
env:
CI: false
REACT_APP_VERSION: ${{ github.sha }}
CURRENT_BRANCH: ${{ needs.prepare.outputs.current_branch }}
run: yarn build

- name: Docker build and push
uses: docker/build-push-action@v2
with:
context: .
push: true
labels: |
kyber.network.schema-version=1.0
kyber.network.vcs-ref=${{ github.sha }}
kyber.network.version=${{ needs.prepare.outputs.image_tag }}
kyber.network.name=${{ env.SERVICE }}
tags: |
${{ needs.prepare.outputs.image_name }}:${{ needs.prepare.outputs.image_tag }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new

- name: Move Docker cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
6 changes: 3 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ const WarningWrapper = styled.div`
`

const WarningBanner = styled.div`
border: 1px solid ${({ theme }) => theme.warningBorder};
background: ${({ theme }) => theme.warningBackground};
border-bottom: 1px solid ${({ theme }) => theme.border};
background: ${({ theme }) => theme.buttonBlack};
padding: 1.5rem 2.5rem;
color: ${({ theme }) => theme.warningTextColor};
color: ${({ theme }) => theme.subText};
width: 100%;
text-align: center;
font-weight: 500;
Expand Down
21 changes: 11 additions & 10 deletions src/Theme/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ const theme = (darkMode, color) => ({
bg3: darkMode ? '#40444F' : '#EDEEF2',
bg4: darkMode ? '#565A69' : '#CED0D9',
bg5: darkMode ? '#565A69' : '#888D9B',
bg6: darkMode ? '#243036' : '#FFFFFF',
bg7: darkMode ? '#303e46' : '#FFFFFF',
bg8: darkMode ? '#3e4b51' : '#E7E7E7',

Expand Down Expand Up @@ -92,12 +91,12 @@ const theme = (darkMode, color) => ({
// border: darkMode ? '#4c5f69' : '#859aa5',

// table colors
tableHeader: darkMode ? '#303E46' : '#F9F9F9',
tableHeader: darkMode ? '#313131' : '#FBFBFB',
oddRow: darkMode ? '#283339' : '#f4f4f4',
evenRow: darkMode ? '#303e46' : '#F9F9F9',

// other
red1: '#FF537B',
red1: '#ff537b',
green1: '#31CB9E',
yellow1: '#FFE270',
yellow2: '#F3841E',
Expand All @@ -109,12 +108,14 @@ const theme = (darkMode, color) => ({
warningBorder: darkMode ? '#303e46' : '#ffaf01',
warningTextColor: darkMode ? '#859aa5' : '#1d272b',

buttonBlack: darkMode ? '#11171A' : '#F5F5F5',
background: darkMode ? '#243036' : '#FFFFFF',
text: darkMode ? '#FFFFFF' : '#3A3A3A',
textReverse: !darkMode ? '#FFFFFF' : '#3A3A3A',
subText: darkMode ? '#A7B6BD' : '#5C6468',
border: darkMode ? '#40505A' : '#E9E9E9',
buttonBlack: darkMode ? '#0F0F0F' : '#f5f5f5',
background: darkMode ? '#1C1C1C' : '#FFFFFF',

text: darkMode ? '#ffffff' : '#222222',
textReverse: darkMode ? '#222222' : '#ffffff',
subText: darkMode ? '#A9A9A9' : '#5E5E5E',

border: darkMode ? '#505050' : '#C1C1C1',

// media queries
mediaWidth: mediaWidthTemplates,
Expand Down Expand Up @@ -223,7 +224,7 @@ export const GlobalStyle = createGlobalStyle`
width: 100%;
height: 100%;
font-size: 14px;
background-color: ${({ theme }) => theme.bg6};
background-color: ${({ theme }) => theme.background};
}
a {
Expand Down
Loading

0 comments on commit 99a4882

Please sign in to comment.