Skip to content

Commit

Permalink
Merge pull request #90 from XhmikosR/master
Browse files Browse the repository at this point in the history
Minor improvements (2)
  • Loading branch information
Alan Shaw committed Dec 21, 2013
2 parents ea4e8bf + 6cc4bb4 commit 0b0e0ee
Show file tree
Hide file tree
Showing 26 changed files with 66 additions and 62 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ node_js:
- '0.10'
- '0.11'
before_script:
- npm install -g grunt-cli
- npm install -g grunt-cli
matrix:
allow_failures:
- node_js: '0.11'
13 changes: 3 additions & 10 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,14 @@ module.exports = function(grunt) {
dist: {
files: [
// Copy all (non hidden) files (not directories) from src
{dest: 'dist/', src: '*', filter: 'isFile', expand: true, cwd: 'src/'},
{dest: 'dist/', src: ['*', '!LICENSE.md'], filter: 'isFile', expand: true, cwd: 'src/'},

// Copy any JavaScript libs
{dest: 'dist/', src: 'js/vendor/*.min.js', expand: true, cwd: 'src/'},

// Copy any CSS files (not LESS src)
{dest: 'dist/', src: 'css/**/*.css', expand: true, cwd: 'src/'},

// Copy other resources
{dest: 'dist/', src: 'img/**', expand: true, cwd: 'src/'},
{dest: 'dist/', src: 'fonts/**', expand: true, cwd: 'src/'}
{dest: 'dist/', src: 'fonts/**', expand: true, cwd: 'src/'},
{dest: 'dist/', src: 'img/**', expand: true, cwd: 'src/'}
]
}
},
Expand Down Expand Up @@ -88,7 +85,6 @@ module.exports = function(grunt) {
files: ['*.js', 'src/js/*.js', 'test/*.js'],
options: {
'browser': false,
'maxerr': 100,
'node': true,
/*'camelcase': true,*/
'curly': true,
Expand All @@ -98,15 +94,12 @@ module.exports = function(grunt) {
'immed': true,
'indent': 4,
/*'latedef': true,*/
'laxbreak': true,
'laxcomma': true,
'lastsemic': true,
'loopfunc': true,
'noarg': true,
'newcap': true,
'plusplus': false,
'quotmark': 'single',
'regexp': true,
'shadow': true,
'smarttabs': true,
'strict': false,
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,38 +28,38 @@
"dependencies": {
"async": "~0.2.9",
"config": "~0.4.33",
"consolidate": "~0.9.1",
"consolidate": "~0.10.0",
"couchwatch": "~0.6.0",
"cycle": "~1.0.2",
"d3": "~3.3.10",
"cycle": "~1.0.3",
"d3": "~3.3.13",
"david": "~2.4.0",
"dep-diff": "~1.0.1",
"express": "~3.4.4",
"express": "~3.4.7",
"extract": "~1.0.0",
"github": "~0.1.12",
"github-url": "~1.0.0",
"handlebars": "~1.1.2",
"memory-cache": "~0.0.5",
"merge": "~1.1.2",
"moment": "~2.4.0",
"npm": "~1.3.15",
"request": "~2.27.0",
"npm": "~1.3.21",
"request": "~2.30.0",
"rss": "~0.2.1",
"semver": "~2.2.1"
},
"devDependencies": {
"brfs": "0.0.8",
"grunt": "~0.4.2",
"grunt-browserify": "~1.2.11",
"grunt-browserify": "~1.3.0",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-cssmin": "~0.7.0",
"grunt-contrib-jshint": "~0.7.2",
"grunt-contrib-less": "~0.8.2",
"grunt-contrib-less": "~0.8.3",
"grunt-contrib-nodeunit": "~0.2.2",
"grunt-contrib-uglify": "~0.2.7",
"grunt-contrib-watch": "~0.5.3",
"grunt-include-replace": "~1.1.1",
"grunt-include-replace": "~1.1.3",
"rewire": "~2.0.0"
},
"engines": {
Expand Down
Binary file modified src/apple-touch-icon-precomposed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 11 additions & 5 deletions src/css/320.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Structure
////////////////////////////////////////////////////////////////////////////////

#hd {
header {
background-color: @white;
border-top: 5px solid @black0;
border-bottom: 2px solid @grey2;
Expand All @@ -23,7 +23,7 @@
margin: 4.571em 1em 0;
min-height: 60em;
}
#ft {
footer {
background-color: @white;
border-top: 2px solid @grey2;
border-bottom: 5px solid @black0;
Expand Down Expand Up @@ -55,10 +55,12 @@
&:first-child {
margin: 0;
}
a, a:visited {
color: @grey0;
}
a {
font-family: nevisbold, sans-serif;
font-size: 0.857em;
color: @grey0;
text-transform: uppercase;
}
}
Expand All @@ -83,6 +85,9 @@ ul.stats {
}
}
.logo, .logo:visited {
color: @black0;
}
.logo {
display: inline-block;
/* TODO: Change it to this when it's fixed in less and IE8 support isn't no more
background: url(../img/logo-david@2x.jpg) no-repeat left center/5.188em 3.375em;
Expand All @@ -92,7 +97,6 @@ ul.stats {
margin-left: 3.6em;
padding-left: 5.733em;
font: 1.071em/3.610em jurabold, sans-serif;
color: @black0;
text-decoration: none;

.no-backgroundsize & {
Expand Down Expand Up @@ -298,7 +302,7 @@ ul.stats {
padding: 0;
color: @grey0;

a, a:visited {
a {
font-family: nevisbold, sans-serif;
}
}
Expand All @@ -308,6 +312,8 @@ ul.stats {
}
a, a:visited {
color: @grey0;
}
a {
display: block;
}
&:hover {
Expand Down
4 changes: 2 additions & 2 deletions src/css/768.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Structure
////////////////////////////////////////////////////////////////////////////////

#hd {
header {
span {
display: inline;
font-size: 1em;
Expand All @@ -12,7 +12,7 @@
margin-left: 9em;
}
}
#ft {
footer {
margin: 4em 0 0;

> div {
Expand Down
4 changes: 2 additions & 2 deletions src/css/960.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// Structure
////////////////////////////////////////////////////////////////////////////////

#hd > div {
header > div {
margin: 0 auto;
max-width: 67.143em;
}
#main {
margin: 4.571em auto 0;
max-width: 67.143em;
}
#ft {
footer {
> div {
margin: 0 auto;
max-width: 67.143em;
Expand Down
8 changes: 5 additions & 3 deletions src/css/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,14 @@ h1, h2, h3, h4 {
margin-top: 0;
}
}
a, a:visited {
color: @blue0;
a {
font-family: jurabold, sans-serif;
text-decoration: none;
}
a:hover, a:active{
a, a:visited {
color: @blue0;
}
a:hover, a:active {
color: @black0;
text-decoration: none;
}
Expand Down
Binary file modified src/img/dev-notsouptodate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/dev-uptodate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/logo-david.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/notsouptodate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/outofdate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/img/uptodate.png
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/inc/bottom.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
</div>

<footer id="ft">
<footer>
<div>
<a class="logo" href="/">David. <i class="fa fa-home"></i></a>
<small>Copyright &copy; 2013 david-dm.org <span>v@@version</span></small>
Expand Down
8 changes: 4 additions & 4 deletions src/inc/changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h2>Closed Issues</h2>
<ul class="issues">
{{#each closedIssues}}
<li>
<a href="{{user.html_url}}" title="{{user.login}}" target="_blank"><img src="{{user.avatar_url}}" alt="Avatar for {{user.login}}"/></a>
<a href="{{user.html_url}}" title="{{user.login}}" target="_blank"><img src="{{user.avatar_url}}" alt="Avatar for {{user.login}}"></a>
<a href="{{html_url}}" title="Closed on {{closed_at}}" class="title" target="_blank"><span>#{{number}}</span> {{title}}</a>
<a href="{{user.html_url}}" class="login" target="_blank">{{user.login}}</a>
<time datetime="{{closed_at}}">closed on {{closed_at}}</time>
Expand All @@ -17,15 +17,15 @@ <h2>Commits</h2>
{{#each commits}}
<li>
{{#if author.login}}
<a href="{{author.html_url}}" title="{{author.login}}" target="_blank"><img src="{{author.avatar_url}}" alt="Avatar for {{author.login}}"/></a>
<a href="{{author.html_url}}" title="{{author.login}}" target="_blank"><img src="{{author.avatar_url}}" alt="Avatar for {{author.login}}"></a>
<a href="{{html_url}}" title="Committed on {{commit.committer.date}}" class="title" target="_blank">{{commit.message}}</a>
<a href="{{author.html_url}}" class="login" target="_blank">{{author.login}}</a>
{{else}}
<img src="http://www.gravatar.com/avatar/?d=mm" alt="Avatar for {{commit.author.name}}"/>
<img src="http://www.gravatar.com/avatar/?d=mm" alt="Avatar for {{commit.author.name}}">
<a href="{{html_url}}" title="Committed on {{commit.committer.date}}" class="title" target="_blank">{{commit.message}}</a>
{{commit.author.name}}
{{/if}}
<time datetime="{{commit.committer.date}}">committed on {{commit.committer.date}}</time>
</li>
{{/each}}
</ul>
</ul>
2 changes: 1 addition & 1 deletion src/inc/info.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</ul>
@@include('summary.html')
<div class="dep-table">
<table summary="Repository dependencies and their status">
<table>
<thead>
<tr>
<th>Dependency</th>
Expand Down
2 changes: 1 addition & 1 deletion src/inc/top.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->

<header id="hd">
<header>
<div>
<a class="logo" href="/">David. <i class="fa fa-home"></i></a>
<span>Watching your Node.js dependencies.</span>
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div>

<h1>
You depend on other projects.<br/>
You want to stay up to date.<br/>
You depend on other projects.<br>
You want to stay up to date.<br>
David's got your back.
</h1>

Expand Down
2 changes: 1 addition & 1 deletion src/js/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ $('#status-page').each(function () {
, i = 0
, root = null
, tree = d3.layout.tree().size([h, w])
, diagonal = d3.svg.diagonal().projection(function(d) { return [d.y, d.x] });
, diagonal = d3.svg.diagonal().projection(function(d) { return [d.y, d.x]; });

var vis = d3.select($('.dep-graph', container)[0]).append('svg:svg')
.attr('width', w + m[1] + m[3])
Expand Down
Loading

0 comments on commit 0b0e0ee

Please sign in to comment.