git.iko.soy/urbit.org
on master help sign in
refactored the stylesheets so they are more separated and easier to debug, switching over to indigo more or less, need to test and compare more tho
69c5347friederjanmoerman
sass/_main.scss+1−55
compare with master
unifiedsplit
@@ -13,11 +13,6 @@ a {
13 color: #000;
13 color: #000;
14}
14}
15
15
16−* {
17− font-smoothing: antialiased;
18− -webkit-font-smoothing: antialiased;
19−}
20−
21p img {
16p img {
22 margin: 4rem 0;
17 margin: 4rem 0;
23 width: 100%;
18 width: 100%;
@@ -349,12 +344,7 @@ button, .btn {
349 font-weight: 700;
344 font-weight: 700;
350}
345}
351
346
352−.text-mono {
353− font-family: "Source Code Pro", "Roboto mono", "Courier New", monospace;
354−}
355−
356.h-font {
347.h-font {
357− font-family: 'Inter UI',-apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
358 text-transform: lowercase;
348 text-transform: lowercase;
359}
349}
360
350
@@ -363,48 +353,8 @@ h1, h2, h3, h4, h5, h6, .text-heading {
363 font-family: 'Inter UI',-apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
353 font-family: 'Inter UI',-apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
364}
354}
365
355
366−h1, .h1 {
356+.text-600 {
367− font-size: 6rem;
368− line-height: 8rem;
369− margin-top: 0;
370−}
371−
372−h2, .h2 {
373− margin: 0;
374− font-size: 5rem;
375 font-weight: 600;
357 font-weight: 600;
376− line-height: 6rem;
377−}
378−
379−h3, .h3 {
380− font-size: 4rem;
381− font-weight: 500;
382− line-height: 5rem;
383−}
384−
385−h4, .h4 {
386− font-size: 3.5rem;
387− font-weight: 500;
388− line-height: 4rem;
389−}
390−
391−h5, .h5 {
392− font-size: 3.5rem;
393− font-weight: 500;
394− line-height: 4rem;
395−}
396−
397−h6, .h6 {
398− font-size: 3.5rem;
399− font-weight: 500;
400− line-height: 4rem;
401−}
402−
403−.h1-large {
404− font-size: 8rem;
405− line-height: 12rem;
406− text-transform: none;
407− height: auto;
408}
358}
409
359
410p, .p {
360p, .p {
@@ -420,10 +370,6 @@ p, .p {
420 }
370 }
421}
371}
422
372
423−pre, code, .code-block, .text-code, .text-mono {
424− font-family: "Source Code Pro", "Roboto mono", "Courier New", monospace;
425−}
426−
427pre, code {
373pre, code {
428 background-color: #eee !important;
374 background-color: #eee !important;
429 color: #000 !important;
375 color: #000 !important;
sass/_indigo.scss → sass/indigo.scssrenamed+2−2
@@ -20,7 +20,7 @@ html {
20}
20}
21body {
21body {
22 margin: 0;
22 margin: 0;
23−}
23+}
24h1 {
24h1 {
25 font-size: 2em;
25 font-size: 2em;
26 margin: 0.67em 0;
26 margin: 0.67em 0;
@@ -1992,7 +1992,7 @@ template {
1992.medium {
1992.medium {
1993 font-weight: 500;
1993 font-weight: 500;
1994}
1994}
1995−.600,
1995+.text-600,
1996.semibold {
1996.semibold {
1997 font-weight: 600;
1997 font-weight: 600;
1998}
1998}
sass/_primer.scss → sass/primer.scssrenamed+1−2
@@ -20,7 +20,7 @@ html {
20 * Remove default margin.
20 * Remove default margin.
21 */
21 */
22body {
22body {
23− margin: 0; }
23+ margin: 0; }
24
24
25/* HTML5 display definitions
25/* HTML5 display definitions
26 ========================================================================== */
26 ========================================================================== */
@@ -13143,7 +13143,6 @@ input[type="number"] {
13143TYPOGRAPHY from address collection
13143TYPOGRAPHY from address collection
13144*/
13144*/
13145
13145
13146−@import url('https://rsms.me/inter/inter-ui.css');
13147html { font-family: 'Inter UI', sans-serif; }
13146html { font-family: 'Inter UI', sans-serif; }
13148@supports (font-variation-settings: normal) {
13147@supports (font-variation-settings: normal) {
13149 html { font-family: 'Inter UI var alt', sans-serif; }
13148 html { font-family: 'Inter UI var alt', sans-serif; }
sass/styles.scss−6
@@ -1,9 +1,3 @@
1−// primer
2−@import "primer";
3−
4−// base
5−@import "indigo";
6−
7// custom
1// custom
8@import "main";
2@import "main";
9@import "responsive";
3@import "responsive";
templates/base.html+2−1
@@ -10,7 +10,8 @@
10 <link rel="icon" type="image/png" href="../images/favicon.ico"/>
10 <link rel="icon" type="image/png" href="../images/favicon.ico"/>
11 <title>{{ config.title }}</title>
11 <title>{{ config.title }}</title>
12 <!-- stylesheets -->
12 <!-- stylesheets -->
13− <link rel="stylesheet" href="{{ config.base_url }}/styles.css" >
13+ <link rel="stylesheet" href="{{ config.base_url }}/indigo.css">
14+ <link rel="stylesheet" href="{{ config.base_url }}/styles.css">
14 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-47054188-1"></script>
15 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-47054188-1"></script>
15 <script>
16 <script>
16 window.dataLayer = window.dataLayer || [];
17 window.dataLayer = window.dataLayer || [];
templates/partials/footer.html+4−4
@@ -30,23 +30,23 @@
30 <h4 class="mb1">Follow</h4>
30 <h4 class="mb1">Follow</h4>
31 <ul class="list">
31 <ul class="list">
32 <li class="list__item">
32 <li class="list__item">
33− <a class="text-mono" href="#">twitter.com/urbit</a>
33+ <a class="mono" href="https://twitter.com/urbit">twitter.com/urbit</a>
34 </li>
34 </li>
35 <li class="list__item">
35 <li class="list__item">
36− <a class="text-mono" href="#">github.com/urbit</a>
36+ <a class="mono" href="https://github.com/urbit/">github.com/urbit</a>
37 </li>
37 </li>
38 </ul>
38 </ul>
39 </section>
39 </section>
40 <section class="mb6">
40 <section class="mb6">
41 <h4 class="mb1">Contact</h4>
41 <h4 class="mb1">Contact</h4>
42− <a class="text-mono" href="mailto:support@urbit.org">support@urbit.org</a>
42+ <a class="mono" href="mailto:support@urbit.org">support@urbit.org</a>
43 </section>
43 </section>
44 <section class="mb6">
44 <section class="mb6">
45 <h4 class="mb1">Company</h4>
45 <h4 class="mb1">Company</h4>
46 <ul class="list">
46 <ul class="list">
47 {% for item in config.extra.urbit_footer %}
47 {% for item in config.extra.urbit_footer %}
48 <li class="list__item">
48 <li class="list__item">
49− <a class="text-mono" href="{{ item.url | replace(from="$BASE_URL", to=config.base_url) }}">
49+ <a class="mono" href="{{ item.url | replace(from="$BASE_URL", to=config.base_url) }}">
50 {{ item.name }}
50 {{ item.name }}
51 </a>
51 </a>
52 </li>
52 </li>
templates/partials/navigation.html+4−4
@@ -22,23 +22,23 @@
22 <h4 class="mb1">Follow</h4>
22 <h4 class="mb1">Follow</h4>
23 <ul class="list">
23 <ul class="list">
24 <li class="list__item">
24 <li class="list__item">
25− <a class="text-mono" href="#">twitter.com/urbit</a>
25+ <a class="mono" href="#">twitter.com/urbit</a>
26 </li>
26 </li>
27 <li class="list__item">
27 <li class="list__item">
28− <a class="text-mono" href="#">github.com/urbit</a>
28+ <a class="mono" href="#">github.com/urbit</a>
29 </li>
29 </li>
30 </ul>
30 </ul>
31 </section>
31 </section>
32 <section class="mb6">
32 <section class="mb6">
33 <h4 class="mb1">Contact</h4>
33 <h4 class="mb1">Contact</h4>
34− <a class="text-mono" href="mailto:support@urbit.org">support@urbit.org</a>
34+ <a class="mono" href="mailto:support@urbit.org">support@urbit.org</a>
35 </section>
35 </section>
36 <section class="mb6">
36 <section class="mb6">
37 <h4 class="mb1">Company</h4>
37 <h4 class="mb1">Company</h4>
38 <ul class="list">
38 <ul class="list">
39 {% for item in config.extra.urbit_footer %}
39 {% for item in config.extra.urbit_footer %}
40 <li class="list__item">
40 <li class="list__item">
41− <a class="text-mono" href="{{ item.url | replace(from="$BASE_URL", to=config.base_url) }}">
41+ <a class="mono" href="{{ item.url | replace(from="$BASE_URL", to=config.base_url) }}">
42 {{ item.name }}
42 {{ item.name }}
43 </a>
43 </a>
44 </li>
44 </li>
templates/primer.html+1
@@ -9,6 +9,7 @@
9 <title>{{ config.title }}</title>
9 <title>{{ config.title }}</title>
10 <!-- stylesheets -->
10 <!-- stylesheets -->
11 <link rel="stylesheet" href="{{ config.base_url }}/styles.css" >
11 <link rel="stylesheet" href="{{ config.base_url }}/styles.css" >
12+ <link rel="stylesheet" href="{{ config.base_url }}/primer.css" >
12</head>
13</head>
13<body>
14<body>
14 <div class="bg-black pt-30 mb-30">
15 <div class="bg-black pt-30 mb-30">