• This project
    • Loading...
  • Sign in

bluejoyq / searchGuide

%ea%b7%b8%eb%a6%bc1
Go to a project
Toggle navigation Toggle navigation pinning
  • Projects
  • Groups
  • Snippets
  • Help
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 0
  • Wiki
  • Snippets
  • Network
  • Create a new issue
  • Builds
  • Commits
  • Issue Boards
Merged
Merge Request !9 opened 2019-12-08 04:58:28 UTC by 김서영@2018102169

change design

구체적인 변경 사항 assets/font 파일추가 app.js 폰트 추가 PromptSearh.js 폰트 등등 SearchCard.js 색,폰트 Rate~ 폰트, 색 등등

.env 파일 색상 변경 사항(색상 정보만 여기로 보냅니다.) DARK_MAIN = #214663 LIGHT_MAIN = #3b7cab WHITE_MAIN = #dadfec BUTTON = #6998ce

Edited 2019-12-08 07:52:17 UTC
Request to merge 2018102169:design into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch http://khuhub.khu.ac.kr/2018102169/searchGuide.git design
git checkout -b 2018102169/searchGuide-design FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff 2018102169/searchGuide-design

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Merged

The changes were merged into master.

  • Discussion 0
  • Commits 1
  • Changes 15
  • {{ resolvedDiscussionCount }}/{{ discussionCount }} {{ discussionCount | pluralize 'discussion' }} resolved
  • bluejoyq
    @2018104017 2019-12-08 07:52:17 UTC

    Status changed to merged

  • Please register or login to post a comment
Assignee
No assignee
Assign to
None
Milestone
None
Assign milestone
2
2 participants
Reference: 2018104017/searchGuide!9