Merge branch 'dev' into issue-184
Conflicts: app/views/layouts/project.html.haml
This commit is contained in:
commit
444b69ddc2
17 changed files with 106 additions and 66 deletions
|
@ -42,8 +42,10 @@ replace:
|
|||
|
||||
prepend:
|
||||
function(id, html) {
|
||||
this.last_id = id;
|
||||
$("#notes-list").prepend(html);
|
||||
if(id != this.last_id) {
|
||||
this.last_id = id;
|
||||
$("#notes-list").prepend(html);
|
||||
}
|
||||
},
|
||||
|
||||
getNew:
|
||||
|
|
|
@ -276,6 +276,9 @@ input.ssh_project_url {
|
|||
/** FORM INPUTS **/
|
||||
|
||||
.user_new,
|
||||
.new_key,
|
||||
.new_issue,
|
||||
.new_note,
|
||||
.edit_user,
|
||||
.new_project,
|
||||
.new_snippet,
|
||||
|
@ -667,6 +670,15 @@ table.highlighttable pre{
|
|||
.cred { color:#D12F19; }
|
||||
.cgreen { color:#44aa22; }
|
||||
|
||||
body.project-page table .commit {
|
||||
a.tree-commit-link {
|
||||
color:gray;
|
||||
&:hover {
|
||||
text-decoration:underline;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
|
||||
body.project-page #notes-list .note {padding: 10px; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
|
||||
body.project-page #notes-list .note img{float: left; margin-right: 10px;}
|
||||
|
|
|
@ -87,6 +87,17 @@ h2{margin: 1.5em 0}
|
|||
/* Forms */
|
||||
input[type="text"]:focus, input[type="password"]:focus { outline: none; }
|
||||
input.text{border: 1px solid #ccc; border-radius: 4px; display: block; padding: 10px}
|
||||
|
||||
.form-row{
|
||||
padding: 0px 0px 10px 0px;
|
||||
}
|
||||
|
||||
.form-row label{
|
||||
font-weight:bold;
|
||||
display: inline-block;
|
||||
padding: 0px 0px 5px 0px;
|
||||
}
|
||||
|
||||
/* eo Forms */
|
||||
|
||||
/* Tables */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue