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

Update home page styles #604

Merged
merged 1 commit into from
Jan 20, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/app/assets/js/widgets/components/Card.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

const Card = ({ title, children }) => (
<div className="container bg-white shadow-sm py-4 mb-3">
<div className="container-xl bg-white shadow-sm py-4 mb-3">
<h3 className="text-center mb-4">{title}</h3>
{children}
</div>
Expand Down
8 changes: 4 additions & 4 deletions services/app/assets/js/widgets/containers/GameList.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ class GameList extends React.Component {
);
}
return (
<div className="table-responsive mt-2">
<div className="table-responsive">
<table className="table">
<thead className="text-left">
<tr>
Expand Down Expand Up @@ -364,15 +364,15 @@ class GameList extends React.Component {
);
}
return (
<div className="table-responsive mt-2">
<div className="table-responsive">
<table className="table">
<thead className="text-left">
<tr>
<th className="p-3 border-0">Date</th>
<th className="p-3 border-0">Level</th>
<th className="p-3 border-0 text-center" colSpan="2">Players</th>
<th className="p-3 border-0">State</th>
<th className="p-3 border-0">Time limit</th>
<th className="p-3 border-0 text-nowrap">Time limit</th>
<th className="p-3 border-0">Actions</th>
</tr>
</thead>
Expand Down Expand Up @@ -454,7 +454,7 @@ class GameList extends React.Component {
</Card>
<Card title="Game activity">
<div className="row justify-content-center">
<div className="col-sm-8">
<div className="col-md-8">
<GamesHeatmap />
</div>
</div>
Expand Down
23 changes: 10 additions & 13 deletions services/app/lib/codebattle_web/templates/layout/app.html.slime
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,6 @@ html lang="en"
button.navbar-toggler[aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation" data-target="#navbarResponsive" data-toggle="collapse" type="button"]
span.navbar-toggler-icon
#navbarResponsive.collapse.navbar-collapse
ul.navbar-nav.mr-auto
li.nav-item
a.nav-link[href="https://github.com/hexlet-codebattle/codebattle" target="_blank"]
span.fab.fa-github.mr-2
= gettext "SourceCode"
li.nav-item
a.nav-link[href="https://hexlet.io" target="_blank"]
span.fa.fa-university.mr-2
= gettext "Hexlet"
li.nav-item
a.nav-link[href="http://slack-ru.hexlet.io/" target="_blank"]
span.fab.fa-slack.mr-2
= gettext "Slack#codebattle"
ul.navbar-nav.ml-auto
= unless @current_user.guest do
li.nav-item
Expand All @@ -84,6 +71,16 @@ html lang="en"
= link gettext("My Profile"), to: user_path(@conn, :show, @current_user.id), class: "dropdown-item"
= link gettext("Settings"), to: user_setting_path(@conn, :edit), class: "dropdown-item"
.dropdown-divider
a.dropdown-item.d-flex.align-items-center.justify-content-between[href="https://github.com/hexlet-codebattle/codebattle" target="_blank"]
= gettext "SourceCode"
span.fab.fa-github.ml-3
a.dropdown-item.d-flex.align-items-center.justify-content-between[href="https://hexlet.io" target="_blank"]
= gettext "Hexlet"
span.fa.fa-university.ml-3
a.dropdown-item.d-flex.align-items-center.justify-content-between[href="http://slack-ru.hexlet.io/" target="_blank"]
= gettext "Slack#codebattle"
span.fab.fa-slack.ml-3
.dropdown-divider
= link gettext("Sign Out"), to: session_path(@conn, :delete), method: "delete", class: "dropdown-item"
- else
li.nav-item
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
a href="#{auth_path(@conn, :request, :github)}"
button.btn.btn-outline-success.btn-lg = "Start playing"

.container-fluid
#game-list
javascript:
window.csrf_token = "<%= csrf_token() %>"
#game-list
javascript:
window.csrf_token = "<%= csrf_token() %>"