git.iko.soy/urbit.org
on master help sign in
typography issue in primer fixed
9f745d4friederjanmoerman
sass/_main.scss−4
compare with master
unifiedsplit
@@ -39,11 +39,7 @@ iframe {
39
39
40.container {
40.container {
41 display: flex;
41 display: flex;
42−<<<<<<< HEAD
43− padding-bottom: 32rem;
44−=======
45 padding-bottom: (32rem / 4);
42 padding-bottom: (32rem / 4);
46−>>>>>>> origin/master
47}
43}
48
44
49.container--fixed {
45.container--fixed {
templates/primer.html+1−1
@@ -106,7 +106,7 @@
106 <div class="col-md-12">
106 <div class="col-md-12">
107 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-urbit-is-for">
107 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-urbit-is-for">
108 <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">1.</div>
108 <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>
110 </a>
110 </a>
111 </div>
111 </div>
112 </div>
112 </div>