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
commit69c534711899a0fdc579714177e9c9f99a0e1ef6 authorfriederjanmoerman <hijbrid@gmail.com> dateThu 9 May 2019, 16:55 (7 years ago) parent69f8e86
8 files changed+15−74
sass/_main.scss+1−55 sass/_indigo.scss → sass/indigo.scss+2−2 sass/_primer.scss → sass/primer.scss+1−2 sass/styles.scss−6 templates/base.html+2−1 templates/partials/footer.html+4−4 templates/partials/navigation.html+4−4 templates/primer.html+1
sass/_main.scss+1−55
@@ -13,11 +13,6 @@ a {
1313 color: #000;
1414}
1515
16−* {
17− font-smoothing: antialiased;
18− -webkit-font-smoothing: antialiased;
19−}
20−
2116p img {
2217 margin: 4rem 0;
2318 width: 100%;
@@ -349,12 +344,7 @@ button, .btn {
349344 font-weight: 700;
350345}
351346
352−.text-mono {
353− font-family: "Source Code Pro", "Roboto mono", "Courier New", monospace;
354−}
355−
356347.h-font {
357− font-family: 'Inter UI',-apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
358348 text-transform: lowercase;
359349}
360350
@@ -363,48 +353,8 @@ h1, h2, h3, h4, h5, h6, .text-heading {
363353 font-family: 'Inter UI',-apple-system, BlinkMacSystemFont, Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
364354}
365355
366−h1, .h1 {
367− font-size: 6rem;
368− line-height: 8rem;
369− margin-top: 0;
370−}
371−
372−h2, .h2 {
373− margin: 0;
374− font-size: 5rem;
356+.text-600 {
375357 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;
408358}
409359
410360p, .p {
@@ -420,10 +370,6 @@ p, .p {
420370 }
421371}
422372
423−pre, code, .code-block, .text-code, .text-mono {
424− font-family: "Source Code Pro", "Roboto mono", "Courier New", monospace;
425−}
426−
427373pre, code {
428374 background-color: #eee !important;
429375 color: #000 !important;
sass/_indigo.scss → sass/indigo.scssrenamed+2−2
@@ -20,7 +20,7 @@ html {
2020}
2121body {
2222 margin: 0;
23−}
23+}
2424h1 {
2525 font-size: 2em;
2626 margin: 0.67em 0;
@@ -1992,7 +1992,7 @@ template {
19921992.medium {
19931993 font-weight: 500;
19941994}
1995−.600,
1995+.text-600,
19961996.semibold {
19971997 font-weight: 600;
19981998}
sass/_primer.scss → sass/primer.scssrenamed+1−2
@@ -20,7 +20,7 @@ html {
2020 * Remove default margin.
2121 */
2222body {
23− margin: 0; }
23+ margin: 0; }
2424
2525/* HTML5 display definitions
2626 ========================================================================== */
@@ -13143,7 +13143,6 @@ input[type="number"] {
1314313143TYPOGRAPHY from address collection
1314413144*/
1314513145
13146−@import url('https://rsms.me/inter/inter-ui.css');
1314713146html { font-family: 'Inter UI', sans-serif; }
1314813147@supports (font-variation-settings: normal) {
1314913148 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−
71// custom
82@import "main";
93@import "responsive";
templates/base.html+2−1
@@ -10,7 +10,8 @@
1010 <link rel="icon" type="image/png" href="../images/favicon.ico"/>
1111 <title>{{ config.title }}</title>
1212 <!-- 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">
1415 <script async src="https://www.googletagmanager.com/gtag/js?id=UA-47054188-1"></script>
1516 <script>
1617 window.dataLayer = window.dataLayer || [];
templates/partials/footer.html+4−4
@@ -30,23 +30,23 @@
3030 <h4 class="mb1">Follow</h4>
3131 <ul class="list">
3232 <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>
3434 </li>
3535 <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>
3737 </li>
3838 </ul>
3939 </section>
4040 <section class="mb6">
4141 <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>
4343 </section>
4444 <section class="mb6">
4545 <h4 class="mb1">Company</h4>
4646 <ul class="list">
4747 {% for item in config.extra.urbit_footer %}
4848 <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) }}">
5050 {{ item.name }}
5151 </a>
5252 </li>
templates/partials/navigation.html+4−4
@@ -22,23 +22,23 @@
2222 <h4 class="mb1">Follow</h4>
2323 <ul class="list">
2424 <li class="list__item">
25− <a class="text-mono" href="#">twitter.com/urbit</a>
25+ <a class="mono" href="#">twitter.com/urbit</a>
2626 </li>
2727 <li class="list__item">
28− <a class="text-mono" href="#">github.com/urbit</a>
28+ <a class="mono" href="#">github.com/urbit</a>
2929 </li>
3030 </ul>
3131 </section>
3232 <section class="mb6">
3333 <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>
3535 </section>
3636 <section class="mb6">
3737 <h4 class="mb1">Company</h4>
3838 <ul class="list">
3939 {% for item in config.extra.urbit_footer %}
4040 <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) }}">
4242 {{ item.name }}
4343 </a>
4444 </li>
templates/primer.html+1
@@ -9,6 +9,7 @@
99 <title>{{ config.title }}</title>
1010 <!-- stylesheets -->
1111 <link rel="stylesheet" href="{{ config.base_url }}/styles.css" >
12+ <link rel="stylesheet" href="{{ config.base_url }}/primer.css" >
1213</head>
1314<body>
1415 <div class="bg-black pt-30 mb-30">