Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[김희진] sprint3 #46

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .github/workflows/delete-merged-branch-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,20 @@ jobs:
delete-branch:
runs-on: ubuntu-latest
steps:
- name: delete branch
- name: Checkout repository
uses: actions/checkout@v3

- name: Check if branch exists
id: check_branch
run: |
if git show-ref --verify --quiet refs/heads/${{ github.head_ref }}; then
echo "branch_exists=true" >> $GITHUB_ENV
else
echo "branch_exists=false" >> $GITHUB_ENV
fi

- name: Delete branch
if: env.branch_exists == 'true'
Comment on lines +11 to +24
Copy link
Collaborator Author

@devmanta devmanta Aug 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git action 실패해서 pr마다 다 x 쳐져있길래 거슬려서(?)
전적으로 GPT선생님 도움을 받아 branch 삭제 전에 branch 존재여부 확인하는 job 추가해보았습니다.
(실패사유가 브랜치를 못찾는거 같아서요..)
이게 정확히 맞는건진 잘 모르겠는데 일단 요 액션보면 Delete branch job은 동작하지 않은것으로 보여집니다🤔

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저도.. 깃헙 액션이 실패한것이 신경쓰였지만 흐린눈 하고 있었습니다
이렇게 고쳐보셨다니 좋네요.
PR close시랑 merge시 해당 스크립트가 실행되니 이따가 merge될때도 성공하면 좋겠네요.

uses: SvanBoxel/delete-merged-branch@main
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
42 changes: 5 additions & 37 deletions css/global.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,51 +16,19 @@
--size-max-width: 1200px;
}

@font-face {
font-family: 'ROKAF Sans'; /* 폰트 이름 정의 */
src: url('../fonts/ROKAF_Sans_Bold.ttf') format('truetype');
}
Comment on lines +19 to +22
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P3:
로고에만 사용되는 폰트라면 용량면에서 그냥 이미지로 로고를 보여주시는게 더 좋을 것 같습니다.


* {
box-sizing: border-box;
GANGYIKIM marked this conversation as resolved.
Show resolved Hide resolved
font-family: 'Pretendard', sans-serif;
margin: 0;
padding: 0;
}

header {
position: fixed;
top: 0;
width: 100%;
background-color: #fff;
}

body {
margin: 0;
padding: 0;
height: 100vh;
}

a {
text-decoration: none;
}

button {
border: none;
outline: none;
cursor: pointer;
}

footer {
background-color: var(--Secondary-900);
width: 100%;
}

input {
outline: none;
border: none;
}

input:focus {
outline: none;
}

input[type='submit'] {
cursor: pointer;
outline: none;
}
Loading
Loading