Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,8 @@ module.exports = function (grunt) {
'cssmin',
'uglify',
'filerev',
'usemin'
'usemin',
'htmlmin'
])

grunt.registerTask('serve', 'start the server and preview your app', function (target) {
Expand Down
12 changes: 5 additions & 7 deletions _app/_includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,23 @@

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
{% assign technology = site.data | get_tech: page.path %}
{% assign tech_info = site.data._data.technologies | where_exp: "tech", "tech.slug == technology" | first %}

<meta name="description" content="{% if page.description %}{{ page.description | markdownify | strip_html | strip_newlines }}{% elsif page.excerpt %}{{ page.excerpt | strip_html | truncate: 155 }}{% elsif tech_info.header_subtitle %}{{tech_info.header_subtitle}}{% else %}{{ site.description }}{% endif %}">
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700|Montserrat:400,600,700|Overpass+Mono:300,400,600,700" rel="stylesheet" type="text/css">

<!-- build:css(.tmp) {{ site.baseurl }}/css/main.css -->
<link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
<!-- endbuild -->

<meta name="description" content="{% if page.description %}{{ page.description | markdownify | strip_html | strip_newlines }}{% elsif page.excerpt %}{{ page.excerpt | strip_html | truncate: 155 }}{% elsif tech_info.header_subtitle %}{{tech_info.header_subtitle}}{% else %}{{ site.description }}{% endif %}">
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">

<meta property="og:title" content="{% if page.title %}{{ page.title | escape }} — {% endif %}{{ site.title | escape }}"/>
<meta property="og:description" content="{% if page.description %}{{ page.description | markdownify | strip_html | strip_newlines }}{% elsif page.excerpt %}{{ page.excerpt | strip_html | truncate: 155 }}{% elsif tech_info.header_subtitle %}{{tech_info.header_subtitle}}{% else %}{{ site.description }}{% endif %}">
<meta property="og:type" content="website"/>
<meta property="og:url" content="{{site.url}}{{site.baseurl}}{{ page.url }}"/>
<!-- <meta property="og:image" content="{% if page.image %}{{ site.baseurl }}{{page.image}}{% else %}{{ site.baseurl }}/img/carto-icon.png{% endif %}"/> -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,500,600,700" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Overpass+Mono:300,400,600,700" rel="stylesheet" type="text/css">

</head>
24 changes: 9 additions & 15 deletions _app/_includes/icons/button-icons/airship-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 8 additions & 14 deletions _app/_includes/icons/button-icons/carto-js-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 6 additions & 13 deletions _app/_includes/icons/button-icons/sql-api-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions _app/_includes/reference/description_detail.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{% assign next_index = forloop.index0 | plus: 1 %}
{% assign prev_index = forloop.index0 | minus: 1 %}
{% if include.d.type == 'text' %}
{{include.d.value}}
{{include.d.value | escape}}
{% elsif include.d.type == 'root' %}
{% include reference/description.html desc=include.d.children %}
{% elsif include.d.type == 'linkReference' %}
{% if include.p[next_index].type == 'link' %}
<a href="{{include.p[forloop.index].url}}" target= "_blank">{% include reference/description.html desc=include.d.children %}</a>
<a href="{{include.p[forloop.index].url }}" target= "_blank">{% include reference/description.html desc=include.d.children %}</a>
{% else %}
[{% include reference/description.html desc=include.d.children %}]
{% endif %}
{% elsif include.d.type == 'strong' %}
<strong>{{include.d.children[0].value}}</strong>
<strong>{{include.d.children[0].value | escape}}</strong>
{% elsif include.d.type == 'link' and include.p[prev_index].type != 'linkReference' %}
{% if include.d.url contains 'http' %}
<a href="{{ include.d.url}}" target= "_blank" class="is-semibold is-DocsGreen">{{ include.d.children[0].value }}</a>
<a href="{{ include.d.url }}" target= "_blank" class="is-semibold is-DocsGreen">{{ include.d.children[0].value | escape }}</a>
{% else %}
<a href="{{ include.d.url | prepend: '#' | remove: '.' | downcase}}" class="is-semibold is-DocsGreen">{{ include.d.children[0].value }}</a>
<a href="{{ include.d.url | prepend: '#' | remove: '.' | downcase }}" class="is-semibold is-DocsGreen">{{ include.d.children[0].value | escape }}</a>
{% endif %}
{% elsif include.d.type == 'inlineCode' %}
<code>{{ include.d.value }}</code>
Expand All @@ -31,7 +31,7 @@
{% endhighlight %}
{% endif %}
{% elsif include.d.type == 'html' %}
{{ include.d.value }}
{{ include.d.value }}
{% elsif include.d.type == 'paragraph' %}
{% for item in include.d %}
{% include reference/description.html desc = item %}
Expand Down
2 changes: 2 additions & 0 deletions _app/_includes/reference/example_tab.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<div class="js-tab-example js-tab-javascript tab-example">
{% endif %}
<code class="example-title">Example</code>
<!-- htmlmin:ignore -->
<code class="example-title">{{ caption | remove: '(String)'}}</code>
<!-- htmlmin:ignore -->
<div id="{{include.id}}-{{forloop.index}}">
{% highlight javascript linenos %}
{{ example.description }}
Expand Down
24 changes: 16 additions & 8 deletions _app/_sass/components/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
.Navbar-header,
.Navbar-buttonMenu {
z-index: 400;
.Logo {
transition: unset;
}
}

.NavbarMobile {
Expand Down Expand Up @@ -93,14 +96,14 @@
}

/* to fix in hangar */
.Navbar-list {
padding-right: 40px;

&> li:last-child {
position: absolute;
right: 0;
}
}
// .Navbar-list {
// padding-right: 40px;

// &> li:last-child {
// position: absolute;
// right: 0;
// }
// }
}

.Dropdown--right {
Expand All @@ -114,6 +117,11 @@
}
}

.Dropdown--new {
opacity: 0;
transition: none;
}

/* search */
.search-form {
margin-left: 12px;
Expand Down
Loading