mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-28 00:40:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

nice formatting now on errors and results with tricky css

Browse source
This commit is contained in:
Peter Cottle 2012-09-22 21:59:30 -07:00
parent d647d430d7
commit 04251a3da3
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/git.js
View file

@ -861,7 +861,9 @@ var Commit = Backbone.Model.extend({
return [ return [
'Author: ' + this.get('author'), 'Author: ' + this.get('author'),
'Date: ' + this.get('createTime'), 'Date: ' + this.get('createTime'),
'<br/>',
this.get('commitMessage'), this.get('commitMessage'),
'<br/>',
'Commit: ' + this.get('id') 'Commit: ' + this.get('id')
].join('\n' ) + '\n'; ].join('\n' ) + '\n';
}, },

17
src/style/main.css
View file

@ -177,7 +177,22 @@ p.commandLine, div.commandLineResult {
margin: 0px; margin: 0px;
} }
p.commandLine div.commandLineWarnings p i.icon-exclamation-point { div.commandLineWarnings p,
div.commandLineResult p {
margin: 0px;
}
div.commandLineResult p:first-child,
div.commandLineWarnings p:first-child {
padding-top: 8px;
}
div.commandLineResult p:last-child,
div.commandLineWarnings p:last-child {
padding-bottom: 8px;
}
div.commandLineWarnings p i.icon-exclamation-sign {
color: yellow; color: yellow;
margin-right: 5px; margin-right: 5px;
} }

2
src/visuals.js
View file

@ -192,7 +192,7 @@ GitVisuals.prototype.addBranch = function(branch) {
}); });
this.visBranchCollection.add(visBranch); this.visBranchCollection.add(visBranch);
if (this.paperReady) { if (this.paperReady) {
visBranch.genGraphics(); visBranch.genGraphics(paper);
} }
}; };