diff options
author | ng0 <ng0@n0.is> | 2019-02-16 12:03:10 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-02-16 12:03:10 +0000 |
commit | 9a16be1e2099cc0253b92d747ffcbbb2445537eb (patch) | |
tree | a20231488ae9d23121c1a4ec3ee9b4ecf85282ec | |
parent | 8b32ee4bd378e12dcd1d71c51251ef2f7c786181 (diff) | |
parent | 663cc869ed624a63c6469c4812a60498b1dfb920 (diff) | |
download | www-9a16be1e2099cc0253b92d747ffcbbb2445537eb.tar.gz www-9a16be1e2099cc0253b92d747ffcbbb2445537eb.zip |
Merge branch 'master' of gnunet.org:www
-rw-r--r-- | styles.css | 3 | ||||
-rw-r--r-- | team.html.j2 | 1 | ||||
-rw-r--r-- | tutorial-macos.html.j2 | 3 |
3 files changed, 4 insertions, 3 deletions
@@ -133,7 +133,8 @@ h6.description { | |||
133 | width: 30px; | 133 | width: 30px; |
134 | height: 30px; | 134 | height: 30px; |
135 | text-align: center; | 135 | text-align: center; |
136 | border: 1px solid #88C425; | 136 | /*border: 1px solid #88C425;*/ |
137 | color: #88C425; | ||
137 | margin: 2px; | 138 | margin: 2px; |
138 | padding: 5px; | 139 | padding: 5px; |
139 | display: inline-block; | 140 | display: inline-block; |
diff --git a/team.html.j2 b/team.html.j2 index 99ff04ad..5351c796 100644 --- a/team.html.j2 +++ b/team.html.j2 | |||
@@ -85,6 +85,7 @@ | |||
85 | <!-- was: height="240" --> | 85 | <!-- was: height="240" --> |
86 | <img src="{{ url('team-images/schanzenbach.jpg') }}" alt="Martin Schanzenbach" class="img-fluid"> | 86 | <img src="{{ url('team-images/schanzenbach.jpg') }}" alt="Martin Schanzenbach" class="img-fluid"> |
87 | <ul class="text-center"> | 87 | <ul class="text-center"> |
88 | <a href="https://schanzen.eu"><li><i class="fas fa-home"></i></li></a> | ||
88 | </ul> | 89 | </ul> |
89 | </div> | 90 | </div> |
90 | <h1>Martin Schanzenbach</h1> | 91 | <h1>Martin Schanzenbach</h1> |
diff --git a/tutorial-macos.html.j2 b/tutorial-macos.html.j2 index fec2850b..df0ff757 100644 --- a/tutorial-macos.html.j2 +++ b/tutorial-macos.html.j2 | |||
@@ -23,7 +23,7 @@ | |||
23 | </p> | 23 | </p> |
24 | 24 | ||
25 | <code> | 25 | <code> |
26 | $ sudo brew install git autoconf automake gcc gettext gnutls jansson libextractor libgcrypt libffi libidn2 libmicrohttpd libmpc libtool libunistring pkg-config unbound | 26 | $ sudo brew install git autoconf automake glpk gettext gnutls jansson libextractor libgcrypt libffi libidn2 libmicrohttpd libmpc libtool libunistring pkg-config unbound |
27 | </code> | 27 | </code> |
28 | 28 | ||
29 | <h3>{{ _("Make an installation directory") }}</h3> | 29 | <h3>{{ _("Make an installation directory") }}</h3> |
@@ -84,7 +84,6 @@ | |||
84 | <code> | 84 | <code> |
85 | $ cd ~/gnunet_src<br> | 85 | $ cd ~/gnunet_src<br> |
86 | $ ./bootstrap<br> | 86 | $ ./bootstrap<br> |
87 | $ export CC=gcc-8 | ||
88 | $ export GNUNET_PREFIX=~/gnunet<br> | 87 | $ export GNUNET_PREFIX=~/gnunet<br> |
89 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation<br> | 88 | $ ./configure --prefix=$GNUNET_PREFIX --disable-documentation<br> |
90 | </code> | 89 | </code> |