git.iko.soy/urbit.org
on master help sign in
Merge branch 'master' of github.com:urbit/urbit.org into search-bar-release
commitc8b4f28e50007656cb21495cbf5da45361c41186 authorMorgan Sutherland <morgan@morgansutherland.com> dateMon 1 Jul 2019, 14:49 (7 years ago) parent5826a81855a0ed
4 files changed+22−17
compare with master
unifiedsplit
sass/_main.scss+4−4 sass/_responsive.scss+5 templates/partials/navigation.html+1−1 templates/primer.html+12−12
sass/_main.scss+4−4
@@ -71,7 +71,6 @@ iframe {
7171
7272.content-nav-icon {
7373 position: fixed;
74− left: (2rem / 4);
7574 top: (24rem / 4);
7675 width: 10px;
7776 height: 10px;
@@ -210,7 +209,6 @@ iframe {
210209 supported by Chrome and Opera */
211210 &__navigation {
212211 display: none;
213− padding-top: (9rem / 4);
214212 }
215213 &__nav-icon {
216214 position: absolute;
@@ -243,14 +241,16 @@ iframe {
243241}
244242
245243.has-active-main-nav {
244+ overflow: hidden;
246245 .header {
247246 z-index: 4;
247+ background: #000;
248+ height: 100%;
248249 &__navigation {
249250 position: fixed;
250251 height: 100%;
251252 width: 100%;
252− background: #000;
253− overflow-y: hidden;
253+ overflow-y: scroll;
254254 display: block;
255255 }
256256 &__nav-icon {
sass/_responsive.scss+5
@@ -1,3 +1,8 @@
1+@media only screen and (max-width: 1080px) {
2+ .header, .main-wrapper {
3+ padding-left: 2%;
4+ }
5+}
16@media only screen and (max-width: 800px) {
27 .has-active-search-window .search-overlay, .search-bar {
38 display: none;
templates/partials/navigation.html+1−1
@@ -7,7 +7,7 @@
77 <div class="wrapper">
88 <div class="container">
99 <div class="nav-column">
10− <div class="nav-links mb24">
10+ <div class="nav-links mb24 mt9">
1111 <ul class="list">
1212 {% for item in config.extra.urbit_menu %}
1313 <li class="list__item">
templates/primer.html+12−12
@@ -105,15 +105,15 @@
105105 <div class="row mb-8">
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">
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>
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>
110110 </a>
111111 </div>
112112 </div>
113113 <div class="row mb-8">
114114 <div class="col-md-12">
115115 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-arvo-is">
116− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">2.</div>
116+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(2)</div>
117117 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Arvo: What Urbit is</div>
118118 </a>
119119 </div>
@@ -121,7 +121,7 @@
121121 <div class="row mb-8">
122122 <div class="col-md-12">
123123 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#what-azimuth-is">
124− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">3.</div>
124+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
125125 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth: What Urbit is</div>
126126 </a>
127127 </div>
@@ -129,7 +129,7 @@
129129 <div class="row mb-8">
130130 <div class="col-md-12">
131131 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#history">
132− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">4.</div>
132+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
133133 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">History</div>
134134 </a>
135135 </div>
@@ -137,7 +137,7 @@
137137 <div class="row mb-8">
138138 <div class="col-md-12">
139139 <a class="row sm-h2 h1 h1-large h-font white text-decoration-none" href="#azimuth-distribution">
140− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">5.</div>
140+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(5)</div>
141141 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth distribution</div>
142142 </a>
143143 </div>
@@ -158,7 +158,7 @@
158158 <div class="row mb-4">
159159 <div class="col-md-10 col-md-offset-1">
160160 <a class="row h2 h-font white text-decoration-none" href="#what-urbit-is-for">
161− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">1.</div>
161+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(1)</div>
162162 <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>
163163 </a>
164164 </div>
@@ -166,7 +166,7 @@
166166 <div class="row mb-4">
167167 <div class="col-md-10 col-md-offset-1">
168168 <a class="row h2 h-font white text-decoration-none" href="#what-arvo-is">
169− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">2.</div>
169+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(2)</div>
170170 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Arvo: What Urbit is</div>
171171 </a>
172172 </div>
@@ -174,7 +174,7 @@
174174 <div class="row mb-4">
175175 <div class="col-md-10 col-md-offset-1">
176176 <a class="row h2 h-font white text-decoration-none" href="#what-azimuth-is">
177− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">3.</div>
177+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(3)</div>
178178 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth: What Urbit is</div>
179179 </a>
180180 </div>
@@ -182,7 +182,7 @@
182182 <div class="row mb-4">
183183 <div class="col-md-10 col-md-offset-1">
184184 <a class="row h2 h-font white text-decoration-none" href="#history">
185− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">4.</div>
185+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(4)</div>
186186 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">History</div>
187187 </a>
188188 </div>
@@ -190,7 +190,7 @@
190190 <div class="row mb-4">
191191 <div class="col-md-10 col-md-offset-1">
192192 <a class="row h2 h-font white text-decoration-none" href="#azimuth-distribution">
193− <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">5.</div>
193+ <div class="col-sm-1 col-md-1 col-md-offset-1 center dlig">(5)</div>
194194 <div class="col-sm-10 col-sm-offset-1 col-md-8 col-md-offset-0 underline underline--skip">Azimuth distribution</div>
195195 </a>
196196 </div>
@@ -1022,7 +1022,7 @@
10221022 <div class="mb-6">
10231023 <h4 class="mb-1">Contact</h4>
10241024 <div class="text-mono text-400">~zod</div>
1025− <div><a class="text-mono" href="/cdn-cgi/l/email-protection#dca9aebeb5a89ca9aebeb5a8f2b3aebb"><span class="__cf_email__" data-cfemail="7e0d0b0e0e110c0a3e0b0c1c170a50110c19">[email&#160;protected]</span></a></div>
1025+ <div><a class="text-mono" href="mailto:support@urbit.org">support@urbit.org</a></div>
10261026 </div>
10271027 </div>
10281028 <div class="col-sm-10 col-md-3 col-sm-offset-1">