on master help sign in
Merge branch 'master' into master
commitd27704b24a00dbe17710a20e6edff51664eb4681 authorЛu Лinveгa <aliceffekt@gmail.com> dateFri 6 Jul 2018, 09:03 (8 years ago) parent098c6f7fe2995f
8 files changed+40−13
README.md+4−4 index.html+1 links/fonts.css+22 links/main.css+12−8 media/fonts/input_mono_medium.ttf media/fonts/input_mono_regular.ttf media/fonts/input_mono_thin.ttf scripts/portal.js+1−1
README.md+4−4
@@ -1,11 +1,11 @@
11# Webring
22
3−This [webring](http://wiki.xxiivv.com/webring) is an attempt to inspire artists & developers to create and maintain their own website and share traffic among each other. The webring's aim is to share personal websites such as *diaries, wikis & portfolios*. To add yourself to the ring, submit an [edit](https://github.com/XXIIVV/webring/edit/master/index.html) to this repository.
3+This [webring](https://wiki.xxiivv.com/webring) is an attempt to inspire artists & developers to create and maintain their own website and share traffic among each other. The webring's aim is to share personal websites such as *diaries, wikis & portfolios*. To add yourself to the ring, submit an [edit](https://github.com/XXIIVV/webring/edit/master/index.html) to this repository.
44
55## Join the webring
66
77```
8−<a href='http://webring.xxiivv.com/#random' target='_blank'><img src='http://webring.xxiivv.com/icon.black.svg'/></a>
8+<a href='https://webring.xxiivv.com/#random' target='_blank'><img src='https://webring.xxiivv.com/icon.black.svg'/></a>
99```
1010
1111- Add the webring icon to your website html.
@@ -19,9 +19,9 @@ Alternatively, if you your website has a dark background, use `icon.white.svg`.
1919Instead of linking to the directory, you can also link to the next link in the ring by adding parts of your site or domain in the hash of the request url:
2020
2121```
22−<a href='http://webring.xxiivv.com/#wiki.xxiivv' target='_blank'><img src='http://webring.xxiivv.com/icon.black.svg'/></a>
22+<a href='https://webring.xxiivv.com/#wiki.xxiivv' target='_blank'><img src='https://webring.xxiivv.com/icon.black.svg'/></a>
2323```
2424
2525## Need Help?
2626
27−The ring master is [@neauoire](http://twitter.com/neauoire), but any member of the network is also welcome to join this repository as a collaborator to help manage new links and Pull Requests. Read more [here](http://wiki.xxiivv.com/webring).
27+The ring master is [@neauoire](https://twitter.com/neauoire), but any member of the network is also welcome to join this repository as a collaborator to help manage new links and Pull Requests. Read more [here](https://wiki.xxiivv.com/webring).
index.html+1
@@ -3,6 +3,7 @@
33<head>
44 <meta charset="utf-8">
55 <meta name="viewport" content="width=device-width, initial-scale=1.0">
6+ <link rel="stylesheet" type="text/css" href="links/fonts.css"/>
67 <link rel="stylesheet" type="text/css" href="links/main.css"/>
78 <script src="scripts/portal.js"></script>
89 <title>Webring</title>
links/fonts.cssnew file+22
@@ -0,0 +1,22 @@
1+/* Input Mono */
2+
3+@font-face {
4+ font-family: 'input_mono_regular';
5+ src: url('../media/fonts/input_mono_regular.ttf') format('truetype');
6+ font-weight: normal;
7+ font-style: normal;
8+}
9+
10+@font-face {
11+ font-family: 'input_mono_medium';
12+ src: url('../media/fonts/input_mono_medium.ttf') format('truetype');
13+ font-weight: normal;
14+ font-style: normal;
15+}
16+
17+@font-face {
18+ font-family: 'input_mono_thin';
19+ src: url('../media/fonts/input_mono_thin.ttf') format('truetype');
20+ font-weight: normal;
21+ font-style: normal;
22+}
links/main.css+12−8
@@ -1,13 +1,17 @@
11body { background:#f4f4f4; padding:0px; margin:0px; }
2−body div { display:block; background: #ccc;min-height: calc(100vh - 60px);width: calc(100vw - 60px);margin: 15px;color: #555;padding: 15px;font-family: 'Monospaced','Courier New',courier;font-size:12px; position: relative; border-radius: 2px }
2+body div { display:block; background: #ddd;min-height: calc(100vh - 60px);width: calc(100vw - 60px);margin: 15px;color: #555;padding: 15px;font-family:'input_mono_regular', 'Monospaced','Courier New',courier;font-size:11px; position: relative; border-radius: 2px }
33body div #icon { display: block;width: 30px;height: 30px;background-image: url(../icon.white.svg);background-size: cover;background-repeat: no-repeat;position: absolute;bottom: 10px;right:10px;background-position: center;padding:0px }
4−body div p { display:block; padding:0px 5px}
5−body div p a { color:black; text-decoration: none; }
4+body div p { display:block; padding:0px 5px; line-height: 20px}
5+body div p a { color:black; text-decoration: none; text-decoration: underline;}
66body div p a:hover { text-decoration: underline; }
7−body div p b { font-weight: normal; color:#000; text-decoration: underline; }
7+body div p b { font-weight: normal; color:#000; font-family: 'input_mono_medium' }
88body div p.readme { max-width:500px; }
99body div list { display:block; max-width: 800px; columns:3; border-bottom: 2px solid white;padding-bottom: 15px;margin-bottom:15px; overflow: hidden;}
10−body div list ln { width: 16em; display:block; padding-left:5px; overflow: hidden; text-overflow: ellipsis; }
11−body div list ln a { line-height: 20px; display: inline-block; color:#000; padding:0px 5px;}
12−body div list ln a:visited { color:#777; text-decoration: none;}
13−body div list ln a:hover { background:black; color:#fff; text-decoration: none; }
10+body div list ln { width: 22em; display:block; padding-left:5px; overflow: hidden; text-overflow: ellipsis; }
11+body div list ln a { line-height: 20px; display: inline-block; color:#000; padding:0px 5px; text-decoration: none;}
12+body div list ln a:visited { color:#999; text-decoration: none;}
13+body div list ln a:hover { background:#ccc; color:#000; text-decoration: none; border-radius: 2px }
14+
15+@media (max-width: 950px) {
16+ body div list { columns: 2 }
17+}
media/fonts/input_mono_medium.ttfnew file

Binary file not shown.

media/fonts/input_mono_regular.ttfnew file

Binary file not shown.

media/fonts/input_mono_thin.ttfnew file

Binary file not shown.

scripts/portal.js+1−1
@@ -16,7 +16,7 @@ function Portal(sites)
1616
1717 this.readme = function()
1818 {
19− return `<p class='readme'>This webring is an attempt to inspire artists & developers to build their own website and share traffic among each other. The ring welcomes personalized websites such as <b>diaries, wikis & portfolios</b> — To add yourself to the ring, submit a <a href='https://github.com/XXIIVV/webring/edit/master/index.html' target='_blank'>Pull Request</a>.</p>`
19+ return `<p class='readme'>This webring is an attempt to inspire artists & developers to build their own website and share traffic among each other. The ring welcomes personalized websites such as <b>diaries, wikis & portfolios</b>.</p><p>To add yourself to the ring, submit a <a href='https://github.com/XXIIVV/webring/edit/master/index.html' target='_blank'>Pull Request</a>.<br />If you found a broken link, please <a href='https://github.com/XXIIVV/webring/issues/new' target='_blank'>report it</a>.</p>`
2020 }
2121
2222 this.buttons = function()