Skip to content
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.

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

Branding updates #5084

Merged
merged 6 commits into from
Dec 15, 2018
Merged
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
Binary file modified dist/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified dist/favicon-32x32.png
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 make-webpack-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ var commonRules = [
{ test: /\.(txt|yaml)(\?.*)?$/,
loader: "raw-loader" },
{ test: /\.(png|jpg|jpeg|gif|svg)(\?.*)?$/,
loader: "url-loader?limit=10000" },
loader: "url-loader" },
{ test: /\.(woff|woff2)(\?.*)?$/,
loader: "url-loader?limit=100000" },
{ test: /\.(ttf|eot)(\?.*)?$/,
Expand Down
Binary file modified src/img/logo_small.png
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 src/plugins/topbar/logo_small.png
Binary file not shown.
60 changes: 60 additions & 0 deletions src/plugins/topbar/logo_small.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions src/plugins/topbar/topbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { cloneElement } from "react"
import PropTypes from "prop-types"

//import "./topbar.less"
import Logo from "./logo_small.png"
import Logo from "./logo_small.svg"
import {parseSearch, serializeSearch} from "../../core/utils"

export default class Topbar extends React.Component {
Expand Down Expand Up @@ -134,8 +134,7 @@ export default class Topbar extends React.Component {
<div className="wrapper">
<div className="topbar-wrapper">
<Link>
<img height="30" width="30" src={ Logo } alt="Swagger UI"/>
<span>swagger</span>
<img height="40" src={ Logo } alt="Swagger UI"/>
</Link>
<form className="download-url-wrapper" onSubmit={formOnSubmit}>
{control.map((el, i) => cloneElement(el, { key: i }))}
Expand Down
2 changes: 1 addition & 1 deletion src/style/_topbar.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.topbar
{
padding: 8px 0;
padding: 10px 0;

background-color: $topbar-background-color;
.topbar-wrapper
Expand Down
6 changes: 3 additions & 3 deletions src/style/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -201,13 +201,13 @@ $table-parameter-deprecated-font-color: $color-danger !default;

// Topbar

$topbar-background-color: $color-primary !default;
$topbar-background-color: #1b1b1b !default;

$topbar-link-font-color: $white !default;

$topbar-download-url-wrapper-element-border-color: #547f00 !default;
$topbar-download-url-wrapper-element-border-color: #62A03F !default;

$topbar-download-url-button-background-color: #547f00 !default;
$topbar-download-url-button-background-color: #62A03F !default;
$topbar-download-url-button-font-color: $white !default;

// Type
Expand Down