From f81b1c879906e00173ce414cb2800d4b2c5ad176 Mon Sep 17 00:00:00 2001 From: tyage Date: Tue, 29 Aug 2017 17:24:55 +0900 Subject: [PATCH 1/6] new header nav --- _layouts/default.html | 14 +++++----- stylesheets/common.less | 56 +++++++++++++++++++++++++++++-------- stylesheets/common.less.css | 2 +- 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 9f02369..7fc1547 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -17,15 +17,15 @@ @@ -39,4 +39,4 @@

Published with GitHub Pages

- \ No newline at end of file + diff --git a/stylesheets/common.less b/stylesheets/common.less index eb08c32..972ff48 100644 --- a/stylesheets/common.less +++ b/stylesheets/common.less @@ -11,12 +11,9 @@ } html { - background-image: url("/images/background.png"); } body { - width: 1000px; - margin: 0 auto; background: white; color: #333; } @@ -35,28 +32,63 @@ td, th { padding: 5px 10px; } +.header-nav-color(@color) { + border-color: @color; + &:hover { + background: @color; + } +} #header { - .clearfix(); + text-align: center; + border-bottom: 1px solid #ddd; #header-title { - float: left; - margin: 0; - width: 404px; + display: inline-block; + margin: 0 20px 0 0; + font-size: 18px; } #header-nav { - float: right; - + display: inline-block; + font-size: 0; + vertical-align: top; ul { - .clearfix; margin: 0; padding: 0; list-style-type: none; li { - float: left; - padding: 0; + display: inline-block; + a { + font-size: 13px; + font-weight: bold; + display: inline-block; + padding: 20px 5px 15px 5px; + border-bottom-width: 5px; + border-bottom-style: solid; + min-width: 100px; + color: black; + &:hover { + text-decoration: none; + color: white; + } + } } } + .header-nav-home { + .header-nav-color(#DC4480); + } + .header-nav-about { + .header-nav-color(#FF8500); + } + .header-nav-members { + .header-nav-color(#9ADA00); + } + .header-nav-outline { + .header-nav-color(#00BDED); + } + .header-nav-activity { + .header-nav-color(#1A477C); + } } } diff --git a/stylesheets/common.less.css b/stylesheets/common.less.css index 63b46f9..e3f270f 100644 --- a/stylesheets/common.less.css +++ b/stylesheets/common.less.css @@ -1 +1 @@ -#top-content{margin:0 0 0 -40px}#about{text-align:center;margin:20px 0}.top-section{margin:40px 0 30px 0}.top-section .section-title{height:37px;width:950px;font-size:18px;font-weight:700;padding:7px 0 0 50px;margin:10px 0;background-repeat:no-repeat}.top-section .section-content{padding:5px 0 0 60px;margin:0}#event-section .section-title{background-image:url(/images/bar-3.png)}#event-section li{font-size:14px;margin:5px 0 5px 30px}#news-section .section-title{background-image:url(/images/bar-1.png)}#news-section .posts{padding:0 0 0 40px}#link-section .section-title{background-image:url(/images/bar-2.png)}#link-section #links li{font-size:14px;margin:5px 0 5px 30px}#facebook-section .section-title{background-image:url(/images/bar-3.png)}#facebook-section .section-content{margin:0 0 0 30px}html{background-image:url(/images/background.png)}body{width:1000px;margin:0 auto;background:#fff;color:#333}a{color:#4183c4;text-decoration:none}a:hover{text-decoration:underline}td,th{border:1px solid #666;padding:5px 10px}#header{zoom:1}#header:after{content:"";display:block;clear:both}#header #header-title{float:left;margin:0;width:404px}#header #header-nav{float:right}#header #header-nav ul{zoom:1;margin:0;padding:0;list-style-type:none}#header #header-nav ul:after{content:"";display:block;clear:both}#header #header-nav ul li{float:left;padding:0}#content{padding:20px 40px}#footer{background-color:#9F9F9F;padding:20px 30px;font-size:14px}#footer p{margin:5px 0}.page-header{position:relative;margin:20px 0 40px 0}.page-header h2{width:750px;margin:0}.page-header time{position:absolute;bottom:0;right:0}.page-body img{max-width:100%}.page-body .gallery img{height:150px;width:auto}.posts{padding:0}.posts .post{zoom:1;list-style-type:none;margin:10px 0}.posts .post:after{content:"";display:block;clear:both}.posts .post .post-category{float:left;width:100px;height:30px;margin:0}.posts .post .post-info{float:left;width:760px;margin:5px 0 0 10px;font-size:14px}.posts .post .post-info a{padding:0 5px 0 0} \ No newline at end of file +#top-content{margin:0 0 0 -40px}#about{text-align:center;margin:20px 0}.top-section{margin:40px 0 30px 0}.top-section .section-title{height:37px;width:950px;font-size:18px;font-weight:700;padding:7px 0 0 50px;margin:10px 0;background-repeat:no-repeat}.top-section .section-content{padding:5px 0 0 60px;margin:0}#event-section .section-title{background-image:url(/images/bar-3.png)}#event-section li{font-size:14px;margin:5px 0 5px 30px}#news-section .section-title{background-image:url(/images/bar-1.png)}#news-section .posts{padding:0 0 0 40px}#link-section .section-title{background-image:url(/images/bar-2.png)}#link-section #links li{font-size:14px;margin:5px 0 5px 30px}#facebook-section .section-title{background-image:url(/images/bar-3.png)}#facebook-section .section-content{margin:0 0 0 30px}body{background:#fff;color:#333}a{color:#4183c4;text-decoration:none}a:hover{text-decoration:underline}td,th{border:1px solid #666;padding:5px 10px}#header{text-align:center;border-bottom:1px solid #ddd}#header #header-title{display:inline-block;margin:0 20px 0 0;font-size:18px}#header #header-nav{display:inline-block;font-size:0;vertical-align:top}#header #header-nav ul{margin:0;padding:0;list-style-type:none}#header #header-nav ul li{display:inline-block}#header #header-nav ul li a{font-size:13px;font-weight:700;display:inline-block;padding:20px 5px 15px 5px;border-bottom-width:5px;border-bottom-style:solid;min-width:100px;color:#000}#header #header-nav ul li a:hover{text-decoration:none;color:#fff}#header #header-nav .header-nav-home{border-color:#dc4480}#header #header-nav .header-nav-home:hover{background:#dc4480}#header #header-nav .header-nav-about{border-color:#ff8500}#header #header-nav .header-nav-about:hover{background:#ff8500}#header #header-nav .header-nav-members{border-color:#9ada00}#header #header-nav .header-nav-members:hover{background:#9ada00}#header #header-nav .header-nav-outline{border-color:#00bded}#header #header-nav .header-nav-outline:hover{background:#00bded}#header #header-nav .header-nav-activity{border-color:#1a477c}#header #header-nav .header-nav-activity:hover{background:#1a477c}#content{padding:20px 40px}#footer{background-color:#9F9F9F;padding:20px 30px;font-size:14px}#footer p{margin:5px 0}.page-header{position:relative;margin:20px 0 40px 0}.page-header h2{width:750px;margin:0}.page-header time{position:absolute;bottom:0;right:0}.page-body img{max-width:100%}.page-body .gallery img{height:150px;width:auto}.posts{padding:0}.posts .post{zoom:1;list-style-type:none;margin:10px 0}.posts .post:after{content:"";display:block;clear:both}.posts .post .post-category{float:left;width:100px;height:30px;margin:0}.posts .post .post-info{float:left;width:760px;margin:5px 0 0 10px;font-size:14px}.posts .post .post-info a{padding:0 5px 0 0} \ No newline at end of file From 8803b12dad53c0e3fb821f45f2a16893b8a4ede9 Mon Sep 17 00:00:00 2001 From: tyage Date: Tue, 29 Aug 2017 17:25:20 +0900 Subject: [PATCH 2/6] add package-lock.json --- package-lock.json | 315 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..77b215a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,315 @@ +{ + "name": "kyokuri.org", + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true, + "optional": true + }, + "asn1": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz", + "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=", + "dev": true, + "optional": true + }, + "assert-plus": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz", + "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=", + "dev": true, + "optional": true + }, + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true, + "optional": true + }, + "aws-sign2": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz", + "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=", + "dev": true, + "optional": true + }, + "boom": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz", + "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=", + "dev": true, + "requires": { + "hoek": "0.9.1" + } + }, + "clean-css": { + "version": "2.2.23", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-2.2.23.tgz", + "integrity": "sha1-BZC1R4tRbEkD7cLYm9P9vdKGMow=", + "dev": true, + "optional": true, + "requires": { + "commander": "2.2.0" + } + }, + "combined-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz", + "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=", + "dev": true, + "optional": true, + "requires": { + "delayed-stream": "0.0.5" + } + }, + "commander": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.2.0.tgz", + "integrity": "sha1-F1rUuTF/P/YV8gHB5XIk9Vo+kd8=", + "dev": true, + "optional": true + }, + "cryptiles": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz", + "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=", + "dev": true, + "optional": true, + "requires": { + "boom": "0.4.2" + } + }, + "ctype": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz", + "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=", + "dev": true, + "optional": true + }, + "delayed-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz", + "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=", + "dev": true, + "optional": true + }, + "forever-agent": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz", + "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=", + "dev": true, + "optional": true + }, + "form-data": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz", + "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=", + "dev": true, + "optional": true, + "requires": { + "async": "0.9.2", + "combined-stream": "0.0.7", + "mime": "1.2.11" + } + }, + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "dev": true, + "optional": true, + "requires": { + "natives": "1.1.0" + } + }, + "hawk": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz", + "integrity": "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=", + "dev": true, + "optional": true, + "requires": { + "boom": "0.4.2", + "cryptiles": "0.2.2", + "hoek": "0.9.1", + "sntp": "0.2.4" + } + }, + "hoek": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz", + "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=", + "dev": true + }, + "http-signature": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz", + "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=", + "dev": true, + "optional": true, + "requires": { + "asn1": "0.1.11", + "assert-plus": "0.1.5", + "ctype": "0.5.3" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true, + "optional": true + }, + "less": { + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/less/-/less-1.7.5.tgz", + "integrity": "sha1-TyIM9yiKJ+rKc5325ICKLUwNV1Y=", + "dev": true, + "requires": { + "clean-css": "2.2.23", + "graceful-fs": "3.0.11", + "mime": "1.2.11", + "mkdirp": "0.5.1", + "request": "2.40.0", + "source-map": "0.1.43" + } + }, + "mime": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz", + "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=", + "dev": true, + "optional": true + }, + "mime-types": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz", + "integrity": "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4=", + "dev": true, + "optional": true + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true, + "optional": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "optional": true, + "requires": { + "minimist": "0.0.8" + } + }, + "natives": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.0.tgz", + "integrity": "sha1-6f+EFBimsux6SV6TmYT3jxY+bjE=", + "dev": true, + "optional": true + }, + "node-uuid": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz", + "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=", + "dev": true, + "optional": true + }, + "oauth-sign": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz", + "integrity": "sha1-y1QPk7srIqfVlBaRoojWDo6pOG4=", + "dev": true, + "optional": true + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true, + "optional": true + }, + "qs": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz", + "integrity": "sha1-UKk+K1r2aRwxvOpdrnjubqGQN2g=", + "dev": true, + "optional": true + }, + "request": { + "version": "2.40.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz", + "integrity": "sha1-TdZw9pbx5uhC5mtLXoOTAaub62c=", + "dev": true, + "optional": true, + "requires": { + "aws-sign2": "0.5.0", + "forever-agent": "0.5.2", + "form-data": "0.1.4", + "hawk": "1.1.1", + "http-signature": "0.10.1", + "json-stringify-safe": "5.0.1", + "mime-types": "1.0.2", + "node-uuid": "1.4.8", + "oauth-sign": "0.3.0", + "qs": "1.0.2", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.4.3" + } + }, + "sntp": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz", + "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=", + "dev": true, + "optional": true, + "requires": { + "hoek": "0.9.1" + } + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", + "dev": true, + "optional": true + }, + "tough-cookie": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "dev": true, + "optional": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true, + "optional": true + } + } +} From ddbef9e23167db49a564d71a0a18fe91c1716931 Mon Sep 17 00:00:00 2001 From: tyage Date: Wed, 13 Sep 2017 14:21:06 +0900 Subject: [PATCH 3/6] add logo image --- _layouts/default.html | 5 ++++- images/kyokuri.png | Bin 0 -> 120438 bytes stylesheets/common.less | 21 +++++++++++++++++++-- stylesheets/common.less.css | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 images/kyokuri.png diff --git a/_layouts/default.html b/_layouts/default.html index 7fc1547..90fa4fb 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -17,7 +17,10 @@