localhots
/
empact
1
0
Fork 0
Code Releases Activity

Grid fix

This commit is contained in:
Gregory Eremin 2015-03-19 16:26:27 +07:00
parent 4caf20ca25
commit 8e96d3834d
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/css/charts.css
View File

@ -49,7 +49,7 @@
content: ''; content: '';
width: 16px; width: 16px;
height: 16px; height: 16px;
margin: 1px 5px 0 0; margin: 2px 5px 0 0;
border-radius: 8px; border-radius: 8px;
} }
.sac .legend li { .sac .legend li {
@ -133,18 +133,21 @@
.whatsgoingon { .whatsgoingon {
color: #444; color: #444;
margin-bottom: 20px; margin-bottom: 10px;
line-height: 24px; line-height: 24px;
min-height: 72px; /* 3*line-height */ min-height: 72px; /* 3*line-height */
} }
.whatsgoingon span {
line-height: 24px;
}
.whatsgoingon em { .whatsgoingon em {
display: inline-block; display: inline-block;
line-height: 16px; line-height: 16px;
color: #000; color: #000;
font-style: normal; font-style: normal;
margin: 3px 0 0; margin: 4px 0;
padding: 3px 6px; padding: 0px 3px;
background-color: #f0f0f0; background-color: #f0f0f0;
border-radius: 2px; border-radius: 2px;
} }
@ -177,11 +180,13 @@
} }
.week-selector .selector em { .week-selector .selector em {
display: inline-block;
padding: 3px;
width: 100%; width: 100%;
} }
.week-selector .selector select { .week-selector .selector select {
position: absolute; position: absolute;
top: 5px; top: 4px;
left: 5%; left: 5%;
width: 90%; width: 90%;
margin: 0; margin: 0;
@ -214,3 +219,12 @@
.sac .dot text { .sac .dot text {
text-anchor: middle; text-anchor: middle;
} }
hr {
margin: 20px 20px 30px 0;
height: 1px;
color: #aaa;
background-color: #ccc;
border: 0 none;
clear: both;
}

2
app/css/menu.css
View File

@ -18,7 +18,7 @@
.menu .empact { .menu .empact {
height: 40px; height: 40px;
padding: 5px 0; padding: 5px 0;
margin-bottom: 21px; margin-bottom: 20px;
} }
.menu .nav.header { .menu .nav.header {
color: #444; color: #444;

1
app/jsx/app/dashboard.jsx
View File

@ -43,6 +43,7 @@ var Dashboard = React.createClass({
<div className="content"> <div className="content">
<InfoBlock image={infoImage} className={infoImageClass} title={infoTitle} /> <InfoBlock image={infoImage} className={infoImageClass} title={infoTitle} />
<StackedAreaChart api={sacApi} params={this.getParams()} items={sacItems} /> <StackedAreaChart api={sacApi} params={this.getParams()} items={sacItems} />
<hr />
<BarChart api={bcApi} params={this.getParams()} items={bcItems} /> <BarChart api={bcApi} params={this.getParams()} items={bcItems} />
</div> </div>
); );

2
app/jsx/charts/bc/bar_chart.jsx
View File

@ -143,7 +143,7 @@ var BarChart = React.createClass({
return ( return (
<div className="barchart-container"> <div className="barchart-container">
<div className="whatsgoingon"> <div className="whatsgoingon">
This bar chart shows <em>{words.values[this.state.sort]}</em> {words.actions[this.state.item +'-'+ this.state.sort]} <em>{words.items[this.state.item]}</em> {words.whatHappened[this.state.item +'-'+ target]} <em>{subject}</em> {words.targetSuffix[target]} <WeekIntervalSelector /> This bar chart shows <em>{words.values[this.state.sort]}</em> {words.actions[this.state.item +'-'+ this.state.sort]} <em>{words.items[this.state.item]}</em> {words.whatHappened[this.state.item +'-'+ target]} <em>{subject}</em> {words.targetSuffix[target]}<br /><WeekIntervalSelector />
</div> </div>
<div className="filters"> <div className="filters">
<Selector thing="sort" <Selector thing="sort"

2
app/jsx/charts/sac/stacked_area_chart.jsx
View File

@ -300,7 +300,7 @@ var StackedAreaChart = React.createClass({
return ( return (
<div ref="container" className="sac"> <div ref="container" className="sac">
<div className="whatsgoingon"> <div className="whatsgoingon">
This stacked area chart shows <em>the number of commits</em> {words.actions[this.state.item]} <em>{words.items[this.state.item]}</em> {words.whatHappened[this.state.item +'-'+ target]} <em>{subject}</em> {words.targetSuffix[target]} <WeekIntervalSelector /> This stacked area chart shows <em>the number of commits</em> {words.actions[this.state.item]} <em>{words.items[this.state.item]}</em> {words.whatHappened[this.state.item +'-'+ target]} <em>{subject}</em> {words.targetSuffix[target]}<br /><WeekIntervalSelector />
</div> </div>
<div className="filters"> <div className="filters">
<Selector thing="sort" <Selector thing="sort"