diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| m--------- | libweb | 0 | ||||
| m--------- | simple.css | 0 | ||||
| l--------- | static/libweb.css | 1 | ||||
| l--------- | static/style.css | 1 | ||||
| l--------- | style.css | 1 | ||||
| -rw-r--r-- | themes/bare/layouts/git/list.html | 32 | ||||
| -rw-r--r-- | themes/bare/layouts/git/single.html | 30 | ||||
| -rw-r--r-- | themes/bare/layouts/index.html | 36 |
9 files changed, 54 insertions, 53 deletions
diff --git a/.gitmodules b/.gitmodules index 774fbe7..a3875af 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "libweb"] - path = libweb - url = https://cgit.xengineering.eu/libweb/ +[submodule "simple.css"] + path = simple.css + url = https://github.com/kevquirk/simple.css.git diff --git a/libweb b/libweb deleted file mode 160000 -Subproject a80f90ecb8c80db6be077abaef2ed0ce289a4a2 diff --git a/simple.css b/simple.css new file mode 160000 +Subproject 43a7f939f26b201a3413bcb7d7667a970d369e3 diff --git a/static/libweb.css b/static/libweb.css deleted file mode 120000 index 9dd798c..0000000 --- a/static/libweb.css +++ /dev/null @@ -1 +0,0 @@ -../libweb/libweb.css
\ No newline at end of file diff --git a/static/style.css b/static/style.css new file mode 120000 index 0000000..5191bf7 --- /dev/null +++ b/static/style.css @@ -0,0 +1 @@ +../style.css
\ No newline at end of file diff --git a/style.css b/style.css new file mode 120000 index 0000000..9a2d3cd --- /dev/null +++ b/style.css @@ -0,0 +1 @@ +simple.css/simple.min.css
\ No newline at end of file diff --git a/themes/bare/layouts/git/list.html b/themes/bare/layouts/git/list.html index f4cd50e..b8dc147 100644 --- a/themes/bare/layouts/git/list.html +++ b/themes/bare/layouts/git/list.html @@ -12,40 +12,36 @@ <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" href="{{ "libweb.css" | absURL }}" type="text/css"> + <link rel="stylesheet" href="{{ "style.css" | absURL }}" type="text/css"> </head> <body> - <main> - - <h2>Git repositories</h2> - <p>This page shows all of my Git repositories. They are ordered by - their state attribute, which is defined in each section.</p> + <header> + <h1>Git repositories</h1> + </header> - <h4>Active</h4> - <p>The content of active repositories can be used right now.</p> + <main> + <strong>Experimental</strong> <ul> {{- range.Pages }} - {{ if eq .Params.state "active" }} + {{ if eq .Params.state "experimental" }} <li><a href="{{ .RelPermalink }}">{{ .Params.friendly_name }}</a> - {{.Description}}</li> {{ end }} {{ end -}} </ul> - <h4>Experimental</h4> - <p>Experimental repositories are not ready to be used but maybe interesting enough to have a look at it.</p> + <strong>Active</strong> <ul> {{- range.Pages }} - {{ if eq .Params.state "experimental" }} + {{ if eq .Params.state "active" }} <li><a href="{{ .RelPermalink }}">{{ .Params.friendly_name }}</a> - {{.Description}}</li> {{ end }} {{ end -}} </ul> - <h4>Archived</h4> - <p>Archived repositories will not be improved in the future unless the state will change.</p> + <strong>Archived</strong> <ul> {{- range.Pages }} {{ if eq .Params.state "archived" }} @@ -54,10 +50,10 @@ {{ end -}} </ul> - <br> - <hr> - <footer>License: <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a></footer> - + <footer> + <hr> + <p>This <a href="{{ "git/website" | absURL }}">website</a> is licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a> and developed with <a href="https://simplecss.org/">simple.css</a>.</p> + </footer> </main> </body> diff --git a/themes/bare/layouts/git/single.html b/themes/bare/layouts/git/single.html index 3732715..092df5a 100644 --- a/themes/bare/layouts/git/single.html +++ b/themes/bare/layouts/git/single.html @@ -12,30 +12,32 @@ <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" href="{{ "libweb.css" | absURL }}" type="text/css"> + <link rel="stylesheet" href="{{ "style.css" | absURL }}" type="text/css"> </head> <body> - <main> - + <header> + <nav> + <a href="https://cgit.xengineering.eu/{{ .Params.name }}">cgit</a> + <a href="https://cgit.xengineering.eu/{{ .Params.name }}/atom">Atom feed</a> + <a href="https://cgit.xengineering.eu/{{ .Params.name }}">Clone URL</a> + <nav> <h1>{{.Params.friendly_name}}</h1> + <p>{{ .Params.description }}</p> + </header> - <div class="card"> - <p class="card-first-item">{{ .Params.description }}</p> - <p>State: {{ .Params.state }}</p> - <p>Source code: <a href="https://cgit.xengineering.eu/{{ .Params.name }}">cgit</a></p> - <p>Get updates: <a href="https://cgit.xengineering.eu/{{ .Params.name }}/atom">Atom feed</a></p> - <p style="" class="card-last-item">Clone repository: git clone https://cgit.xengineering.eu/{{ .Params.name }}</p> - </div> + <main> - {{.Content}} + <p class="notice">State: <strong>{{ .Params.state }}</strong></p> - <br> - <hr> - <footer>License: <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a></footer> + {{.Content}} + <footer> + <hr> + <p>This <a href="{{ "git/website" | absURL }}">website</a> is licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a> and developed with <a href="https://simplecss.org/">simple.css</a>.</p> + </footer> </main> </body> diff --git a/themes/bare/layouts/index.html b/themes/bare/layouts/index.html index adc500d..9539278 100644 --- a/themes/bare/layouts/index.html +++ b/themes/bare/layouts/index.html @@ -12,30 +12,32 @@ <meta charset="utf-8"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link rel="stylesheet" href="{{ "libweb.css" | absURL }}" type="text/css"> + <link rel="stylesheet" href="{{ "style.css" | absURL }}" type="text/css"> </head> <body> - <main> - + <header> <h1>{{.Params.heading}}</h1> + <p>Free and Open Source software and hardware projects</p> + </header> - <div class="card"> - <h3 class="card-first-item">Contact</h3> - <p>Mail: {{.Params.email}}</p> - <p>XMPP: {{.Params.xmpp}}</p> - <p class="card-last-item">OpenPGP: <a href="{{.Params.openpgp.file}}">{{.Params.openpgp.fingerprint}}</a></p> - </div> + <main> + <h3>Contact</h3> + <ul> + <li>Mail: {{.Params.email}}</li> + <li>XMPP: {{.Params.xmpp}}</li> + <li>OpenPGP: <a href="{{.Params.openpgp.file}}">{{.Params.openpgp.fingerprint}}</a></li> + </ul> {{.Content}} - <h2>My projects</h2> + <h3>My projects</h3> <p>Here is a list of all my published projects. The active ones are regularly used by myself.</p> - <h4>Experimental</h4> + <strong>Experimental</strong> <ul> {{ range.Site.RegularPages }} {{ if eq .Section "git" }} @@ -46,7 +48,7 @@ {{ end }} </ul> - <h4>Active</h4> + <strong>Active</strong> <ul> {{ range.Site.RegularPages }} {{ if eq .Section "git" }} @@ -57,7 +59,7 @@ {{ end }} </ul> - <h4>Archived</h4> + <strong>Archived</strong> <ul> {{ range.Site.RegularPages }} {{ if eq .Section "git" }} @@ -68,10 +70,10 @@ {{ end }} </ul> - <br> - <hr> - <footer>License: <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a></footer> - + <footer> + <hr> + <p>This <a href="{{ "git/website" | absURL }}">website</a> is licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA</a> and developed with <a href="https://simplecss.org/">simple.css</a>.</p> + </footer> </main> </body> |