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.

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

Jump to bottom

Fixed layout for tablets (bunq/doc#75) #80

Merged
merged 1 commit into from
Nov 9, 2018
Merged

Fixed layout for tablets (bunq/doc#75) #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions build/asset-manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/index.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build/service-worker.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion build/static/css/main.a9095fb9.css.map
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions build/static/css/main.a9095fb9.css → build/static/css/main.bced30ad.css
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/static/css/main.bced30ad.css.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/static/js/main.9110e64d.js → build/static/js/main.506c6cdf.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/static/js/main.9110e64d.js.map → build/static/js/main.506c6cdf.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified src/assets/images/ribbon.png
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 src/plugins/BunqLayoutPlugin/components/BunqLayout/BunqLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class BunqLayout extends React.Component {
const BaseLayout = getComponent("BaseLayout", true);

return (
<div className="wrapper">
<div className="doc-wrapper">
{
this.renderSidebar()
}
Expand Down
24 changes: 21 additions & 3 deletions src/scss/_custom.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ body {
margin: 0;
background-color: $color-white;
color: $color-grey-dark;
overflow-y: hidden;
}

.header {
Expand All @@ -29,24 +30,31 @@ body {
justify-content: center;
width: 100%;

.wrapper {
.doc-wrapper {
width: 100vw;
flex: 1;
padding: 0;
}

.swagger-ui {
flex-grow: 1;
height: $height-viewport;
overflow-x: hidden;
overflow-y: auto;
}

.information-container {
padding: 0;
}

.wrapper {
padding: 0;
}

@media (min-width: $width-viewport-small) {
display: flex;

.wrapper {
.doc-wrapper {
display: flex;
}
}
Expand All @@ -56,7 +64,11 @@ body {
padding: 0 $spacer-medium;

.information-container {
width: 100%;

section {
display: block;
width: 100%;
max-width: $max-width-section-information;
margin-left: auto;
margin-right: auto;
Expand Down Expand Up @@ -103,7 +115,13 @@ body {
}
}

.model {
.global-server-container {
display: none;
}

.model-box {
word-break: break-word;

.renderedMarkdown {
word-break: break-word;
}
Expand Down
7 changes: 6 additions & 1 deletion src/scss/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
.sidebar {
display: none;
flex-direction: column;
min-width: $width-sidebar;
min-width: $width-sidebar-tablet;
height: $height-viewport;
padding-left: $spacer-medium;
padding-right: $spacer-medium;
background-color: $color-grey-dark;
color: $color-white;
overflow-y: auto;
Expand All @@ -14,6 +15,10 @@
display: flex;
}

@media (min-width: $width-viewport-large) {
min-width: $width-sidebar-desktop;
}

.sidebar-logo-container {
margin: $spacer-small * 3 0;

Expand Down
4 changes: 3 additions & 1 deletion src/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ $max-width-section: 960px;
$max-width-section-information: 680px;

$width-logo: 97px;
$width-sidebar: 250px;
$width-sidebar-tablet: 180px;
$width-sidebar-desktop: 220px;
$width-viewport-small: 576px;
$width-viewport-large: 960px;

/**
* Text
Expand Down