git.iko.soy/urbit.org
on master help sign in
Resolving conflict from 3e4e9ec8
cfea3f6Matilde Park
sass/primer.scss+7
compare with master
unifiedsplit
@@ -13060,6 +13060,7 @@ ol > li:before {
13060 padding-right: (99rem / 4); } }
13060 padding-right: (99rem / 4); } }
13061
13061
13062* {
13062* {
13063+ color: inherit;
13063 box-sizing: border-box; }
13064 box-sizing: border-box; }
13064
13065
13065html {
13066html {
@@ -16878,3 +16879,9 @@ must add span in markup to display icon
16878.square-purple {
16879.square-purple {
16879 background-color: #7272ED;
16880 background-color: #7272ED;
16880 border-color: #7272ED; }
16881 border-color: #7272ED; }
16882+
16883+nav {
16884+ position: fixed;
16885+ background: transparent;
16886+ mix-blend-mode: exclusion;
16887+}
templates/primer.html+7
@@ -25,6 +25,13 @@
25 </script>
25 </script>
26</head>
26</head>
27<body class="primer">
27<body class="primer">
28+ <nav class="mt6 ml4">
29+ <a class="gray5" href="/">Urbit</a>
30+ <span class="gray5"> / </span>
31+ <a class="gray4" href="/primer">
32+ Primer
33+ </a>
34+ </nav>
28 <div class="bg-black pt-30 mb-30">
35 <div class="bg-black pt-30 mb-30">
29 <div class="primer-container white">
36 <div class="primer-container white">
30 <div class="row">
37 <div class="row">