npm i hexo-theme-volantis
æŽæ°ãããšãã¯ã package.json
ã®ããŒãžã§ã³çªå·ã*
ã«å€æŽããŠããã npm i
ãå®è¡ããŸãã
ãã©ãŒã¯ãåç §ããŠå€æŽããããŒããæŽæ°ãããããã©ãŒã¯ã«ããŒãžããŸãã
@inkssãããŒããæŽæ°ããæ¹æ³ãforkã¡ãœããã«å ¥åããã®ãæäŒã£ãŠãã ããã ð
ãã®èšäºã¯ãGitKrakenãœãããŠã§ã¢ã®äœ¿çšã«åºã¥ããŠããŸããé¢é£ãªã³ã¯ïŒ GitKrakenïŒç¡æã®Git GUIã¯ã©ã€ã¢ã³ã-WindowsãMacãLinux
ããŒãã®ã¯ããŒã³ãäœæããããŒãã®èšäºã®ãµãã¢ãžã¥ãŒã«ã®èšå®ã«åŸã£ãŠããã°ãªããžããªã«è¿œå ããå Žåã¯ããã®èšäºãéåžžã«åœ¹ç«ã¡ãŸãããŸã è¡ã£ãŠããªãå Žåã¯ãè©ŠããŠã¿ãŠãã ããããã®èšäºã®ãŠã§ã¢ããŠã¹ç°å¢ã¯æ¬¡ã®ãšããã§ããããã°ãŠã§ã¢ããŠã¹Hexo-Blog ãããŒããŠã§ã¢ããŠã¹volantis ã
GitKrakenã®ãœãããŠã§ã¢ã€ã³ã¿ãŒãã§ã€ã¹ã§ã¯ãäžå€®ã«æ倧ã®é åãããé åã¯ãå庫ã®å±¥æŽéä¿¡æ å ±ãå³åŽã®éžæãããéä¿¡ã¬ã³ãŒãã®è©³çŽ°ãããã³å·ŠåŽã®ããã€ãã®å庫é¢é£æ å ±ã§ããããµãã¢ãžã¥ãŒã«ã«çŠç¹ãåœãŠãŠããŸããå·ŠåŽã®ãªãã·ã§ã³ããŒãéåžžããã©ãŒã¯ã®ããŒããªããžããªãããã°ãªããžããªã«è¿œå ããŠããå Žåã¯ãããã§ç¢ºèªã§ããŸãã [ãµãã¢ãžã¥ãŒã«]ã¿ããå±éããå³ã¯ãªãã¯ããŠ[ãã®ãµãã¢ãžã¥ãŒã«ãéã]ãéžæããŠããµãã¢ãžã¥ãŒã«ãéããŸãã
ããã°ãªããžããª
ãµãã¢ãžã¥ãŒã«ãéã
ãã®ããã«å ¥åããããªããžããªã¯ããŒããªããžããªã§ãããçŸåšã®ããŒãžã§ãã¹ãŠã®éä¿¡ã®å±¥æŽãªã©ã衚瀺ã§ããŸããäžéšã®åè«ã®ååã«ãã£ãŠåŒãèµ·ããããæªåœ±é¿ãåé¿ããããã«ãèšå®ã¯æ¬¡ã®ãšããã§ããForkãªããžããªã¯themeãªããžããªãšåŒã°ããhexo-theme-volantisãªããžããªã¯volantisãªããžããªãšåŒã°ããŸãã
ããŒããªããžããª
ãã®å³ã§ã¯ãçŸåšã®ãã©ãŒã¯ã®ããŒããªããžããªãé 眮ãããŠãããã©ã³ããmaster-themeã§ãããããŒãœãã«ããŒããªããžããªã®æåŸã®ã³ãããæ å ±ãå³ã®å³åŽã«è¡šç€ºãããŠããŸããäžå€®ã®é åã®äžéšã¯ããã¹ã¿ãŒã§ããŒã¯ãããvolantisãªããžããªã®ãã©ã³ãã§ãïŒå³åŽã®ããŽç»åã§åºå¥ã§ããŸãïŒãæããã«ãçŸåšã®ããŒããªããžããªã¯Volantisãªããžããªã«é ãããšã£ãŠããŸãã次ã«ãã³ãŒããç¬èªã®ããŒããªããžããªã«ããŒãžããå¿ èŠããããŸããéããåŸãã€ã³ã¿ãŒãã§ã€ã¹ã«VolantisãŠã§ã¢ããŠã¹æ å ±ã衚瀺ãããªãå Žåã¯ãVolantisãŠã§ã¢ããŠã¹ãçŸåšãªã¢ãŒããšããŠè¿œå ãããŠããªãããšãæå³ããŸãã次ã®ããã«è¿œå ã§ããŸãã
Volantisãªã¢ãŒããªããžããªæ
å ±ãè¿œå ãã
å·ŠåŽã®ããã«ã®[ãªã¢ãŒã]ã¿ãã§ããã©ã¹èšå·ãã¯ãªãã¯ããŠæ¬¡ã®å³ã«ç€ºãã€ã³ã¿ãŒãã§ã€ã¹ã«å ¥ãã volantis-x / hexo-theme-volantisãéžæããŠè¿œå ããŸãã
volantisãªããžããªã®masterãã©ã³ããå³ã¯ãªãã¯ãã[ volantis / masterãxxxxã«ããŒãž]ãéžæããŠããŒãžããŸãã Rebaseãéžæããªãçç±ã«ã€ããŠã¯ãå人çã«ã¯ãå±¥æŽãå€æŽãããããããªããžããªã®ã³ãããå±¥æŽãä¿æããæ¹ãè¯ããšæããŸããéåžžãããŒãžæäœã¯èªåçã«å®äºããŸããã競åãããå Žåã¯ã次ã®ãªãã€ã³ããŒã衚瀺ãããŸãïŒããŒãžã«å€±æããŸããã解決ããå¿ èŠã®ããããŒãžã®ç«¶åããããŸããåè¿°ã®ããã«ã解決ããå¿ èŠã®ãã競åããããŸããå³åŽã®ã¿ãã«ã¯ã[ããŒãž]ã衚瀺ãããŸãã[競åãæ€åºãããŸãã]ãŠã£ã³ããŠã«ã¯ã解決ããããã¡ã€ã«ãšç«¶åãããã¡ã€ã«ã衚瀺ãããŸãã
ãŠã£ã³ããŠãã¯ãªãã¯ããŠç«¶åã解決ããŸãããã®ããŒãžã§ã¯ãäžéšãããŒã«ã«ã³ãŒããšãªã¢ãŒãã³ãŒãã§ãäžéšãããŒãžãããã³ã³ãã³ãã§ããå€æŽå±¥æŽã®åŒã³åºããªã©ãå®éã®ç¶æ³ã«å¿ããŠãå·ŠåŽã®ããŒã«ã«ãå³åŽã®ãªã¢ãŒãããŸãã¯ãã®äž¡æ¹ãéžæã§ããŸããéžæããçµæã«æºè¶³ã§ããªãå Žåã¯ãã³ã³ãã³ããæåã§å€æŽããããšãã§ããŸããçµäºãããã[ä¿å]ãã¯ãªãã¯ããŠæäœãçµäºããŸãã ïŒååãšããŠãåºåã®å 容ãçŽæ¥å€æŽããã®ã§ã¯ãªãããã®ãã¡ã®1ã€ãéžæããå¿ èŠããããŸãïŒ
å Žåã«ãã£ãŠã¯ããªã¢ãŒããšã³ãã«ãã£ãŠåé€ããããã¡ã€ã«ãçºçãã次ã®ããã³ããã衚瀺ãããããšããããŸããGitKrakenã¯ãsource / css / _plugins / gitalkstylãä¿æãããã©ãããå€æã§ããŸããã§ãããä¿æããŸããïŒ GitKrakenã¯ç©æ¥µçã«ãã¡ã€ã«ãåé€ããŸããããã¡ã€ã«ããã ããäžè¬çã«ã¯ããã¡ã€ã«ãåé€ããã ãã§ãä¿æããå¿ èŠã¯ãããŸããã
æåŸã«ã競åãããã¹ãŠã®ãã¡ã€ã«ã解決ããåŸããªããžããªãªã¹ãã€ã³ã¿ãŒãã§ã€ã¹ã«æ»ãã[ã³ãããããŠããŒãž]ãã¯ãªãã¯ããŠéä¿¡ãå®äºããŸãã
A.ããŒãžæäœ
B.ããŒãžç«¶åã®æ€åº
C.é©åãªã³ã³ãã³ããéžæãã
D.æåºç©
ã€ãŸããRebaseã¯ãã¹ãŠã®å€æŽïŒã³ãããïŒããããªãã¯ãã©ã³ãã®æåŸã«æ»ããŸãããã®çµæã匷å¶ã³ãããã«çŽé¢ããããšãå€ããããŒãžæäœã§ã®äœ¿çšã«ã¯é©ããŠããŸããã以äžããæç²ããŸããRebase-LiaoXuefengã®å ¬åŒãŠã§ããµã€ã
è€æ°ã®äººãåããã©ã³ãã§å ±åäœæ¥ãè¡ããšã競åãçºçãããããªããŸããããã·ã¥ãæåããåã«ãããã·ã¥åŸã®åäŸçšã®éŽãæåã«åŒã£åŒµã£ãŠããŒã«ã«ã«ããŒãžããå¿ èŠããããŸãã
èŠããã«ãããã¯ä¹±éã«èŠãã匷迫ç¥çµçã®åäŸéŽã¯å°ããŸãïŒãªãGitã®ã³ãããå±¥æŽã¯ããããªç·ã«ãªãããšãã§ããªãã®ã§ããïŒå®éã«ããã¯ã§ããŸãïŒ Gitã«ã¯RebaseãšåŒã°ããæäœãããããããããªããŒã¹ããšç¿»èš³ãã人ãããŸãã
ãªããŒã¹æäœã®æ©èœïŒãã©ãŒã¯ãããã³ãããå±¥æŽãçŽç·ã«ãæŽçãããŸããããã«ãããããçŽæçã«èŠããŸããæ¬ ç¹ã¯ãããŒã«ã«ã®ãã©ãŒã¯ãããã³ãããããã§ã«å€æŽãããŠããããšã§ãã
Rebaseæäœã§ã¯ãããŒã«ã«ã®ããã·ã¥è§£é€ããããã©ãŒã¯ãããã³ãããå±¥æŽãçŽç·ã«ç·šæã§ããŸãã
ãªããŒã¹ã®ç®çã¯ããã©ãŒã¯ãããã³ãããã«ã¯3è éã®æ¯èŒãå¿ èŠãªãããå±¥æŽã³ãããã®å€æŽãç°¡åã«ç¢ºèªã§ããããã«ããããšã§ãã
競åã¯éåžžãåãå Žæãå¥ã®äººã«ãã£ãŠå€æŽãããå Žåã«çºçããGitã¯ãããèªåçã«åŠçã§ããããŠãŒã¶ãŒã解決ããããã®ãšã©ãŒãã¹ããŒããŸããããŒãã¯ãŸã ææ¥æã®æ®µéã§ãããããæŽæ°ã®å埩é床ã¯æ¯èŒçéãã競åçŸè±¡ã¯ããæçœã«ãªãå¯èœæ§ããããŸãããã®ãããªç¶æ³ãæžããããã®ããã€ãã®ã¢ã€ãã¢ã次ã«ç€ºããŸãã
1. 1ã€ç®ã¯æ§æãã¡ã€ã«ã§ããHexoã®ã«ãŒã«ã«åŸã£ãŠãæ§æãžã®ãã¹ãŠã®å€æŽã¯åå¥ã«è¡ãããšãã§ããŸããããŒããªããžããªã®äžã®config.yml
ãçŽæ¥å€æŽããå¿
èŠã¯ãããŸãããããã§åç
§ã§ããŸããæ§æã¯ã©ã¹ãã¡ã€ã«ã¯ã競åããå¯èœæ§ãæãäœãå Žæã§ãã
2.ã¹ã¿ã€ã«ãã¡ã€ã«ã®å Žåãcssã«ãã¬ããžã«ãŒã«ã«åŸã£ãŠãã¹ã¿ã€ã«ã«ãã¬ããžã䜿çšããæ¹ããã¹ã¿ã€ã«ãçŽæ¥å€æŽãããããéœæ°ã§ããããšãã°ãããŒãã®ã«ãŒãœã«ã¯ãã¹ã¿ã€ã«ã«ãã¬ããžã®ã¢ã€ãã¢ã§ãã
åäžã®ãã¡ã€ã«ã®å±¥æŽã衚瀺ããŠãå人çãªå€æŽãæ¯èŒããã³ãŒãã®æ倱ãæ倧éã«åé¿ã§ããŸãã諺ã«ãããããã«ãç·Žç¿ã¯å®ç§ã§ãããŒãã®æŽæ°ã¯ãæäœãéããŠãé¢åã§ã¯ãªããªããŸããæåŸã«ãããã°ãäœæãããšããåœåã®æå³ã«æ»ã£ãŠãè±â ã° ïŒãâïŒï¿£âœï¿£ïŒ/ $ : .°â ã
æŽå²èšé²
å³è§£ãšè©³çŽ°ã
æ¬åœã«è¯ããããŒã¯
giteeã®ããŒããå€æŽããã«ã¯ïŒ
æãåèã«ãªãã³ã¡ã³ã
ããŒããæ£ããæŽæ°ããæ¹æ³ïŒãã©ãŒã¯ïŒ
ãã®èšäºã¯ãGitKrakenãœãããŠã§ã¢ã®äœ¿çšã«åºã¥ããŠããŸããé¢é£ãªã³ã¯ïŒ GitKrakenïŒç¡æã®Git GUIã¯ã©ã€ã¢ã³ã-WindowsãMacãLinux
ããŒãã®ã¯ããŒã³ãäœæããããŒãã®èšäºã®ãµãã¢ãžã¥ãŒã«ã®èšå®ã«åŸã£ãŠããã°ãªããžããªã«è¿œå ããå Žåã¯ããã®èšäºãéåžžã«åœ¹ç«ã¡ãŸãããŸã è¡ã£ãŠããªãå Žåã¯ãè©ŠããŠã¿ãŠãã ããããã®èšäºã®ãŠã§ã¢ããŠã¹ç°å¢ã¯æ¬¡ã®ãšããã§ããããã°ãŠã§ã¢ããŠã¹Hexo-Blog ãããŒããŠã§ã¢ããŠã¹volantis ã
1.GitKrakenã®ç°¡åãªæäœ
GitKrakenã®ãœãããŠã§ã¢ã€ã³ã¿ãŒãã§ã€ã¹ã§ã¯ãäžå€®ã«æ倧ã®é åãããé åã¯ãå庫ã®å±¥æŽéä¿¡æ å ±ãå³åŽã®éžæãããéä¿¡ã¬ã³ãŒãã®è©³çŽ°ãããã³å·ŠåŽã®ããã€ãã®å庫é¢é£æ å ±ã§ããããµãã¢ãžã¥ãŒã«ã«çŠç¹ãåœãŠãŠããŸããå·ŠåŽã®ãªãã·ã§ã³ããŒãéåžžããã©ãŒã¯ã®ããŒããªããžããªãããã°ãªããžããªã«è¿œå ããŠããå Žåã¯ãããã§ç¢ºèªã§ããŸãã [ãµãã¢ãžã¥ãŒã«]ã¿ããå±éããå³ã¯ãªãã¯ããŠ[ãã®ãµãã¢ãžã¥ãŒã«ãéã]ãéžæããŠããµãã¢ãžã¥ãŒã«ãéããŸãã
ããã°ãªããžããª
ãµãã¢ãžã¥ãŒã«ãéã
ãã®ããã«å ¥åããããªããžããªã¯ããŒããªããžããªã§ãããçŸåšã®ããŒãžã§ãã¹ãŠã®éä¿¡ã®å±¥æŽãªã©ã衚瀺ã§ããŸããäžéšã®åè«ã®ååã«ãã£ãŠåŒãèµ·ããããæªåœ±é¿ãåé¿ããããã«ãèšå®ã¯æ¬¡ã®ãšããã§ããForkãªããžããªã¯themeãªããžããªãšåŒã°ããhexo-theme-volantisãªããžããªã¯volantisãªããžããªãšåŒã°ããŸãã
ããŒããªããžããª
ãã®å³ã§ã¯ãçŸåšã®ãã©ãŒã¯ã®ããŒããªããžããªãé 眮ãããŠãããã©ã³ããmaster-themeã§ãããããŒãœãã«ããŒããªããžããªã®æåŸã®ã³ãããæ å ±ãå³ã®å³åŽã«è¡šç€ºãããŠããŸããäžå€®ã®é åã®äžéšã¯ããã¹ã¿ãŒã§ããŒã¯ãããvolantisãªããžããªã®ãã©ã³ãã§ãïŒå³åŽã®ããŽç»åã§åºå¥ã§ããŸãïŒãæããã«ãçŸåšã®ããŒããªããžããªã¯Volantisãªããžããªã«é ãããšã£ãŠããŸãã次ã«ãã³ãŒããç¬èªã®ããŒããªããžããªã«ããŒãžããå¿ èŠããããŸããéããåŸãã€ã³ã¿ãŒãã§ã€ã¹ã«VolantisãŠã§ã¢ããŠã¹æ å ±ã衚瀺ãããªãå Žåã¯ãVolantisãŠã§ã¢ããŠã¹ãçŸåšãªã¢ãŒããšããŠè¿œå ãããŠããªãããšãæå³ããŸãã次ã®ããã«è¿œå ã§ããŸãã
Volantisãªã¢ãŒããªããžããªæ å ±ãè¿œå ãã
å·ŠåŽã®ããã«ã®[ãªã¢ãŒã]ã¿ãã§ããã©ã¹èšå·ãã¯ãªãã¯ããŠæ¬¡ã®å³ã«ç€ºãã€ã³ã¿ãŒãã§ã€ã¹ã«å ¥ãã volantis-x / hexo-theme-volantisãéžæããŠè¿œå ããŸãã
第äºã«ãGitKrakenã®ããŒãžæäœ
1.ããŒãž
volantisãªããžããªã®masterãã©ã³ããå³ã¯ãªãã¯ãã[ volantis / masterãxxxxã«ããŒãž]ãéžæããŠããŒãžããŸãã Rebaseãéžæããªãçç±ã«ã€ããŠã¯ãå人çã«ã¯ãå±¥æŽãå€æŽãããããããªããžããªã®ã³ãããå±¥æŽãä¿æããæ¹ãè¯ããšæããŸããéåžžãããŒãžæäœã¯èªåçã«å®äºããŸããã競åãããå Žåã¯ã次ã®ãªãã€ã³ããŒã衚瀺ãããŸãïŒããŒãžã«å€±æããŸããã解決ããå¿ èŠã®ããããŒãžã®ç«¶åããããŸããåè¿°ã®ããã«ã解決ããå¿ èŠã®ãã競åããããŸããå³åŽã®ã¿ãã«ã¯ã[ããŒãž]ã衚瀺ãããŸãã[競åãæ€åºãããŸãã]ãŠã£ã³ããŠã«ã¯ã解決ããããã¡ã€ã«ãšç«¶åãããã¡ã€ã«ã衚瀺ãããŸãã
ãŠã£ã³ããŠãã¯ãªãã¯ããŠç«¶åã解決ããŸãããã®ããŒãžã§ã¯ãäžéšãããŒã«ã«ã³ãŒããšãªã¢ãŒãã³ãŒãã§ãäžéšãããŒãžãããã³ã³ãã³ãã§ããå€æŽå±¥æŽã®åŒã³åºããªã©ãå®éã®ç¶æ³ã«å¿ããŠãå·ŠåŽã®ããŒã«ã«ãå³åŽã®ãªã¢ãŒãããŸãã¯ãã®äž¡æ¹ãéžæã§ããŸããéžæããçµæã«æºè¶³ã§ããªãå Žåã¯ãã³ã³ãã³ããæåã§å€æŽããããšãã§ããŸããçµäºãããã[ä¿å]ãã¯ãªãã¯ããŠæäœãçµäºããŸãã ïŒååãšããŠãåºåã®å 容ãçŽæ¥å€æŽããã®ã§ã¯ãªãããã®ãã¡ã®1ã€ãéžæããå¿ èŠããããŸãïŒ
å Žåã«ãã£ãŠã¯ããªã¢ãŒããšã³ãã«ãã£ãŠåé€ããããã¡ã€ã«ãçºçãã次ã®ããã³ããã衚瀺ãããããšããããŸããGitKrakenã¯ãsource / css / _plugins / gitalkstylãä¿æãããã©ãããå€æã§ããŸããã§ãããä¿æããŸããïŒ GitKrakenã¯ç©æ¥µçã«ãã¡ã€ã«ãåé€ããŸããããã¡ã€ã«ããã ããäžè¬çã«ã¯ããã¡ã€ã«ãåé€ããã ãã§ãä¿æããå¿ èŠã¯ãããŸããã
æåŸã«ã競åãããã¹ãŠã®ãã¡ã€ã«ã解決ããåŸããªããžããªãªã¹ãã€ã³ã¿ãŒãã§ã€ã¹ã«æ»ãã[ã³ãããããŠããŒãž]ãã¯ãªãã¯ããŠéä¿¡ãå®äºããŸãã
A.ããŒãžæäœ
B.ããŒãžç«¶åã®æ€åº
C.é©åãªã³ã³ãã³ããéžæãã
D.æåºç©
2.ãªããŒã¹
ã€ãŸããRebaseã¯ãã¹ãŠã®å€æŽïŒã³ãããïŒããããªãã¯ãã©ã³ãã®æåŸã«æ»ããŸãããã®çµæã匷å¶ã³ãããã«çŽé¢ããããšãå€ããããŒãžæäœã§ã®äœ¿çšã«ã¯é©ããŠããŸããã以äžããæç²ããŸããRebase-LiaoXuefengã®å ¬åŒãŠã§ããµã€ã
çŽäºã®çºçãšåé¿
競åã¯éåžžãåãå Žæãå¥ã®äººã«ãã£ãŠå€æŽãããå Žåã«çºçããGitã¯ãããèªåçã«åŠçã§ããããŠãŒã¶ãŒã解決ããããã®ãšã©ãŒãã¹ããŒããŸããããŒãã¯ãŸã ææ¥æã®æ®µéã§ãããããæŽæ°ã®å埩é床ã¯æ¯èŒçéãã競åçŸè±¡ã¯ããæçœã«ãªãå¯èœæ§ããããŸãããã®ãããªç¶æ³ãæžããããã®ããã€ãã®ã¢ã€ãã¢ã次ã«ç€ºããŸãã
1. 1ã€ç®ã¯æ§æãã¡ã€ã«ã§ããHexoã®ã«ãŒã«ã«åŸã£ãŠãæ§æãžã®ãã¹ãŠã®å€æŽã¯åå¥ã«è¡ãããšãã§ããŸããããŒããªããžããªã®äžã®
config.yml
ãçŽæ¥å€æŽããå¿ èŠã¯ãããŸãããããã§åç §ã§ããŸããæ§æã¯ã©ã¹ãã¡ã€ã«ã¯ã競åããå¯èœæ§ãæãäœãå Žæã§ãã2.ã¹ã¿ã€ã«ãã¡ã€ã«ã®å Žåãcssã«ãã¬ããžã«ãŒã«ã«åŸã£ãŠãã¹ã¿ã€ã«ã«ãã¬ããžã䜿çšããæ¹ããã¹ã¿ã€ã«ãçŽæ¥å€æŽãããããéœæ°ã§ããããšãã°ãããŒãã®ã«ãŒãœã«ã¯ãã¹ã¿ã€ã«ã«ãã¬ããžã®ã¢ã€ãã¢ã§ãã
第åã«ãã³ãŒãå±¥æŽã®ç¶æ
åäžã®ãã¡ã€ã«ã®å±¥æŽã衚瀺ããŠãå人çãªå€æŽãæ¯èŒããã³ãŒãã®æ倱ãæ倧éã«åé¿ã§ããŸãã諺ã«ãããããã«ãç·Žç¿ã¯å®ç§ã§ãããŒãã®æŽæ°ã¯ãæäœãéããŠãé¢åã§ã¯ãªããªããŸããæåŸã«ãããã°ãäœæãããšããåœåã®æå³ã«æ»ã£ãŠãè±â ã° ïŒãâïŒï¿£âœï¿£ïŒ/ $ : .°â ã
æŽå²èšé²