1
0
mirror of https://github.com/stedolan/jq.git synced 2024-05-11 05:55:39 +00:00

Consistent indentation of shared templates

This commit is contained in:
David Tolnay
2015-08-13 23:08:52 -07:00
parent bd46a5dd52
commit d36a85a369
6 changed files with 54 additions and 55 deletions

View File

@@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
{% include "shared/head" %} {% include "shared/head" %}
<body id="{{slug}}"> <body id="{{slug}}">
{% include "shared/header" %} {% include "shared/header" %}
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@@ -29,6 +29,6 @@
</div> </div>
</div> </div>
{% include "shared/footer" %} {% include "shared/footer" %}
</body> </body>
</html> </html>

View File

@@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
{% include "shared/head" %} {% include "shared/head" %}
<body id="{{slug}}"> <body id="{{slug}}">
{% include "shared/header" %} {% include "shared/header" %}
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@@ -72,6 +72,6 @@
</div> </div>
</div> </div>
{% include "shared/footer" %} {% include "shared/footer" %}
</body> </body>
</html> </html>

View File

@@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
{% include "shared/head" %} {% include "shared/head" %}
<body id="{{slug}}" data-spy="scroll" data-target="#navcolumn" data-offset="100"> <body id="{{slug}}" data-spy="scroll" data-target="#navcolumn" data-offset="100">
{% include "shared/header" %} {% include "shared/header" %}
<div class="container"> <div class="container">
<div class="row"> <div class="row">
@@ -84,7 +84,7 @@
</div> </div>
</div> </div>
{% include "shared/footer" %} {% include "shared/footer" %}
<script> <script>
var section_map = { var section_map = {
{% for section in sections %} {% for section in sections %}

View File

@@ -1,9 +1,9 @@
<footer> <footer>
<div class="container"> <div class="container">
{{ footer | markdownify }} {{ footer | markdownify }}
</div> </div>
</footer> </footer>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script src="{{root}}/bootstrap/js/bootstrap.min.js"></script> <script src="{{root}}/bootstrap/js/bootstrap.min.js"></script>
<script src="{{root}}/js/bootstrap3-typeahead.js"></script> <script src="{{root}}/js/bootstrap3-typeahead.js"></script>

View File

@@ -1,12 +1,12 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{headline}}</title> <title>{{headline}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="stylesheet" href="{{root}}/bootstrap/css/bootstrap.css" type="text/css"> <link rel="stylesheet" href="{{root}}/bootstrap/css/bootstrap.css" type="text/css">
<link rel="stylesheet" href="{{root}}/css/base.css" type="text/css"> <link rel="stylesheet" href="{{root}}/css/base.css" type="text/css">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
<![endif]--> <![endif]-->
</head> </head>

View File

@@ -1,28 +1,27 @@
<div class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button aria-expanded="false" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{root}}/">jq</a>
</div>
<div class="navbar navbar-default navbar-fixed-top"> <div style="height: 1px;" aria-expanded="false" class="navbar-collapse collapse" id="nav-collapse">
<div class="container"> <ul class="nav navbar-nav">
<div class="navbar-header"> {% for item in navigation %}
<button aria-expanded="false" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#nav-collapse"> <li {% if item.permalink == permalink %} class="active" {% endif %}>
<span class="sr-only">Toggle navigation</span> <a href="{{root}}{{item.permalink}}">{{item.name}}</a>
<span class="icon-bar"></span> </li>
<span class="icon-bar"></span> {% endfor %}
<span class="icon-bar"></span> <li><a href="https://github.com/stedolan/jq/issues">Issues</a></li>
</button> <li><a href="https://github.com/stedolan/jq">Source</a></li>
<a class="navbar-brand" href="{{root}}/">jq</a> <li><a href="http://jqplay.org">Try online!</a></li>
<li><a href="https://raw.githubusercontent.com/stedolan/jq/master/NEWS">News</a></li>
</ul>
</div>
</div>
</div> </div>
<div style="height: 1px;" aria-expanded="false" class="navbar-collapse collapse" id="nav-collapse">
<ul class="nav navbar-nav">
{% for item in navigation %}
<li {% if item.permalink == permalink %} class="active" {% endif %}>
<a href="{{root}}{{item.permalink}}">{{item.name}}</a>
</li>
{% endfor %}
<li><a href="https://github.com/stedolan/jq/issues">Issues</a></li>
<li><a href="https://github.com/stedolan/jq">Source</a></li>
<li><a href="http://jqplay.org">Try online!</a></li>
<li><a href="https://raw.githubusercontent.com/stedolan/jq/master/NEWS">News</a></li>
</ul>
</div>
</div>
</div>