Skip to content

Commit 68b8b77

Browse files
authored
Refreshed look with new logos (#830)
* New logos Contributes to #651 * Add favicon.ico * og_image (from site-shared branch) * Remove test config * Update submodule so it refers to the updated master * Update dartpad hello world image Note: The Dart logo hasn't been updated yet for Dartpad, but this refreshes the image and places it in the assets images folder. * Drop unused images with old logo * Remove top-level twitter folder * Feedback from Kathy, and corrected $brand-primary color
1 parent 56891b3 commit 68b8b77

36 files changed

+41
-138
lines changed

_config.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ plugins:
116116
# Increment this global og:image URL version number (used as a query parameter)
117117
# when you update any og:image file. (Also increment the corresponding number
118118
# in the `firebase.json` redirect rule.)
119-
og_image_vers: "?1"
119+
og_image_vers: "?2"
120120

121121
assets:
122122
# compress:
@@ -126,7 +126,7 @@ assets:
126126
# cdn: https://cdn.example.com
127127
# skip_baseurl_with_cdn: false
128128
# skip_prefix_with_cdn: false
129-
prefix: "/assets"
129+
prefix: /assets
130130
assets:
131131
- "*.png"
132132
- "*.jpg"
@@ -135,7 +135,6 @@ assets:
135135
- "*.woff"
136136
- "*.woff2"
137137
- "*.svg"
138-
digest: true
139138
sources:
140139
- _assets/icons
141140
- _assets/images

_config_dev.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Site settings for development mode
22
url: https://dartlang-org-dev.firebaseapp.com
3+
# url: https://dartlang-org-staging-0.firebaseapp.com
34
# url: http://localhost:4000
45

56
# webdev: "http://localhost:4001"

firebase.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@
276276
"type": 301
277277
},
278278
{
279-
"source": "/assets/dart-logo-for-shares-*.png",
280-
"destination": "/assets/dart-logo-for-shares.png?1",
279+
"source": "/assets/dart-logo-for-shares*.png",
280+
"destination": "/assets/shared/dart-logo-for-shares.png?2",
281281
"type": 301
282282
},
283283
{

site-shared

-5.18 KB
Binary file not shown.
-10.8 KB
Binary file not shown.

src/_assets/images/dart-logo.png

-5.77 KB
Binary file not shown.

src/_assets/images/dartpad-hello.png

234 KB
Loading

src/_assets/images/flutter-logo.png

-19.5 KB
Binary file not shown.
-6.24 KB
Binary file not shown.

src/_assets/images/logo-no-wordmark.svg

-23
This file was deleted.

src/_assets/images/logo-white.svg

-34
This file was deleted.

src/_assets/images/logo.svg

-33
This file was deleted.

src/_assets/images/shared

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../site-shared/src/_assets/images

src/_assets/stylesheets/_variables.scss

+8-9
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@ $teal: #1FBAAC;
1313
$blue: #1b87c9;
1414
$blue-light: #e2f4fd;
1515

16-
$brand-primary: #1155cc;
16+
$brand-primary: #0175C2;
1717

18-
// Blue color taken from gmail's stylesheet.
19-
$default-link: #1155cc;
20-
$default-link-visited: #1155cc;
18+
$default-link: #0175C2;
19+
$default-link-visited: #0175C2;
2120

22-
// Typeography
23-
$font-family-base: 'Source Sans Pro', sans-serif;
24-
$font-family-condensed: 'Trade Gothic W01', sans-serif;
25-
$font-family-extended: 'Trade Gothic W01', sans-serif;
26-
$font-family-serif: 'Trade Gothic W01', sans-serif;
21+
// Typography
22+
$font-family-base: Roboto, sans-serif;
23+
// $font-family-condensed: 'Trade Gothic W01', sans-serif;
24+
// $font-family-extended: 'Trade Gothic W01', sans-serif;
25+
// $font-family-serif: 'Trade Gothic W01', sans-serif;
2726

2827
$font-family-monospace: Menlo, "Bitstream Vera Sans Mono", "DejaVu Sans Mono", Monaco, Consolas, monospace;
2928

src/_assets/stylesheets/main.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ pre {
139139
// display: block;
140140
// z-index: 10;
141141
// background-color: $white-base;
142-
// background-image: url('{% asset_path "logo-no-wordmark.svg" %}');
142+
// background-image: url('{% asset_path "shared/dart/logo/default.svg" %}');
143143
// background-size: 18px;
144144
// background-position: 7px center;
145145
// background-repeat: no-repeat;
@@ -710,7 +710,7 @@ main .content {
710710
left: 10px;
711711
width: 18px;
712712
height: 18px;
713-
background-image: url('{% asset_path "logo-no-wordmark.svg" %}');
713+
background-image: url('{% asset_path "shared/dart/logo/default.svg" %}');
714714
background-size: cover;
715715
background-position: center center;
716716
background-repeat: no-repeat;

src/_guides/platforms.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,31 @@ featured apps. Whether you're creating a mobile app, web app, command-line scrip
1111
or server, there's a Dart solution for that.
1212

1313
{:.card-grid}
14-
- {:.card.narrow}[![Flutter logo][]{: width="100px"}][Flutter]{:.no-automatic-external}
14+
- {:.card.narrow}[![Flutter logo][]{: width="100"}][Flutter]{:.no-automatic-external}
1515
{:.logo}
1616

1717
### [Flutter][]
1818

1919
Write a mobile app that runs on both iOS and Android.
2020

21-
- {:.card.narrow}[![Web logo][]{: width="100px"}][Web]{:.no-automatic-external}
21+
- {:.card.narrow}[![Web logo][]{: width="100"}][Web]{:.no-automatic-external}
2222
{:.logo}
2323

2424
### [Web][]
2525

2626
Write an app that runs in any modern web browser.
2727

28-
- {:.card.narrow}[![Dart logo][]{: width="100px"}][Dart VM]{:.no-automatic-external}
28+
- {:.card.narrow}[![Dart logo][]{: width="100"}][Dart VM]{:.no-automatic-external}
2929
{:.logo}
3030

3131
### [Dart VM][]
3232

3333
Write a command-line app or server.
3434

3535

36-
[Dart logo]: {% asset_path 'dart-logo.png' %}
36+
[Dart logo]: {% asset_path 'shared/dart/logo/default.svg' %}
3737
[Dart VM]: {{site.dart_vm}}
3838
[Flutter]: {{site.flutter}}
39-
[Flutter logo]: {% asset_path 'flutter-logo.png' %}
40-
[Web logo]: {% asset_path 'angulardart-logo.png' %}
39+
[Flutter logo]: {% asset_path 'shared/flutter/logo/square.svg' %}
4140
[Web]: {{site.webdev}}
41+
[Web logo]: {% asset_path 'shared/angular/logo/square.svg' %}

src/_includes/flutter-packages.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<aside class="alert alert-warning"><div class="alert-with-image">
2-
<img src="{% asset_path flutter-logo.png %}" alt="[Flutter]">
2+
<img src="{% asset_path shared/flutter/logo/default.svg %}" alt="[Flutter]">
33
<div markdown="1">
44
**Important:**
55
The Flutter SDK has its own commands for managing and updating packages.

src/_includes/head.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<meta property="og:title" content="{{ page.title }}" />
2626
<meta property="og:description" content="{{desc}}" />
2727
<meta property="og:url" content="{{ page.url | absolute_url }}" />{%
28-
assign og_image_path = page.og_image | default: layout.og_image | default: '/assets/dart-logo-for-shares.png' %}{%
28+
assign og_image_path = page.og_image | default: layout.og_image | default: '/assets/shared/dart-logo-for-shares.png' %}{%
2929
assign og_type = page.og_type | default: layout.og_type
3030
%}{% comment %}
3131
Add page URL to page relative paths

src/_includes/navigation-main.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<nav id="mainnav">
22
<div id="menu-toggle"><i class="icon icon-menu"></i></div>
33
<a href="/" class="brand" title="{{ site.title }}">
4-
<img src="{% asset_path 'logo.svg' %}" alt="{{ site.title }}">
4+
<img src="{% asset_path 'shared/dart/logo+text/horizontal/default.svg' %}" alt="{{ site.title }}">
55
</a>
66
<ul>
77
<li class="mainnav__get-started"><a href="/guides/get-started"><span>Get Started</span></a></li>

src/_includes/navigation-side.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div id="sidenav" class="">
22
<div class="content">
33
<a href="/" class="brand" title="{{ site.title }}">
4-
<img src="{% asset_path 'logo.svg' %}" alt="{{ site.title }}">
4+
<img src="{% asset_path 'shared/dart/logo+text/horizontal/default.svg' %}" alt="{{ site.title }}">
55
</a>
66

77
<div class="sidenav__search">

src/_includes/page-footer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="col-sm-12 col-md-3">
55
<div class="content">
66
<div class="brand">
7-
<img src="{% asset_path 'logo-white.svg' %}" alt="Dart logo" class="brand"/>
7+
<img src="{% asset_path 'shared/dart/logo+text/horizontal/white.svg' %}" alt="Dart logo" class="brand"/>
88
</div>
99
<h4><a href="/terms">Terms</a> | <a href="http://www.google.com/intl/en/policies/privacy/">Privacy</a></h4>
1010
<style>.menu .material-icons { font-size: 14px; }</style>

src/_tutorials/images/banner.png

-144 KB
Binary file not shown.
-68.3 KB
Binary file not shown.

src/assets/dart-logo-for-shares.png

-14 KB
Binary file not shown.

src/assets/shared

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../site-shared/src/assets
Binary file not shown.
Binary file not shown.

src/favicon.ico

93.9 KB
Binary file not shown.

src/install.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ simple app, once you're ready to develop real apps, you need an SDK.
1010
Install the SDK for your platform.
1111

1212
{:.card-grid}
13-
- {:.card.narrow}[![Flutter logo][]{: width="100px"}][Flutter install]{:.no-automatic-external}
13+
- {:.card.narrow}[![Flutter logo][]{: width="100"}][Flutter install]{:.no-automatic-external}
1414
{:.logo}
1515

1616
### [Flutter][Flutter install]
1717

1818
Get the Flutter SDK.
1919

20-
- {:.card.narrow}[![Web logo][]{: width="100px"}][Web install]{:.no-automatic-external}
20+
- {:.card.narrow}[![Web logo][]{: width="100"}][Web install]{:.no-automatic-external}
2121
{:.logo}
2222

2323
### [Web][Web install]
2424

2525
[Get the Dart SDK][Web install] plus [web-specific tools.]({{site.webdev}}/tools)
2626

27-
- {:.card.narrow}[![Dart logo][]{: width="100px"}][Dart install]{:.no-automatic-external}
27+
- {:.card.narrow}[![Dart logo][]{: width="100"}][Dart install]{:.no-automatic-external}
2828
{:.logo}
2929

3030
### [Dart VM][Dart install]
@@ -33,11 +33,11 @@ Install the SDK for your platform.
3333

3434
[DartPad]: {{site.custom.dartpad.direct-link}}
3535
[Dart install]: /tools/sdk#install
36-
[Dart logo]: {% asset_path 'dart-logo.png' %}
36+
[Dart logo]: {% asset_path 'shared/dart/logo/default.svg' %}
3737
[Dart VM]: {{site.dart_vm}}
3838
[Flutter]: {{site.flutter}}
3939
[Flutter install]: {{site.flutter}}/setup/
40-
[Flutter logo]: {% asset_path 'flutter-logo.png' %}
40+
[Flutter logo]: {% asset_path 'shared/flutter/logo/square.svg' %}
4141
[Web]: {{site.webdev}}
4242
[Web install]: /tools/sdk#install {% comment %}TODO: link to webdev install page{% endcomment %}
43-
[Web logo]: {% asset_path 'angulardart-logo.png' %}
43+
[Web logo]: {% asset_path 'shared/angular/logo/square.svg' %}

src/tools/dartpad.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ is an open-source tool that
1010
lets you play with the Dart language in any modern browser.
1111
Here's what DartPad looks like:
1212

13-
<img src="images/DartPadWindow.png" alt="DartPad screenshot" />
13+
<img src="{% asset_path dartpad-hello.png %}" alt="DartPad Hello World" />
1414

1515

1616
## Library support
@@ -177,7 +177,7 @@ to view the version number firstly go to the Dart editor.
177177

178178
<ol>
179179
<li>
180-
Click the <b>DartPad</b> title,
180+
Click the <b>DartPad</b> title,
181181
which is at the upper left of your DartPad editor.
182182
</li>
183183
<li>
@@ -190,7 +190,7 @@ to view the version number firstly go to the Dart editor.
190190
update-for-dart-2
191191
{% endcomment %}
192192

193-
For example, if DartPad is based on Dart SDK 1.25.0,
193+
For example, if DartPad is based on Dart SDK 1.25.0,
194194
then DartPad partially supports type safety but doesn't support many other Dart 2 features.
195195

196196

src/tools/images/DartPadWindow.png

-37.8 KB
Binary file not shown.

src/tools/pub/package-layout.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
2-
layout: default
3-
title: "Pub Package Layout Conventions"
4-
description: "Learn more about the directory structure used by Dart's package management tool, pub."
2+
title: Pub Package Layout Conventions
3+
description: Learn more about the directory structure used by Dart's package management tool, pub.
54
permalink: /tools/pub/package-layout
65
---
76

@@ -11,7 +10,7 @@ They describe how you organize the files and directories within your
1110
package, and how to name things.
1211

1312
<aside class="alert alert-info"><div class="alert-with-image">
14-
<img src="{% asset_path flutter-logo.png %}" alt="[Flutter]">
13+
<img src="{% asset_path shared/flutter/logo/default.svg %}" alt="[Flutter]">
1514
<div markdown="1">
1615
**Note:**
1716
Flutter apps can use custom directories for their assets.

twitter/Twitter-02.png

-4.26 KB
Binary file not shown.

twitter/colors.txt

-7
This file was deleted.

twitter/twitter_bkgd.png

-54.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)