diff --git a/source/_data/common.json b/source/_data/common.json index 307503f..af3e896 100644 --- a/source/_data/common.json +++ b/source/_data/common.json @@ -50,12 +50,6 @@ "smallImg": "img/pleroma.png", "descr": "Federated microblogging, light as a feather" }, - { - "title": "Socialhome", - "url" : "https://socialhome.network", - "smallImg": "img/socialhome.png", - "descr": "Personal webpage with social networking functionality, suitable for image based content" - }, { "title": "PixelFed", "url" : "https://pixelfed.org", @@ -94,33 +88,37 @@ ], "langs": [ - { - "name": "PHP", - "networks": "Friendica, GNU Social, Hubzilla, PixelFed, Social-NextCloud" - }, - { - "name": "Ruby", - "networks": "diaspora, Mastodon, Prismo" - }, - { - "name": "Python", - "networks": "Funkwhale, microblog.pub, Reel2Bits, Socialhome" - }, { "name": "Elixir", "networks": "Mobilizon, Pleroma" }, - { - "name": "Rust", - "networks": "Aardwolf, Kibou, Kroeg, Plume, Rustodon" - }, - { - "name": "(Node)JS", - "networks": "Dolphin, Misskey, PeerTube, WriteFreely" - }, { "name": "Go", - "networks": "read.as, WriteFreely" + "networks": "Honk, Littr.me, Tavern, WriteFreely" + }, + { + "name": "JavaScript", + "networks": "Gancio, Guppe" + }, + { + "name": "PHP", + "networks": "Friendica, GNU Social, Hubzilla, PixelFed, NextCloud-Social, Zap" + }, + { + "name": "Python", + "networks": "Bookwyrm, Epicyon, Funkwhale, microblog.pub, pubgate, Reel2Bits, Socialhome" + }, + { + "name": "Ruby", + "networks": "diaspora, Learn Awesome, Mastodon" + }, + { + "name": "Rust", + "networks": "Lemmy, Kibou, Kroeg, Plume" + }, + { + "name": "TypeSript", + "networks": "Dolphin, Misskey, PeerTube" } ] } diff --git a/source/_data/diaspora.json b/source/_data/diaspora.json index b4ffa4f..73314cd 100644 --- a/source/_data/diaspora.json +++ b/source/_data/diaspora.json @@ -21,7 +21,6 @@ "serverWizard": "https://podupti.me", "mobile": "https://f-droid.org/en/packages/com.github.dfa.diaspora_android", "proxy": "https://wiki.diasporafoundation.org/Installation/Camo", - "relay": "https://relay.iliketoast.net", "tutorials": [ {"id": "0", "url": "https://diasporafoundation.org/tutorials"} diff --git a/source/_data/friendica.json b/source/_data/friendica.json index 98aca89..fb27e12 100644 --- a/source/_data/friendica.json +++ b/source/_data/friendica.json @@ -41,7 +41,7 @@ "dwellers": "friends", "communities": [ {"title": "List of forums", "url": "https://dir.friendica.social/forums"}, - {"title": "Nodes by theme", "url": "https://gitlab.com/distributopia/friendica-world-overview"} + {"title": "List of servers by theme", "url": "../portal/servers"} ], "descr": "Friendica aims at being a platform that suits everyone. Newcomers will feel right at home: the network's interface and functionality include common features of a mainstream social network. Being comparatively light on resources makes it attractive for administrators to host (Friendica servers are called \"nodes\"). The community is good-natured and helpful. Friendica is well connected with the rest of Fediverse โ€” its users can follow friends on most other federated networks.", "connections": ["diaspora*", "GNU Social", "Hubzilla", "Mastodon", "Misskey", "Pixelfed", "Pleroma"], diff --git a/source/_data/funkwhale.json b/source/_data/funkwhale.json index 33a85d1..20a682c 100644 --- a/source/_data/funkwhale.json +++ b/source/_data/funkwhale.json @@ -31,7 +31,7 @@ {"id": "0", "url": "https://app.spacebear.ee"} ], "mascot": [{"item": "whale", "imgNum": "1"}], - "dwellers": "?", + "dwellers": "", "communities": "", "descr": "Funkwhale is a community-driven project that lets you listen and share music within a decentralized, open network. Funkwhale is not only an audio server and player, it was designed to be a place for socializing around music and discovering new content.", "connections": ["Mastodon"], diff --git a/source/_data/hubzilla.json b/source/_data/hubzilla.json index 2646c87..77b0e1c 100644 --- a/source/_data/hubzilla.json +++ b/source/_data/hubzilla.json @@ -56,13 +56,11 @@ "nomadic identity", "events", "calendar", - "recallable direct messages (mail)", "encrypting comments with passphrase" ], "information": [ "By default Hubzilla account federates only within Hubzilla network. You need to turn on ActivityPub and diaspora plugins in profile settings in order to connect with your friends from other networks", - "When you recall a Hubzilla direct message in \"mail\", your message is removed from conversation on both sides (is deleted from the database of the server you're using and from your correspondent's server). This works only between Hubzilla contacts. If you exchange direct messages with friends from diaspora, Friendica, etc, recalling a message on your side will not delete it from their servers - because those networks do not allow direct message deletion", "Sharing files is possible only between Hubzilla users, friends from other networks will not have access to shared files" ], "donate": "https://salt.bountysource.com/teams/hubzilla", diff --git a/source/_data/mastodon.json b/source/_data/mastodon.json index 7b07d0b..769be72 100644 --- a/source/_data/mastodon.json +++ b/source/_data/mastodon.json @@ -40,8 +40,11 @@ [ {"id": "0", "url": "http://sp3r4z.fr/mastodon"} ], - "awesome": "https://github.com/tleb/awesome-mastodon", - "backup": "https://github.com/kensanata/mastodon-backup", + "forTechies": + [ + {"id": "0", "url": "https://github.com/tleb/awesome-mastodon"}, + {"id": "1", "url": "https://github.com/kensanata/mastodon-backup"} + ], "services": [ {"id": "0", "url": "https://masto.host"}, @@ -61,16 +64,16 @@ {"id": "3", "url": "https://fed.brid.gy"}, {"id": "4", "url": "https://gitlab.com/chaica/feed2toot"} ], - "mascot": [{"item": "mastodon", "imgNum": "1"}, {"item": "trumpet", "imgNum": "2"}], + "mascot": [{"item": "mastodon", "imgNum": "1"}], "dwellers": "mastonauts", "communities": [{"title": "List of servers by theme", "url": "../portal/servers"}], - "descr": "Mastodon network grew quickly. You'll find everything you want of a microblogging platform, and much more. There are numerous Mastodon servers (called \"instances\") created specifically for certain communities and dedicated to various interests, spheres of knowledge, regions and activities.", + "descr": "Mastodon is the largest federating social network. You'll find everything you want of a microblogging platform, and much more. There are numerous Mastodon servers (called \"instances\") created specifically for certain communities and dedicated to various interests, spheres of knowledge, regions and activities.", "connections": ["Friendica", "Hubzilla", "microblog.pub", "Misskey", "PeerTube", "Pixelfed", "Pleroma", "Plume", "WriteFreely"], "screenshots": [ {"descr": "Default tweetdeck layout", "img": "mastodon-1.png"}, {"descr": "Alternative Pinafore layout", "img": "mastodon-2.png"}, - {"descr": "Alternative Halcyon layout", "img": "mastodon-3.png"} + {"descr": "Alternative Halcyon layout", "img": "halcyon.png"} ], "features": [ @@ -180,11 +183,6 @@ "url": "https://framapiaf.org/@davidrevoy", "avatar": "/img/avatars/drevoy.png" }, - { - "name": "John Scalzi", - "url": "https://mastodon.social/@scalzi", - "avatar": "/img/avatars/scalzi.png" - }, { "name": "Digitalcourage", "url": "https://chaos.social/@Digitalcourage", diff --git a/source/_data/miscellaneous.json b/source/_data/miscellaneous.json index d3c0826..990f648 100644 --- a/source/_data/miscellaneous.json +++ b/source/_data/miscellaneous.json @@ -37,6 +37,24 @@ "OStatusClass": false, "categories": ["Blog-Pub"] }, + { + "title": "Socialhome", + "source": "https://git.feneas.org/socialhome/socialhome", + "protocols": "diaspora, ActivityPub", + "site": "https://socialhome.network", + "logo": "/img/misc/socialhome.svg", + "servers": "https://the-federation.info/socialhome", + "description": "Personal webpage with social networking functionality. Column grid layout makes it a perfect network for sharing image content or creating personal portfolio.", + "codeLanguage": "Python", + "techStack": "Django, Vue", + "license": "AGPL-3.0", + "FediAccount": "@jaywink@jasonrobinson.me", + "apClass": true, + "zotClass": false, + "diasporaClass": true, + "OStatusClass": false, + "categories": ["SN-ma"] + }, { "title": "dolphin", "source": "https://github.com/syuilo/dolphin", @@ -999,7 +1017,7 @@ "logo": "/img/misc/misskey.svg", "servers": "https://the-federation.info/misskey", "description": "Sophisticated microblogging with personality. Provides many additional features like calendar, emoji reactions, polls, games, and many other widgets.", - "codeLanguage": "Javascript", + "codeLanguage": "TypeScript", "techStack": "Node.js, Vue", "license": "AGPL-3.0", "FediAccount": "@syuilo@misskey.io", @@ -1063,24 +1081,6 @@ "OStatusClass": false, "categories": ["SN-mi"] }, - { - "title": "Socialhome", - "source": "https://git.feneas.org/socialhome/socialhome", - "protocols": "diaspora, ActivityPub", - "site": "https://socialhome.network", - "logo": "/img/misc/socialhome.svg", - "servers": "https://the-federation.info/socialhome", - "description": "Personal webpage with social networking functionality. Column grid layout makes it a perfect network for sharing image content or creating personal portfolio.", - "codeLanguage": "Python", - "techStack": "Django, Vue", - "license": "AGPL-3.0", - "FediAccount": "@jaywink@jasonrobinson.me", - "apClass": true, - "zotClass": false, - "diasporaClass": true, - "OStatusClass": false, - "categories": ["SN-ma"] - }, { "title": "Mastodon", "source": "https://github.com/tootsuite/mastodon", diff --git a/source/_data/misskey.json b/source/_data/misskey.json index 7bb3863..aa8ce1a 100644 --- a/source/_data/misskey.json +++ b/source/_data/misskey.json @@ -9,7 +9,7 @@ "official": "https://join.misskey.page/en", "license": "AGPL-3.0", "repo": "https://github.com/syuilo/misskey", - "language": "(Node)JS", + "language": "TypeScript", "protocols": [ {"title": "ActivityPub", "url": "https://activitypub.rocks"} diff --git a/source/_data/peertube.json b/source/_data/peertube.json index 89c4273..3b7b653 100644 --- a/source/_data/peertube.json +++ b/source/_data/peertube.json @@ -9,7 +9,7 @@ "official": "https://joinpeertube.org/en", "license": "AGPL-3.0", "repo": "https://github.com/Chocobozzz/PeerTube", - "language": "NodeJS", + "language": "TypeScript", "protocols": [ {"title": "ActivityPub", "url": "https://activitypub.rocks"} diff --git a/source/_data/pixelfed.json b/source/_data/pixelfed.json index f44fc29..6aee1d7 100644 --- a/source/_data/pixelfed.json +++ b/source/_data/pixelfed.json @@ -27,14 +27,14 @@ {"id": "0", "url": "https://app.spacebear.ee"} ], "mascot": [{"item": "red panda Fred", "imgNum": "1"}], - "dwellers": "?", + "dwellers": "", "communities": "", "descr": "Pixelfed is an image sharing platform with modern user interface.", "connections": ["Friendica", "Mastodon", "Misskey", "Pleroma"], "screenshots": [ - {"descr": "Pixelfed interface", "img": "pixelfed-1.png"}, - {"descr": "MetroUI", "img": "pixelfed-2.png"} + {"descr": "Pixelfed default interface", "img": "pixelfed-1.png"}, + {"descr": "Alternative 'Metro' user interface", "img": "pixelfed-2.png"} ], "features": [ diff --git a/source/_data/pleroma.json b/source/_data/pleroma.json index db543f1..4d7bc17 100644 --- a/source/_data/pleroma.json +++ b/source/_data/pleroma.json @@ -33,13 +33,16 @@ ], "devTutorial": "https://docs.pleroma.social", "mascot": [{"item": "Fox Tan", "imgNum": "1"}], - "dwellers": "pleromans", - "communities": "", - "descr": "Pleroma microblogging platform was quickly appreciated by the community for its low resource consumption. If you have a Raspberry Pi or similar single-board computer you can use it as Pleroma server for family and friends.", + "dwellers": "", + "communities": [ + {"title": "List of servers by theme", "url": "../portal/servers"} + ], + "descr": "Pleroma microblogging platform is appreciated by the community for its low resource consumption. If you have a Raspberry Pi or similar single-board computer you can use it as Pleroma server for family and friends.", "connections": ["Friendica", "GNU Social", "Hubzilla", "Mastodon", "microblog.pub", "Misskey", "Peertube", "Pixelfed", "Plume", "WriteFreely"], "screenshots": [ - {"descr": "Default Pleroma layout", "img": "pleroma-1.jpg"} + {"descr": "Default Pleroma layout", "img": "pleroma-1.jpg"}, + {"descr": "Alternative Halcyon layout", "img": "halcyon.png"} ], "features": [ diff --git a/source/_data/socialhome.json b/source/_data/socialhome.json deleted file mode 100644 index d1c07b4..0000000 --- a/source/_data/socialhome.json +++ /dev/null @@ -1,53 +0,0 @@ - -{ - "data": - { - "title": "socialhome", - "category": "social network", - "type": "macroblogging", - "logoClr": "2fcbbe", - "created": "2016", - "official": "https://socialhome.network", - "license": "AGPL-3.0", - "repo": "https://git.feneas.org/socialhome/socialhome", - "language": "Python", - "protocols": - [ - {"title": "ActivityPub", "url": "https://activitypub.rocks"}, - {"title": "diaspora", "url": "https://github.com/diaspora/diaspora_federation"} - ], - "wiki": "", - "servers": - [ - {"num": "1", "url": "https://the-federation.info/socialhome"} - ], - "mobile": "", - "devTutorial": "https://socialhome.readthedocs.io/en/latest/running.html", - "mascot": [{"item": "pony", "imgNum": "1"}], - "dwellers": "?", - "communities": "", - "descr": "Socialhome's column grid layout makes it a perfect network for sharing image content or creating personal portfolio and delivering new posts to friends from other Fediverse platforms.", - "connections": ["diaspora*", "Friendica", "Hubzilla", "Mastodon", "Misskey", "Pixelfed", "Pleroma", "WriteFreely"], - "screenshots": - [ - {"descr": "Socialhome grid layout", "img": "socialhome-1.png"} - ], - "features": - [ - "pinned posts", - "editing posts" - ], - "donate": "https://www.patreon.com/jaywink", - "tracker": "https://git.feneas.org/socialhome/socialhome/issues", - "bounty": "", - "translating": "", - "reading": - [ - { - "title": "Faces of the Federationโ€Šโ€”โ€ŠJason Robinson of Socialhome", - "url": "https://wedistribute.org/2018/01/faces-of-the-federation%e2%80%8a-%e2%80%8ajason-robinson-of-socialhome" - } - ], - "notable": "" - } -} diff --git a/source/en/portal/servers/index.md b/source/en/portal/servers/index.md index c4557e1..94dd076 100644 --- a/source/en/portal/servers/index.md +++ b/source/en/portal/servers/index.md @@ -3,18 +3,18 @@ layout: "post" title: "Themed servers" --- -**Unsure where to register to join Fediverse?** Choose a website from this curated list of themed servers. Currently it includes [Mastodon](/en/mastodon), [Pleroma](/en/pleroma) and [Friendica](/en/friendica) servers. Other Fediverse networks will be added in future updates. Servers are not restricted to their theme. They simply help people with common interests find their community. +**Unsure where to register to join Fediverse?** Choose a website from this curated list. Currently it includes [Mastodon](/en/mastodon), [Pleroma](/en/pleroma) and [Friendica](/en/friendica) servers. Websites are not restricted to their theme. They help people with common interests find their community. + <% if (data.dwellers) { %>

<%- __('dwellers') %>

<%= data.dwellers %>
+ <% } %>
-
-

<%- __('communities') %>

- <% if (data.communities) { %> - - <% } else { %> - <%- __('soon') %> - <% } %> -
+ <% if (data.communities) { %> +
+

<%- __('communities') %>

+ +
+ <% } %>

<%- __('connections') %>

diff --git a/themes/starter/layout/friendica.ejs b/themes/starter/layout/friendica.ejs index 6000836..0eeb73b 100644 --- a/themes/starter/layout/friendica.ejs +++ b/themes/starter/layout/friendica.ejs @@ -22,7 +22,7 @@ network: true <%- partial('_partial/generalinfo') %>
-
+

<%- __('techies') %>

    <% for (item in data.tutorials) { %> @@ -33,7 +33,7 @@ network: true <% } %>
-
+

<%- __('utilities') %>

    <% for (item in data.utilities) { %> diff --git a/themes/starter/layout/funkwhale.ejs b/themes/starter/layout/funkwhale.ejs index 21c0529..b07944d 100644 --- a/themes/starter/layout/funkwhale.ejs +++ b/themes/starter/layout/funkwhale.ejs @@ -19,7 +19,7 @@ network: true
    <%- partial('_partial/generalinfo') %>
    -
    +

    <%- __('users') %>

      <% for (item in data.forUsers) { %> @@ -30,7 +30,7 @@ network: true <% } %>
    -
    +

    <%- __('techies') %>

      <% for (item in data.services) { %> diff --git a/themes/starter/layout/gnusocial.ejs b/themes/starter/layout/gnusocial.ejs index 125f307..af70004 100644 --- a/themes/starter/layout/gnusocial.ejs +++ b/themes/starter/layout/gnusocial.ejs @@ -23,7 +23,7 @@ network: true <%- partial('_partial/generalinfo') %>
      -
      +

      <%- __('tuts') %>

        <% for (item in tutorials) { %> @@ -34,7 +34,7 @@ network: true <% } %>
      -
      +

      <%- __('utilities') %>

        <% for (item in utilities) { %> diff --git a/themes/starter/layout/hubzilla.ejs b/themes/starter/layout/hubzilla.ejs index a7077e0..b38d015 100644 --- a/themes/starter/layout/hubzilla.ejs +++ b/themes/starter/layout/hubzilla.ejs @@ -23,7 +23,7 @@ network: true <%- partial('_partial/generalinfo') %>
        -
        +

        <%- __('tuts') %>

          <% for (item in tutorials) { %> @@ -34,7 +34,7 @@ network: true <% } %>
        -
        +

        <%- __('cheatsheets') %>

          <% for (item in cheatsheets) { %> diff --git a/themes/starter/layout/index.ejs b/themes/starter/layout/index.ejs index 97b2a17..d1170a3 100644 --- a/themes/starter/layout/index.ejs +++ b/themes/starter/layout/index.ejs @@ -28,7 +28,7 @@ layout: layout <%- __('hello') %>

          <%- __('leave') %> <%- __('unique') %>.

          <%- __('theWorld') %>
          <%- __('universe') %>

          - <%- __('joinF') %> + <%- __('joinF') %>
        diff --git a/themes/starter/layout/mastodon.ejs b/themes/starter/layout/mastodon.ejs index 14a69c9..7b3709a 100644 --- a/themes/starter/layout/mastodon.ejs +++ b/themes/starter/layout/mastodon.ejs @@ -9,7 +9,8 @@ network: true const tuts = [__('howto'), __('guide')]; const uxList = [__('pinafore'), __('halcyon'), __('mastoGallery'), __('trunk')]; const stats = [__('stats')]; - const tools = [__('preinstalled'), __('mediaHosting')]; + const tech = [__('awesome'), __('mediaHosting')]; + const tools = [__('preinstalled'), __('backup')]; const utils = [__('mastofeed'), __('crossposting'), __('feedPreview'), __('webmentions'), __('feed2toot')]; %> @@ -24,7 +25,7 @@ network: true <%- partial('_partial/generalinfo') %>
        -
        +

        <%- __('users') %>

          <% for (item in data.forUsers) { %> @@ -35,11 +36,15 @@ network: true <% } %>
        -
        +

        <%- __('techies') %>

        -

        <%- __('awesome') %>

        -

        <%- __('backup') %>

          + <% for (item in data.forTechies) { %> + <% let c = data.forTechies[item].id %> +
        • + <%= tech[c] %> +
          • + <% } %> <% for (item in data.services) { %> <% let b = data.services[item].id %>
        • @@ -53,7 +58,7 @@ network: true
          -
          +

          <%- __('tuts') %>

            <% for (item in data.tutorials) { %> @@ -64,7 +69,7 @@ network: true <% } %>
          -
          +

          <%- __('utilities') %>

            <% for (item in data.utilities) { %> @@ -77,9 +82,9 @@ network: true
          -
          +
          +

          <%- __('forks') %>

          -
          +

          <%- __('metrics') %>

            <% for (item in data.metrics) { %> diff --git a/themes/starter/layout/peertube.ejs b/themes/starter/layout/peertube.ejs index 015ed2e..f5a1e73 100644 --- a/themes/starter/layout/peertube.ejs +++ b/themes/starter/layout/peertube.ejs @@ -20,7 +20,7 @@ network: true
            <%- partial('_partial/generalinfo') %>
            -
            +

            <%- __('users') %>

              <% for (item in data.forUsers) { %> @@ -31,7 +31,7 @@ network: true <% } %>
            -
            +

            <%- __('techies') %>

              <% for (item in data.services) { %> @@ -42,7 +42,7 @@ network: true <% } %>
            -
            +

            <%- __('tuts') %>

              <% for (item in data.tutorials) { %> diff --git a/themes/starter/layout/pixelfed.ejs b/themes/starter/layout/pixelfed.ejs index 74167f5..beb73e1 100644 --- a/themes/starter/layout/pixelfed.ejs +++ b/themes/starter/layout/pixelfed.ejs @@ -18,7 +18,7 @@ network: true
              <%- partial('_partial/generalinfo') %>
              -
              +

              <%- __('techies') %>

                <% for (item in data.services) { %> diff --git a/themes/starter/layout/pleroma.ejs b/themes/starter/layout/pleroma.ejs index 79a3a5a..17b54a2 100644 --- a/themes/starter/layout/pleroma.ejs +++ b/themes/starter/layout/pleroma.ejs @@ -21,7 +21,7 @@ network: true
                <%- partial('_partial/generalinfo') %>
                -
                +

                <%- __('users') %>

                  <% for (item in ux) { %> @@ -32,7 +32,7 @@ network: true <% } %>
                -
                +

                <%- __('tuts') %>

                  <% for (item in tutorials) { %> diff --git a/themes/starter/layout/tools.ejs b/themes/starter/layout/tools.ejs index 0969c78..687a3e2 100644 --- a/themes/starter/layout/tools.ejs +++ b/themes/starter/layout/tools.ejs @@ -63,8 +63,7 @@ layout: layout
                  <% if (apps[item].site) { %>

                  Website

                  - <% let path = apps[item].site.split('://') %> -

                  <%= path[1] %> +

                  <%= stripHTTPS(apps[item].site) %> remote link

                  <% } %>

                  Source code

                  diff --git a/themes/starter/scripts/hexo-helpers.js b/themes/starter/scripts/hexo-helpers.js index d63ce0b..2087d2b 100644 --- a/themes/starter/scripts/hexo-helpers.js +++ b/themes/starter/scripts/hexo-helpers.js @@ -4,6 +4,7 @@ hexo.extend.helper.register('is_root', isRoot); hexo.extend.helper.register('get_langs', getLangs); hexo.extend.helper.register('switch_lang', switchLang); hexo.extend.helper.register('getPath', getPath); +hexo.extend.helper.register('stripHTTPS', stripHTTPS); function isRoot() { const lang = this.page.lang; @@ -28,6 +29,10 @@ function switchLang(lang) { function getPath() { const url = this.page.path; const filename = url.substr(3); - const splitPath = filename.split("/"); + const splitPath = filename.split('/'); return splitPath[0]; } + +function stripHTTPS(x) { + return x.split('://')[1]; +} diff --git a/themes/starter/source/assets/scss/modules/_index.scss b/themes/starter/source/assets/scss/modules/_index.scss index 2469cfb..12b8f8e 100644 --- a/themes/starter/source/assets/scss/modules/_index.scss +++ b/themes/starter/source/assets/scss/modules/_index.scss @@ -69,13 +69,8 @@ text-shadow: 0 0 10px $white; } -.f-Socialhome { - top: .7em; - left: 7em; -} - .f-Misskey { - top: 23%; + top: 9%; left: 4%; } @@ -91,7 +86,7 @@ .f-Pleroma { top: 48%; - left: 8%; + left: 13%; } .f-Mastodon { diff --git a/themes/starter/source/assets/scss/modules/_network.scss b/themes/starter/source/assets/scss/modules/_network.scss index bb49801..fd25636 100644 --- a/themes/starter/source/assets/scss/modules/_network.scss +++ b/themes/starter/source/assets/scss/modules/_network.scss @@ -53,11 +53,11 @@ img.mascot { .screen { flex: 100% 0 0; - margin: .3em; + margin: .7em; } .screen > img { - width: 70%; + width: 85%; border: 1px solid $grey; } @@ -65,7 +65,7 @@ img.mascot { text-align: center; font-size: .85rem; color: $asphalt; - opacity: .7; + font-weight: bold; margin-bottom: .7em; } @@ -79,8 +79,23 @@ img.mascot { padding: 0; } -@media screen and (max-width: $mq-small) { +@media screen and (max-width: $mq-medium) { + .network .section.inline-items { + display: flex; + } + .inline-items h4 { + margin-right: 1em; + width: 150px; + flex-wrap: wrap; + } + + .inline-items li { + padding: 0; + } +} + +@media screen and (max-width: $mq-small) { .network .subheading { padding: .4em; margin-top: 1.2em; diff --git a/themes/starter/source/assets/scss/partials/_layout.scss b/themes/starter/source/assets/scss/partials/_layout.scss index 4d4ba71..01333ec 100644 --- a/themes/starter/source/assets/scss/partials/_layout.scss +++ b/themes/starter/source/assets/scss/partials/_layout.scss @@ -203,6 +203,7 @@ input[type="radio"] { .contents .section { display: flex; + flex-wrap: wrap; margin: 1em 0; } @@ -217,10 +218,11 @@ input[type="radio"] { .section-wrapper { display: flex; flex-wrap: wrap; + justify-content: space-between; } .section-wrapper > .column { - flex: 50% 0 0; + flex: 48% 0 0; } .section-wrapper:last-child > .column .section { @@ -290,6 +292,7 @@ input[type="radio"] { } .article-list > h2, +.article-list > h3, .article-list > h4 { margin: 1em 0; }