on master help sign in
typography issue in primer fixed
commit9f745d45d9c713e2fa4a659c416d497ef262e7da authorfriederjanmoerman <hijbrid@gmail.com> dateMon 1 Jul 2019, 00:02 (7 years ago) parent1784d57
2 files changed+1−5
sass/_main.scss−4 templates/primer.html+1−1
sass/_main.scss−4
@@ -39,11 +39,7 @@ iframe {
3939
4040.container {
4141 display: flex;
42−<<<<<<< HEAD
43− padding-bottom: 32rem;
44−=======
4542 padding-bottom: (32rem / 4);
46−>>>>>>> origin/master
4743}
4844
4945.container--fixed {
templates/primer.html+1−1
@@ -106,7 +106,7 @@
106106 <div class="col-md-12">
107107 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-urbit-is-for">
108108 <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">1.</div>
109− <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Aegean: What Urbit is For</div>
109+ <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Aegean: What Urbit is for</div>
110110 </a>
111111 </div>
112112 </div>