Resolve conflicts

This commit is contained in:
perryharlock
2013-11-11 15:05:43 +00:00
11 changed files with 63 additions and 13 deletions

View File

@@ -14,6 +14,7 @@
<!-- For mobile devices. -->
<meta name="viewport" content="width=device-width"/>
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Lato:400,700,900,400italic"/>
<link rel="stylesheet" href="/css/site.min.css"/>
</head>

View File

@@ -18,11 +18,20 @@
</div>
{{/error}}
<div class="form-group clearfix">
<div class="row">
<div class="col-md-8 col-sm-8 col-xs-10">
<label class="control-label" for="new-task-name">Name</label>
<input class="form-control" id="new-task-name" type="text" placeholder="E.g. My Home Page" name="name" value="{{task.name}}"/>
</div>
</div>
</div>
<div class="form-group clearfix">
<div class="row">
<div class="col-md-8 col-sm-8 col-xs-10">
<label class="control-label" for="new-task-url">URL</label>
<input class="form-control" id="new-task-url" type="url" placeholder="URL" name="url" value="{{task.url}}"/>
<input class="form-control" id="new-task-url" type="url" placeholder="E.g. http://mysite.com/" name="url" value="{{task.url}}"/>
</div>
</div>
</div>

View File

@@ -7,13 +7,13 @@
<div class="col-md-5 clearfix">
<ul class="crunch-bottom floated-list nav">
<li>
<a href="{{repo}}">github repo</a>
<a href="{{repo}}">GitHub Repo</a>
</li>
<li>
<a href="{{bugtracker}}">bug tracker</a>
<a href="{{bugtracker}}">Bug Tracker</a>
</li>
<li>
<a href="{{rules}}">list of rules</a>
<a href="http://www.w3.org/TR/WCAG20/">WCAG 2.0 spec</a>
</li>
</ul>
</div>