Skip to content

Commit ab5f896

Browse files
szarnyasgszarnyasg
authored
Merge pull request #302 from Franz-Kafka/main
Updated Icons and SCSS Sync
2 parents 328ae79 + 32cf0f7 commit ab5f896

36 files changed

+1314
-580
lines changed

‎_config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,7 @@ toc:
7575
max_level: 3
7676
ordered_list: false
7777

78+
sass:
79+
style: compressed
80+
7881
exclude: ['Gemfile', 'Gemfile.lock', 'node_modules', 'vendor/bundle', 'vendor/cache', 'vendor/gems', 'vendor/ruby', 'bundle']

‎_includes/icons/sprite.svg‎

Lines changed: 410 additions & 362 deletions
Loading

‎_includes/menu_secondary.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{% if myurl == 'https' or myurl == 'http:' %}
1313
<div class="external"><a href="{{ mainentry.url }}" target="_blank" class="{{ mainentry.page | downcase }}">{{ mainentry.page }} {% if mainentry.page == 'GitHub' and site.star_count %} <!--<span class="starcount">{{ site.star_count }}</span>-->{% endif %}</a></div>
1414
{% else %}
15-
<div><a href="{{ site.baseurl }}{{ mainentry.url | replace: '/docs', archive_url_slug }}">{{ mainentry.page }}</a></div>
15+
<div><a href="{{ site.baseurl }}{{ mainentry.url | replace: '/docs', archive_url_slug }}">{{ mainentry.page }}</a>{% if mainentry.subfolderitems[0] %}<svg class="icon chevron-down"><use href="#chevron-down"></use></svg>{% endif %}</div>
1616
{% endif %}
1717
{% else %}<a href="{{ site.baseurl }}{{ mainentry.url }}">{{ mainentry.page }}</a>{% endif %}
1818
{% if mainentry.subfolderitems[0] %}</div>{% endif %}

‎_includes/menu_sidebar.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
{%- if url_contains %} active opened{% endif -%}
2929
{%- if item.mainfolderitems[0] %} hasSub{% endif -%}
3030
">
31-
{% if item.url %} <a href="{{ base_slash }}{{ site.baseurl }}{{starting_url}}{{item.slug}}{{ item.url }}">{{ item.page }}</a> {% if item.mainfolderitems[0] %} <span class="show"></span> {% endif %} {% else %} {% if item.mainfolderitems[0] %} <span class="show"></span> {% endif %} {{ item.page }} {% endif %} </li>
31+
{% if item.url %} <a href="{{ base_slash }}{{ site.baseurl }}{{starting_url}}{{item.slug}}{{ item.url }}">{{ item.page }}</a> {% if item.mainfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {% else %} {% if item.mainfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {{ item.page }} {% endif %} </li>
3232

3333
{% if item.mainfolderitems[0] %}
3434
<ul style="display: {% if url_contains %}block;{% else %}none{% endif %}">
@@ -41,7 +41,7 @@
4141
{%- if mainentry.subfolderitems[0] %} hasSub{% endif -%}
4242
{%- if mainentry.open or url_parts contains mainentry.url or url_parts contains mainentry.slug %} opened{% endif -%}
4343
">
44-
{% if mainentry.url %} <a href="{{ site.baseurl }}/{{starting_url}}{{item.slug}}{{ mainentry.url }}">{{ mainentry.page }}</a> {% if mainentry.subfolderitems[0] %} <span class="show"></span> {% endif %} {% else %} {{ mainentry.page }} {% if mainentry.subfolderitems[0] %} <span class="show"></span> {% endif %} {% endif %} </li>
44+
{% if mainentry.url %} <a href="{{ site.baseurl }}/{{starting_url}}{{item.slug}}{{ mainentry.url }}">{{ mainentry.page }}</a> {% if mainentry.subfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {% else %} {{ mainentry.page }} {% if mainentry.subfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {% endif %} </li>
4545
{% if mainentry.subfolderitems[0] %}
4646
<ul style="display:{% if mainentry.open or url_parts contains mainentry.url or url_parts contains mainentry.slug %}block{% else %}none{% endif %};">
4747
{% for entry in mainentry.subfolderitems %}
@@ -51,7 +51,7 @@
5151
{%- if entry.subsubfolderitems[0] %} hasSub{% endif -%}
5252
{%- if entry.open or url_parts contains entry.url or url_parts contains entry.slug %} opened{% endif -%}
5353
">
54-
{% if entry.url %} <a href="{{ site.baseurl }}/{{starting_url}}{{item.slug}}{{mainentry.slug}}/{{ entry.url }}">{{ entry.page }}</a> {% if entry.subsubfolderitems[0] %} <span class="show"></span> {% endif %} {% else %} {{ entry.page }} {% if entry.subsubfolderitems[0] %} <span class="show"></span> {% endif %} {% endif %}
54+
{% if entry.url %} <a href="{{ site.baseurl }}/{{starting_url}}{{item.slug}}{{mainentry.slug}}/{{ entry.url }}">{{ entry.page }}</a> {% if entry.subsubfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {% else %} {{ entry.page }} {% if entry.subsubfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {% endif %}
5555
</li>
5656
{% endif %}
5757
{% if entry.subsubfolderitems[0] %}
@@ -87,7 +87,7 @@
8787
{%- if pageUrl contains item.url %} opened{% endif -%}
8888
">
8989

90-
{% if item.url %} <a href="{{ site.baseurl }}{{ item.url }}">{{ item.page }}</a> {% if item.mainfolderitems[0] %} <span class="show"></span> {% endif %} {% else %} {{ item.page }} {% if item.mainfolderitems[0] %} <span class="show"></span> {% endif %} {% endif %} </li>
90+
{% if item.url %} <a href="{{ site.baseurl }}{{ item.url }}">{{ item.page }}</a> {% if item.mainfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {% else %} {{ item.page }} {% if item.mainfolderitems[0] %} <svg class="show"><use href="#chevron-right"></use></svg> {% endif %} {% endif %} </li>
9191
{% endfor %}
9292
{% endif %}
9393

‎_layouts/default.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<title>{{ page.title }} – DuckLake</title>
1212
{% endif %}
1313

14-
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.data['hash'] }}">
14+
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.time | date: '%s' }}">
1515
{% if page.add_css %}
16-
<link rel="stylesheet" href="{{ site.baseurl }}/css/{{ page.add_css }}?{{ site.data['hash'] }}">
16+
<link rel="stylesheet" href="{{ site.baseurl }}/css/{{ page.add_css }}?{{ site.time | date: '%s' }}">
1717
{% endif %}
1818

1919
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicon/favicon-96x96.png" sizes="96x96" />
@@ -26,7 +26,7 @@
2626

2727
{% seo title=false %}
2828

29-
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.data['hash'] }}"></script>
29+
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.time | date: '%s' }}"></script>
3030
</head>
3131
<body class="layout_default{% if page.body_class %} {{ page.body_class }}{% endif %}">
3232

@@ -123,7 +123,7 @@ <h5>In this article</h5>
123123
<script src="{{ site.baseurl }}/js/search.js" defer></script>
124124
<script src="{{ site.baseurl }}/js/jquery-3.5.1.min.js" defer></script>
125125
<script src="{{ site.baseurl }}/js/copy_button.js" defer></script>
126-
<script src="{{ site.baseurl }}/js/script.js?{{ site.data['hash'] }}" defer></script>
126+
<script src="{{ site.baseurl }}/js/script.js?{{ site.time | date: '%s' }}" defer></script>
127127

128128
</body>
129129
</html>

‎_layouts/docu.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
{% endif %}
1111

1212
<script src="{{ site.baseurl }}/js/jquery-3.5.1.min.js"></script>
13-
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.data['hash'] }}">
13+
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.time | date: '%s' }}">
1414
{% if page.railroad and page.railroad != "" and page.railroad != nil %}
15-
<link rel="stylesheet" href="{{ site.baseurl }}/css/railroad.css?{{ site.data['hash'] }}">
15+
<link rel="stylesheet" href="{{ site.baseurl }}/css/railroad.css?{{ site.time | date: '%s' }}">
1616
{% endif %}
1717

1818
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicon/favicon-96x96.png" sizes="96x96" />
@@ -25,7 +25,7 @@
2525

2626
{% seo title=false %}
2727

28-
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.data['hash'] }}"></script>
28+
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.time | date: '%s' }}"></script>
2929
</head>
3030

3131
{% comment %} By default, we assume that the users is interested in the stable version. {% endcomment %}
@@ -83,7 +83,7 @@
8383
{% assign version_viewed_pretty = version_viewed %}
8484
{% endif %}
8585

86-
<div><span class="selectedversion" data-current="{{ version_viewed_pretty }}">{{ version_viewed_pretty }}</span><span class="arrow"></div>
86+
<div><span class="selectedversion" data-current="{{ version_viewed_pretty }}">{{ version_viewed_pretty }}</span><svg class="arrow"><use href="#chevron-down"></use></svg></div>
8787
<div class="versionsidebar">
8888
<ul>
8989
{% comment %} Remove the leading part, e.g., "docs/stable" or "docs/1.0" (version number) {% endcomment %}
@@ -186,16 +186,16 @@ <h5>In this article</h5>
186186
{% include icons.html %}
187187
</div>
188188

189-
<script src="{{ site.baseurl }}/js/minisearch.js?{{ site.data['hash'] }}" defer></script>
190-
<script src="{{ site.baseurl }}/js/search.js?{{ site.data['hash'] }}" defer></script>
189+
<script src="{{ site.baseurl }}/js/minisearch.js?{{ site.time | date: '%s' }}" defer></script>
190+
<script src="{{ site.baseurl }}/js/search.js?{{ site.time | date: '%s' }}" defer></script>
191191

192-
<script src="{{ site.baseurl }}/js/script.js?{{ site.data['hash'] }}" defer></script>
193-
<script src="{{ site.baseurl }}/js/copy_button.js?{{ site.data['hash'] }}" defer></script>
194-
<script src="{{ site.baseurl }}/js/noteboxes.js?{{ site.data['hash'] }}" defer></script>
192+
<script src="{{ site.baseurl }}/js/script.js?{{ site.time | date: '%s' }}" defer></script>
193+
<script src="{{ site.baseurl }}/js/copy_button.js?{{ site.time | date: '%s' }}" defer></script>
194+
<script src="{{ site.baseurl }}/js/noteboxes.js?{{ site.time | date: '%s' }}" defer></script>
195195

196196
{% if page.body_class == "installation" %}
197197
<script src="{{ site.baseurl }}/js/js-yaml.min.js" defer></script>
198-
<script src="{{ site.baseurl }}/js/installation.js?{{ site.data['hash'] }}" defer></script>
198+
<script src="{{ site.baseurl }}/js/installation.js?{{ site.time | date: '%s' }}" defer></script>
199199
{% endif %}
200200
{% if page.railroad and page.railroad != "" and page.railroad != nil %}
201201
<script src="{{ site.baseurl }}/js/{{ version_viewed }}/railroad.js" defer></script>

‎_layouts/post.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</script>
1717
{% endif %}
1818

19-
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.data['hash'] }}">
19+
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.time | date: '%s' }}">
2020

2121
<link rel="apple-touch-icon" sizes="180x180" href="{{ site.baseurl }}/images/favicon/apple-touch-icon.png">
2222
<link rel="manifest" href="{{ site.baseurl }}/images/favicon/site.webmanifest">
@@ -35,7 +35,7 @@
3535
{% seo title=false %}
3636
{% endif %}
3737

38-
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.data['hash'] }}"></script>
38+
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.time | date: '%s' }}"></script>
3939
</head>
4040
<body class="post layout_post{% if page.body_class %} {{ page.body_class }}{% endif %}">
4141

@@ -141,9 +141,9 @@ <h5>In this article</h5>
141141

142142
<script src="{{ site.baseurl }}/js/jquery-3.5.1.min.js" defer></script>
143143
<script src="{{ site.baseurl }}/js/isotope.pkgd.min.js" defer></script>
144-
<script src="{{ site.baseurl }}/js/script.js?{{ site.data['hash'] }}" defer></script>
144+
<script src="{{ site.baseurl }}/js/script.js?{{ site.time | date: '%s' }}" defer></script>
145145
<script src="{{ site.baseurl }}/js/copy_button.js" defer></script>
146-
<script src="{{ site.baseurl }}/js/noteboxes.js?{{ site.data['hash'] }}" defer></script>
146+
<script src="{{ site.baseurl }}/js/noteboxes.js?{{ site.time | date: '%s' }}" defer></script>
147147

148148
</body>
149149
</html>

‎_layouts/postarchive.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<title>{{ page.title }} – DuckLake</title>
1010
{% endif %}
1111

12-
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.data['hash'] }}">
12+
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css?{{ site.time | date: '%s' }}">
1313

1414
<link rel="icon" type="image/png" href="{{ site.baseurl }}/images/favicon/favicon-96x96.png" sizes="96x96" />
1515
<link rel="icon" type="image/svg+xml" href="{{ site.baseurl }}/images/favicon/favicon.svg" />
@@ -30,7 +30,7 @@
3030
{% seo title=false %}
3131
{% endif %}
3232

33-
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.data['hash'] }}"></script>
33+
<script src="{{ site.baseurl }}/js/determine_color_scheme.js?{{ site.time | date: '%s' }}"></script>
3434
</head>
3535
<body class="layout_postarchive{% if page.body_class %} {{ page.body_class }}{% endif %}">
3636

@@ -82,9 +82,9 @@ <h1>{{ page.title }}</h1>
8282

8383
<script src="{{ site.baseurl }}/js/jquery-3.5.1.min.js" defer></script>
8484
<script src="{{ site.baseurl }}/js/isotope.pkgd.min.js" defer></script>
85-
<script src="{{ site.baseurl }}/js/script.js?{{ site.data['hash'] }}" defer></script>
85+
<script src="{{ site.baseurl }}/js/script.js?{{ site.time | date: '%s' }}" defer></script>
8686
<script src="{{ site.baseurl }}/js/copy_button.js" defer></script>
87-
<script src="{{ site.baseurl }}/js/noteboxes.js?{{ site.data['hash'] }}" defer></script>
87+
<script src="{{ site.baseurl }}/js/noteboxes.js?{{ site.time | date: '%s' }}" defer></script>
8888

8989
</body>
9090
</html>

‎_sass/abstracts/_mixins.scss‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@
124124
font-family: "SuisseIntl", sans-serif;
125125
}
126126

127+
@mixin micro {
128+
font-size: var(--type-micro, 10px);
129+
font-weight: var(--type-weight-standard, 450);
130+
line-height: 1.2;
131+
letter-spacing: 0.005em;
132+
font-family: "SuisseIntl", sans-serif;
133+
}
134+
127135
@mixin pre-title {
128136
font-size: var(--type-pre-title, 13px);
129137
text-transform: uppercase;
@@ -234,16 +242,16 @@
234242
}
235243
&.arrow-right{
236244
&:after{
237-
/*background-image: url("data:image/svg+xml,%3Csvg width='13' height='9' viewBox='0 0 13 9' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M12.472 4.64599L8.146 8.99999L7.25 8.07599L10.008 5.33199H0V3.97399H10.036L7.25 1.21599L8.146 0.291992L12.472 4.64599Z' fill='black'/%3E%3C/svg%3E%0A");
245+
mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' viewBox='0 0 12 12'%3E%3Cpath stroke='%23000' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.6' d='M2.5 6h7m0 0L6 2.5M9.5 6 6 9.5'/%3E%3C/svg%3E");
238246
content: "";
239-
width: 13px;
240-
height: 9px;
241-
background-size: contain;
247+
width: 12px;
248+
height: 12px;
249+
mask-size: contain;
242250
display: inline-block;
243-
*/
244251
margin-left: 5px;
245252
transition: all .25s;
246-
content: "→";
253+
background-color: currentColor;
254+
vertical-align: -.07em;
247255
}
248256
&:hover:after{
249257
margin-left: 12px;
@@ -261,20 +269,19 @@
261269
display: inline;
262270
&.arrow-right{
263271
&:after{
264-
/*
265-
background-image: url("data:image/svg+xml,%3Csvg width='13' height='9' viewBox='0 0 13 9' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M12.472 4.64599L8.146 8.99999L7.25 8.07599L10.008 5.33199H0V3.97399H10.036L7.25 1.21599L8.146 0.291992L12.472 4.64599Z' fill='black'/%3E%3C/svg%3E%0A");
272+
mask-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' viewBox='0 0 12 12'%3E%3Cpath stroke='%23000' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.6' d='M2.5 6h7m0 0L6 2.5M9.5 6 6 9.5'/%3E%3C/svg%3E");
266273
content: "";
267-
width: 13px;
268-
height: 9px;
269-
background-size: contain;
274+
width: 12px;
275+
height: 12px;
276+
mask-size: contain;
270277
display: inline-block;
271-
*/
272-
content: "→";
273278
margin-left: 5px;
274279
transition: all .25s;
280+
background-color: currentColor;
281+
vertical-align: -.1em;
275282
}
276283
&:hover:after{
277-
margin-left: 12px;
284+
margin-left: 8px;
278285
/*background-image: url("data:image/svg+xml,%3Csvg width='13' height='9' viewBox='0 0 13 9' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M12.472 4.64599L8.146 8.99999L7.25 8.07599L10.008 5.33199H0V3.97399H10.036L7.25 1.21599L8.146 0.291992L12.472 4.64599Z' fill='%237D66FF'/%3E%3C/svg%3E%0A");*/
279286
}
280287
}
@@ -292,7 +299,7 @@
292299
transition: color .3s;
293300
span::after{
294301
content: "→";
295-
font-family: "DuckDB-Symbol";
302+
font-family: "SuisseIntl";
296303
margin-left: 6px;
297304
-webkit-transition: -webkit-transform .3s;
298305
transition: -webkit-transform .3s;
@@ -430,8 +437,14 @@
430437
white-space: pre;
431438
overflow-x: auto;
432439
padding: 15px;
440+
padding-right: 0;
433441
margin: 0;
434442
border-radius: 10px;
443+
444+
> code {
445+
width: fit-content;
446+
padding-right: 15px;
447+
}
435448
}
436449

437450
div.highlighter-rouge + table,

‎_sass/abstracts/_variables.scss‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ html.darkmode {
601601
:root {
602602
--type-weight-standard: 450;
603603
/* Desktop */
604+
--page-element-spacing-small: 20px;
604605
--page-section-padding: 20px;
605606
--page-element-spacing-medium: 25px;
606607
--page-docs-page-padding: 30px;
@@ -610,13 +611,15 @@ html.darkmode {
610611
--page-max-width-small: 750px;
611612
--page-max-width-medium: 950px;
612613
--page-max-width-large: 1150px;
614+
--type-micro: 10px;
613615
--type-label-3: 11px;
614616
--type-label-2: 12px;
615617
--type-tiny: 12px;
616618
--type-pre-title: 13px;
617619
--type-body-small: 14px;
618620
--type-code: 14px;
619621
--type-label-1: 14px;
622+
--type-side-menu: 14px;
620623
--type-title-3: 14px;
621624
--type-menu-items: 15px;
622625
--type-body-normal: 16px;
@@ -638,6 +641,7 @@ html.darkmode {
638641
--type-weight-standard: 400;
639642
/* Mobile */
640643
--page-docs-page-padding: 15px;
644+
--page-element-spacing-small: 15px;
641645
--page-section-padding: 15px;
642646
--page-element-spacing-medium: 20px;
643647
--page-element-spacing-large: 35px;
@@ -646,19 +650,21 @@ html.darkmode {
646650
--page-max-width-medium: 393px;
647651
--page-max-width-small: 393px;
648652
--page-max-width-tiny: 393px;
653+
--type-micro: 9px;
649654
--type-label-3: 11px;
650655
--type-tiny: 11px;
656+
--type-body-small: 12px;
651657
--type-label-2: 12px;
652658
--type-pre-title: 12px;
653-
--type-body-small: 13px;
654659
--type-code: 13px;
655660
--type-label-1: 13px;
661+
--type-side-menu: 13px;
656662
--type-title-3: 13px;
657663
--type-body-normal: 14px;
658-
--type-menu-items: 14px;
659664
--type-code-large: 15px;
660665
--type-title-2: 15px;
661666
--type-body-large: 16px;
667+
--type-menu-items: 16px;
662668
--type-title-1: 16px;
663669
--type-headline-3: 19px;
664670
--type-headline-2: 23px;

0 commit comments

Comments
 (0)