From 1b6821c001563f035712a836791ef115f73dc533 Mon Sep 17 00:00:00 2001 From: Milton Choo Date: Wed, 13 May 2020 12:18:49 +0800 Subject: [PATCH] v00.1 first production draft --- _layouts/default.html | 1 - _layouts/home.html | 4 ++-- .../2020-05-01-bitbuckit-and-gitlab-users.md | 6 +++++- ...dation-for-markdown-documentation-format.md | 18 ++++++++++++++++++ _sass/main.scss | 13 ------------- _sass/myapp.scss | 12 +++++++++--- about.md | 8 +++----- assets/css/style.scss | 2 +- home.md | 2 +- index.html | 4 ---- index.md | 6 ++++++ 11 files changed, 45 insertions(+), 31 deletions(-) create mode 100644 _posts/2020-05-02-recommendation-for-markdown-documentation-format.md delete mode 100644 _sass/main.scss delete mode 100644 index.html create mode 100644 index.md diff --git a/_layouts/default.html b/_layouts/default.html index 45ab2f3..385f100 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,6 @@ {%- include head.html -%} {%- include nav.html -%} -
This site is still under constructions
{{ content }} diff --git a/_layouts/home.html b/_layouts/home.html index da4000a..93448de 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -4,8 +4,8 @@ {%- include nav.html -%} -
-
+
+
{{ content }}
diff --git a/_posts/2020-05-01-bitbuckit-and-gitlab-users.md b/_posts/2020-05-01-bitbuckit-and-gitlab-users.md index 031a529..28d42d6 100644 --- a/_posts/2020-05-01-bitbuckit-and-gitlab-users.md +++ b/_posts/2020-05-01-bitbuckit-and-gitlab-users.md @@ -1,5 +1,6 @@ --- title: bitbucket/gitlab users +author: milton choo --- upload to ntu-rris from bitbucket/gitlab @@ -8,7 +9,8 @@ please ensure the following: * your github account has 2FA with NTU's enterprise authentication server * your new repository is created on ntu-rris central repository -* Add RRIS's github URL as a "SSH" connection to ntu-rris's with name as "rris" +* optional but highly recommended that you get Single-Sign-On (SSO) to work with github +* on your local git repository, add RRIS's github URL as a "SSH" connection to ntu-rris's with name as "rris", assuming the origin name was taken for bitbucket or gitlab. {% highlight ruby %} $ git remote add rris ssh://git@github.com/ntu-rris/yournewrepositoryname.git {% endhighlight %} @@ -16,3 +18,5 @@ please ensure the following: {% highlight ruby %} $ git push rris master {% endhighlight %} + +it is also recommended that you update the central repository at least weekly for all your active projects diff --git a/_posts/2020-05-02-recommendation-for-markdown-documentation-format.md b/_posts/2020-05-02-recommendation-for-markdown-documentation-format.md new file mode 100644 index 0000000..ac13245 --- /dev/null +++ b/_posts/2020-05-02-recommendation-for-markdown-documentation-format.md @@ -0,0 +1,18 @@ +--- +author: milton choo +--- +this is just a recommendation for markdown, please use whatever format you +like, as the crucial factor is any documentation is better than none at all + +however, there are several advantages for using *markdown* +* supported by Github and Bitbucket +* supported in most of the languages you will write in +* you can write it immediately in your code editor +* there are serveral nice tools to convert markdown to any format you like +* its easier than reST(i know most of you love python) but i digress + + + + + + diff --git a/_sass/main.scss b/_sass/main.scss deleted file mode 100644 index 0d6f3b2..0000000 --- a/_sass/main.scss +++ /dev/null @@ -1,13 +0,0 @@ -body { - padding-top: 0px; - margin-top: 0px; -} - -main { - margin-top: 58px; -} - -.navbar { - padding-bottom: 0px; - margin-bottom: 0px !important; -} diff --git a/_sass/myapp.scss b/_sass/myapp.scss index 69f27e8..fb46711 100644 --- a/_sass/myapp.scss +++ b/_sass/myapp.scss @@ -1,7 +1,13 @@ -// warning: no frontmatter in _sass/files body { padding-top: 0px; + margin-top: 0px; } -.current { - color: green; + +main { + margin-top: 5px; +} + +.navbar { + padding-bottom: 0px; + margin-bottom: 0px !important; } diff --git a/about.md b/about.md index a1a5c82..45196c3 100644 --- a/about.md +++ b/about.md @@ -12,8 +12,6 @@ on Github. We expect all active projects to make at least a weekly update of their software repository on Github. -[Link to a document]({% link collections/name-of-document.md %}) - -[Link to a post]({% link _posts/2020-05-01-bitbuckit-and-gitlab-users.md %}) - -[Link to a page]({% link news/index.md %}) +[Bitbucket/Gitlab users]({% link _posts/2020-05-01-bitbuckit-and-gitlab-users.md %})
+[Recommendation of markdown for documentation]({% link _posts/2020-05-02-recommendation-for-markdown-documentation-format.md%})
+[What's new]({% link news/index.md %}) diff --git a/assets/css/style.scss b/assets/css/style.scss index 6bb7dd2..f55cbf2 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -1,4 +1,4 @@ --- --- -@import "main"; //import from _sass +@import "myapp"; //import from _sass @import "native.css"; diff --git a/home.md b/home.md index b12d9e7..c13ba4f 100644 --- a/home.md +++ b/home.md @@ -3,7 +3,7 @@ layout: default title: RRIS home --- {% for r in site.data.myrepos %} -[{{ r.name }}]({{r.html_url|absolute_url}}) +[{{r.name}}]({{r.html_url|absolute_url}})
**{{ r.description| default: "No Description" }}**
contributors: {% for j in r.contrib %} [{{j.login}}]({{j.html_url|absolute_url}}) {% endfor %} {% endfor %} diff --git a/index.html b/index.html deleted file mode 100644 index c905c4f..0000000 --- a/index.html +++ /dev/null @@ -1,4 +0,0 @@ ---- -layout: home -title: RRIS ---- diff --git a/index.md b/index.md new file mode 100644 index 0000000..ae764cf --- /dev/null +++ b/index.md @@ -0,0 +1,6 @@ +--- +layout: home +title: RRIS +--- +please visit our official website +[Rehabilitation Research Institute of Singapore](http://rris.ntu.edu.sg)