Skip to content

Commit 84dd339

Browse files
author
Emmanouil Konstantinidis
committed
Revert "Remove main-container"
This reverts commit b402756.
1 parent f64f089 commit 84dd339

File tree

6 files changed

+18
-5
lines changed

6 files changed

+18
-5
lines changed

src/js/components/all-read.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default class AllRead extends React.Component {
2424
const emoji = _.sample(constants.ALLREAD_EMOJIS);
2525

2626
return (
27-
<div className="container-fluid notifications all-read">
27+
<div className="container-fluid main-container notifications all-read">
2828
<h2 className="typed-text">
2929
<span className="typed" />
3030
<span className="cursor">|</span>

src/js/components/login.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class LoginPage extends React.Component {
7373

7474
render() {
7575
return (
76-
<div className="container-fluid login">
76+
<div className="container-fluid main-container login">
7777
<div className="row">
7878
<div className="col-xs-offset-2 col-xs-8">
7979
<img className="img-responsive logo" src="images/gitify-logo-outline-light.png" />

src/js/components/notifications.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class NotificationsPage extends React.Component {
2727
}
2828

2929
render() {
30-
const wrapperClass = 'container-fluid notifications';
30+
const wrapperClass = 'container-fluid main-container notifications';
3131
const notificationsEmpty = _.isEmpty(this.props.notifications);
3232

3333
if (this.props.failed) {

src/js/components/oops.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default class Oops extends React.Component {
99
const emoji = _.sample(constants.ERROR_EMOJIS);
1010

1111
return (
12-
<div className="container-fluid notifications errored">
12+
<div className="container-fluid main-container notifications errored">
1313
<h3>Oops something went wrong.</h3>
1414
<h4>Couldn't get your notifications.</h4>
1515
<h1 className="emoji">{emojify(emoji, {output: 'unicode'})}</h1>

src/js/components/settings.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export class SettingsPage extends React.Component {
3030
const settings = this.props.settings;
3131

3232
return (
33-
<div className="container-fluid settings">
33+
<div className="container-fluid main-container settings">
3434
<div className="row">
3535
<div className="col-xs-8">Show only participating</div>
3636
<div className="col-xs-4">

src/scss/app.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,19 @@ html {
105105
overflow: hidden;
106106
}
107107

108+
.main-container {
109+
position: absolute;
110+
top: $navbar-height;
111+
right: 0;
112+
bottom: 0;
113+
left: 0;
114+
overflow: auto;
115+
}
116+
117+
.search-bar + .main-container {
118+
top: $navbar-height + $navbar-height;
119+
}
120+
108121
.btn {
109122
@include border-radius(0);
110123
border: 0;

0 commit comments

Comments
 (0)