codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-04-29 23:43:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make commits-widget contents fill its container, and improve layout on dashboard

Browse source
This commit is contained in:
Neil Lalonde 2013-04-17 10:25:28 -04:00
parent b81da5ee66
commit d67682ff6c
2 changed files with 8 additions and 12 deletions
app/assets
javascripts/admin/models
github_commit.js
stylesheets/admin
admin_base.scss

2
app/assets/javascripts/admin/models/github_commit.js
View file

@ -30,7 +30,7 @@ Discourse.GithubCommit.reopenClass({
Discourse.ajax( "https://api.github.com/repos/discourse/discourse/commits?callback=callback", { Discourse.ajax( "https://api.github.com/repos/discourse/discourse/commits?callback=callback", {
dataType: 'jsonp', dataType: 'jsonp',
type: 'get', type: 'get',
data: { per_page: 25 } data: { per_page: 40 }
}).then(function (response) { }).then(function (response) {
response.data.each(function(commit) { response.data.each(function(commit) {
result.pushObject( Discourse.GithubCommit.create(commit) ); result.pushObject( Discourse.GithubCommit.create(commit) );

18
app/assets/stylesheets/admin/admin_base.scss
View file

@ -277,10 +277,12 @@ table {
.dashboard-left { .dashboard-left {
float: left; float: left;
width: 500px; width: 500px;
margin-top: 10px;
} }
.dashboard-right { .dashboard-right {
float: right; float: right;
width: 500px; width: 500px;
margin-top: 10px;
margin-right: 15px; margin-right: 15px;
@include medium-width { @include medium-width {
@ -335,7 +337,7 @@ table {
} }
.dashboard-stats { .dashboard-stats {
margin-top: 30px; margin-bottom: 30px;
width: 460px; width: 460px;
margin-left: 30px; margin-left: 30px;
@ -439,12 +441,10 @@ table {
} }
&.trust-levels { &.trust-levels {
margin-top: 0px; margin-bottom: 0px;
table { table {
margin-bottom: 0px; margin-bottom: 0px;
} }
td.value { td.value {
width: 45px; width: 45px;
} }
@ -454,7 +454,6 @@ table {
.commits-widget { .commits-widget {
border: solid 1px #ccc; border: solid 1px #ccc;
margin-top: 10px;
width: 500px; width: 500px;
height: 700px; height: 700px;
@ -485,9 +484,7 @@ table {
font-weight: bold; font-weight: bold;
height: 30px; height: 30px;
border-bottom: solid 1px #ccc; border-bottom: solid 1px #ccc;
@include linear-gradient(#f1f1f1, #e1e1e1);
background-color:#e1e1e1;
background-image:linear-gradient(center top, #f1f1f1 0%, #e1e1e1 100%);
cursor: pointer; cursor: pointer;
h1 { h1 {
@ -503,7 +500,7 @@ table {
} }
.commits-list { .commits-list {
height: 349px; height: 669px;
overflow-y:auto; overflow-y:auto;
li { li {
@ -511,8 +508,7 @@ table {
line-height: 1.0em; line-height: 1.0em;
padding: 6px 8px; padding: 6px 8px;
border-bottom: solid 1px #ccc; border-bottom: solid 1px #ccc;
background-color:#eee; @include linear-gradient(#f6f6f6, #eee);
background-image:linear-gradient(center top, #fafafa 0%, #eee 100%);
.left { .left {
float: left; float: left;