summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@gmail.com>2015-10-12 22:15:16 -0700
committerDavid Tolnay <dtolnay@gmail.com>2015-10-12 22:15:16 -0700
commit36c2baf3dc8650991a82d9e98af89e0716a835d4 (patch)
treefbf6961e392e19e5b21d3fd6b4d2311c83ee6f5b
parentaa42382ed754866b041cc62c1631e358ab61d99e (diff)
Pick up updated base.css
-rw-r--r--css/base.css2
-rw-r--r--css/base.scss53
-rw-r--r--css/typeaheadjs.css1
-rw-r--r--download/index.html1
-rw-r--r--index.html1
-rw-r--r--index/index.html1
-rw-r--r--manual/index.html1
-rw-r--r--manual/v1.3/index.html1
-rw-r--r--manual/v1.4/index.html1
-rw-r--r--manual/v1.5/index.html1
-rw-r--r--sitemap.xml14
-rw-r--r--tutorial/index.html1
12 files changed, 57 insertions, 21 deletions
diff --git a/css/base.css b/css/base.css
index 1b40ed1f..281f725c 100644
--- a/css/base.css
+++ b/css/base.css
@@ -1 +1 @@
-body{padding-top:80px}.container{max-width:970px}#blurb{padding-top:40px}#blurb p{font-size:1.9em}#blurb .btn-group{margin:4px}#multiblurb{line-height:1.7;text-align:center;font-size:12pt}#multiblurb code{border:0;font-size:12pt}#news{font-size:12pt}#news .date{font-style:italic}.tutorial-example{position:relative;margin-bottom:10px}.tutorial-example pre{margin-bottom:0}.tutorial-example a{position:absolute;top:0;right:0;padding:15px 8px;color:#777;font-weight:bold;line-height:10px;font-size:12px;border-left:1px solid #ddd;display:block}.tutorial-example .accordion-body pre{margin:0 4px;border-top:0;border-top-left-radius:0;border-top-right-radius:0}@media print{.tutorial-example a{display:none}}section{padding-top:24px}h3 code{border:0;font-size:20px}@media(max-width:991px){#navcolumn{position:relative !important;margin-bottom:60px}}@media(min-width:992px){#manualcontent{padding-left:280px}}.nav-pills{margin-bottom:20px}.nav-pills li a{padding:8px 12px}.manual-example table{border-top:1px solid #e5e5e5}.manual-example table td{white-space:pre-wrap;font-family:Monaco,Menlo,Consolas,"Courier New",monospace}.manual-example table td.jqprogram{font-weight:bold}.manual-example table th{text-align:right;padding-right:10px}@media print{#navcolumn{display:none !important}.manual-example{display:block !important;height:auto !important}.jqplay-btn{display:none !important}}footer{background-color:#f5f5f5;padding:20px 0;margin-top:40px;color:#999;text-align:center}footer p{margin:8px 0} \ No newline at end of file
+body{padding-top:80px}.container{max-width:970px}#blurb{padding-top:40px}#blurb p{font-size:1.9em}#blurb .btn-group{margin:4px}#multiblurb{line-height:1.7;text-align:center;font-size:12pt}#multiblurb code{border:0;font-size:12pt}#news{font-size:12pt}#news .date{font-style:italic}.tutorial-example{position:relative;margin-bottom:10px}.tutorial-example pre{margin-bottom:0}.tutorial-example a{position:absolute;top:0;right:0;padding:15px 8px;color:#777;font-weight:bold;line-height:10px;font-size:12px;border-left:1px solid #ddd;display:block}.tutorial-example .accordion-body pre{margin:0 4px;border-top:0;border-top-left-radius:0;border-top-right-radius:0}@media print{.tutorial-example a{display:none}}h3 code{border:0;font-size:20px}section{position:relative;top:-50px;padding-top:50px;margin-bottom:-50px}section h2{margin-top:50px}section h3{margin-top:32px}@media(max-width:991px){#navcolumn{position:relative !important;margin-bottom:60px}}@media(min-width:992px){#manualcontent{padding-left:280px}}.nav-pills{margin-bottom:20px}.nav-pills li a{padding:8px 12px}.manual-example table{border-top:1px solid #e5e5e5}.manual-example table td{white-space:pre-wrap;font-family:Monaco,Menlo,Consolas,"Courier New",monospace}.manual-example table td.jqprogram{font-weight:bold}.manual-example table th{text-align:right;padding-right:10px}@media print{#navcolumn{display:none !important}.manual-example{display:block !important;height:auto !important}.jqplay-btn{display:none !important}}footer{background-color:#f5f5f5;padding:20px 0;margin-top:40px;color:#999;text-align:center}footer p{margin:8px 0}.twitter-typeahead{width:100%}.tt-menu{width:100%;padding:8px 0;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.tt-suggestion{padding:3px 20px}.tt-suggestion:hover{cursor:pointer;color:#fff;background-color:#446e9b}.tt-suggestion.tt-cursor{color:#fff;background-color:#446e9b}.tt-suggestion p{margin:0} \ No newline at end of file
diff --git a/css/base.scss b/css/base.scss
index 81eaa3ec..c89257ac 100644
--- a/css/base.scss
+++ b/css/base.scss
@@ -72,15 +72,25 @@ body {
/* manual.liquid ******************************************/
-section {
- padding-top: 24px;
-}
-
h3 code {
border: 0;
font-size: 20px;
}
+section {
+ /* Adjust spacing so that anchors are not hidden behind nav bar */
+ position: relative;
+ top: -50px;
+ padding-top: 50px;
+ margin-bottom: -50px;
+ h2 {
+ margin-top: 50px;
+ }
+ h3 {
+ margin-top: 32px;
+ }
+}
+
@media(max-width: 991px){
#navcolumn {
/* Put nav column above manual content */
@@ -143,3 +153,38 @@ footer {
margin: 8px 0;
}
}
+
+/* typeahead **********************************************/
+
+.twitter-typeahead {
+ width: 100%;
+}
+
+.tt-menu {
+ width: 100%;
+ padding: 8px 0;
+ border: 1px solid #ccc;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+ border-radius: 8px;
+ -webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+ -moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
+ box-shadow: 0 5px 10px rgba(0,0,0,.2);
+}
+
+.tt-suggestion {
+ padding: 3px 20px;
+ &:hover {
+ cursor: pointer;
+ color: #fff;
+ background-color: #446e9b;
+ }
+ &.tt-cursor {
+ color: #fff;
+ background-color: #446e9b;
+ }
+ p {
+ margin: 0;
+ }
+}
diff --git a/css/typeaheadjs.css b/css/typeaheadjs.css
deleted file mode 100644
index b9a3ec72..00000000
--- a/css/typeaheadjs.css
+++ /dev/null
@@ -1 +0,0 @@
-.twitter-typeahead{width:100%}.tt-menu{width:100%;padding:8px 0;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2)}.tt-suggestion{padding:3px 20px}.tt-suggestion:hover{cursor:pointer;color:#fff;background-color:#446e9b}.tt-suggestion.tt-cursor{color:#fff;background-color:#446e9b}.tt-suggestion p{margin:0} \ No newline at end of file
diff --git a/download/index.html b/download/index.html
index 0ef56a8c..a330a12b 100644
--- a/download/index.html
+++ b/download/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/download/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>
diff --git a/index.html b/index.html
index 69fade07..615fd2bf 100644
--- a/index.html
+++ b/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>
diff --git a/index/index.html b/index/index.html
index 69fade07..615fd2bf 100644
--- a/index/index.html
+++ b/index/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>
diff --git a/manual/index.html b/manual/index.html
index 8140c453..84e1fa39 100644
--- a/manual/index.html
+++ b/manual/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/manual/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>
diff --git a/manual/v1.3/index.html b/manual/v1.3/index.html
index 0fe99288..eb06da7e 100644
--- a/manual/v1.3/index.html
+++ b/manual/v1.3/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/manual/v1.3/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>
diff --git a/manual/v1.4/index.html b/manual/v1.4/index.html
index 6aa924b2..87c071aa 100644
--- a/manual/v1.4/index.html
+++ b/manual/v1.4/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/manual/v1.4/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>
diff --git a/manual/v1.5/index.html b/manual/v1.5/index.html
index dbe13a5c..c6ea882e 100644
--- a/manual/v1.5/index.html
+++ b/manual/v1.5/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/manual/v1.5/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>
diff --git a/sitemap.xml b/sitemap.xml
index aa95c10a..b5fbdbb5 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -2,37 +2,37 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://stedolan.github.io/jq</loc>
- <lastmod>2015-10-12</lastmod>
+ <lastmod>2015-10-13</lastmod>
<changefreq>monthly</changefreq>
</url>
<url>
<loc>https://stedolan.github.io/jq/tutorial/</loc>
- <lastmod>2015-10-12</lastmod>
+ <lastmod>2015-10-13</lastmod>
<changefreq>monthly</changefreq>
</url>
<url>
<loc>https://stedolan.github.io/jq/manual/</loc>
- <lastmod>2015-10-12</lastmod>
+ <lastmod>2015-10-13</lastmod>
<changefreq>monthly</changefreq>
</url>
<url>
<loc>https://stedolan.github.io/jq/manual/v1.3/</loc>
- <lastmod>2015-10-12</lastmod>
+ <lastmod>2015-10-13</lastmod>
<changefreq>monthly</changefreq>
</url>
<url>
<loc>https://stedolan.github.io/jq/manual/v1.4/</loc>
- <lastmod>2015-10-12</lastmod>
+ <lastmod>2015-10-13</lastmod>
<changefreq>monthly</changefreq>
</url>
<url>
<loc>https://stedolan.github.io/jq/manual/v1.5/</loc>
- <lastmod>2015-10-12</lastmod>
+ <lastmod>2015-10-13</lastmod>
<changefreq>monthly</changefreq>
</url>
<url>
<loc>https://stedolan.github.io/jq/download/</loc>
- <lastmod>2015-10-12</lastmod>
+ <lastmod>2015-10-13</lastmod>
<changefreq>monthly</changefreq>
</url>
</urlset>
diff --git a/tutorial/index.html b/tutorial/index.html
index 9b70e146..e906b6d7 100644
--- a/tutorial/index.html
+++ b/tutorial/index.html
@@ -12,7 +12,6 @@
<link rel="canonical" href="https://stedolan.github.io/jq/tutorial/" />
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/spacelab/bootstrap.min.css" rel="stylesheet" integrity="sha256-j7Dtnd7ZjexEiPNbscbopFn9+Cs0b3TLipKsWAPHZIM= sha512-RFhfi6P8zWMAJrEGU+CPjuxPh3r/UUBGqQ+/o6WKPIVZmQqeOipGotH2ihRULuQ8wsMBoK15TSZqc/7VYWyuIw==" crossorigin="anonymous">
<link rel="stylesheet" href="/jq/css/base.css" type="text/css">
- <link rel="stylesheet" href="/jq/css/typeaheadjs.css" type="text/css">
<!--[if lt IE 9]>
<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>