这是indexloc提供的服务，不要输入任何密码
Skip to content

update console and docs favicons (close #1485) #1760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 25, 2019
Merged

update console and docs favicons (close #1485) #1760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ef5bdb
update console and docs favicons
rikinsk Mar 13, 2019
68165e4
update favicon on cli template
shahidhk Mar 19, 2019
ce25301
update server console template
shahidhk Mar 19, 2019
2535763
Merge branch 'master' into update-favicons
shahidhk Mar 19, 2019
a50ba6b
update cli assets
shahidhk Mar 19, 2019
8242d8b
Merge branch 'update-favicons' of github.com:rikinsk/graphql-engine i…
shahidhk Mar 19, 2019
178063a
Merge branch 'master' into update-favicons
shahidhk Mar 19, 2019
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
12 changes: 6 additions & 6 deletions cli/assets/assets.go
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cli/assets/unversioned/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html lang="en-us">
<head>
<link rel="icon" type="image/png" href="https://storage.googleapis.com/hasura-graphql-engine/console/assets/favicon.png" />
<link rel="icon" type="image/svg+xml" href="https://graphql-engine-cdn.hasura.io/img/hasura_icon_green.svg" />
<script>
window.__env = {
apiHost: {{.apiHost}},
Expand Down
2 changes: 1 addition & 1 deletion cli/assets/v1.0-alpha/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html lang="en-us">
<head>
<link rel="icon" type="image/png" href="https://storage.googleapis.com/hasura-graphql-engine/console/assets/favicon.png" />
<link rel="icon" type="image/svg+xml" href="https://graphql-engine-cdn.hasura.io/img/hasura_icon_green.svg" />
<script>
window.__env = {
apiHost: {{.apiHost}},
Expand Down
2 changes: 1 addition & 1 deletion cli/assets/v1.0/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html lang="en-us">
<head>
<link rel="icon" type="image/png" href="https://storage.googleapis.com/hasura-graphql-engine/console/assets/favicon.png" />
<link rel="icon" type="image/svg+xml" href="https://graphql-engine-cdn.hasura.io/img/hasura_icon_green.svg" />
<script>
window.__env = {
apiHost: {{.apiHost}},
Expand Down
6 changes: 5 additions & 1 deletion console/src/helpers/Html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ export default class Html extends Component {
return (
<html lang="en-us">
<head>
<link rel="icon" type="image/png" href="/rstatic/favicon.png" />
<link
rel="icon"
type="image/svg+xml"
href="/rstatic/favicon_green.svg"
/>
{Object.keys(assets.styles).map((style, key) => (
<link
href={assets.styles[style]}
Expand Down
2 changes: 1 addition & 1 deletion console/src/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const server = new http.Server(app);

/* Constants */
/* Routes and middleware */
// app.use(favicon(path.join(__dirname, '..', 'static', 'favicon.ico')));
// app.use(favicon(path.join(__dirname, '..', 'static', 'favicon_green.svg')));
app.use('/rstatic', Express.static(path.join(__dirname, '..', 'static')));

app.use((req, res) => {
Expand Down
Binary file removed console/static/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file removed console/static/favicon.png
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions console/static/favicon_green.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#
html_favicon = "img/layout/favicon.png"
html_favicon = "img/layout/favicon_yellow.svg"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
Expand Down
Binary file removed docs/img/layout/favicon.png
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions docs/img/layout/favicon_yellow.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/img/layout/old-favicon.ico
View file
Open in desktop
Binary file not shown.
1 change: 0 additions & 1 deletion docs/img/layout/old-logo-dark.svg
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion docs/img/layout/old-logo-lite.svg
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion server/src-rsr/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html lang="en-us">
<head>
<link rel="icon" type="image/png" href="https://storage.googleapis.com/hasura-graphql-engine/console/assets/favicon.png" />
<link rel="icon" type="image/svg+xml" href="https://graphql-engine-cdn.hasura.io/img/hasura_icon_green.svg" />
<script>
window.__env = {
consoleMode: "server",
Expand Down