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.

Sign up for GitHub

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

Jump to bottom

Update website #2 #18

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Update website #2 #18

merged 2 commits into from
Jan 19, 2022

Conversation

pklion
Copy link
Contributor

@pklion pklion commented Jan 18, 2022

Changes

  • index.html, style.cssの文字コードをsjisに(index.utf8.htmlはutf8)
  • 文字コード指定削除
  • CSSの分割

From #17

kmikage
kmikage approved these changes Jan 19, 2022
View reviewed changes
Copy link
Owner

@kmikage kmikage left a comment •
edited

Choose a reason for hiding this comment

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

Change encode to sjis and add style.css

このコミットまで承認します。

kmikage
kmikage reviewed Jan 19, 2022
View reviewed changes
Copy link
Owner

@kmikage kmikage left a comment •
edited

Choose a reason for hiding this comment

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

Update contributors

お気持ちはわかりますが、このコミットは承認できません。
変更される際は事前に「何をどう変更したいのか」を教えて頂けないと、PRいただいてもMergeできないです。

@kmikage kmikage merged commit 6f86f56 into kmikage:issues/17 Jan 19, 2022
This was referenced Jan 19, 2022
Merged
Closed
pklion added a commit to pklion/yokai-password that referenced this pull request Jan 19, 2022
@pklion
Squashed commit of the following:
7f4f8e3 
commit 4ae3200
Author: kei <kmikage@gmail.com>
Date:   Wed Jan 19 18:17:53 2022 +0900

    Revert "Merge pull request kmikage#16 from pklion/upd-hp to issues/17."

    This reverts commit 462ba83, reversing
    changes made to 7707934.

commit abc3131
Merge: 6f86f56 dc2adb6
Author: Kei Mikage <kmikage@gmail.com>
Date:   Wed Jan 19 17:57:42 2022 +0900

    Merge pull request kmikage#19 from kmikage/revert-18-upd-hp

    Revert "Update website kmikage#2"

commit dc2adb6
Author: Kei Mikage <kmikage@gmail.com>
Date:   Wed Jan 19 17:56:57 2022 +0900

    Revert "Update website kmikage#2"

commit 6f86f56
Merge: 462ba83 019e25a
Author: Kei Mikage <kmikage@gmail.com>
Date:   Wed Jan 19 17:56:12 2022 +0900

    Merge pull request kmikage#18 from pklion/upd-hp

    Update website kmikage#2

commit 462ba83
Merge: 7707934 9607009
Author: Kei Mikage <kmikage@gmail.com>
Date:   Tue Jan 18 20:55:11 2022 +0900

    Merge pull request kmikage#16 from pklion/upd-hp to issues/17.

    issues/17にmerge.
    kmikage#17 として引き続き対応。
@pklion pklion mentioned this pull request Jan 20, 2022
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kmikage kmikage kmikage approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@pklion @kmikage