Swift 2 support

natecook1000 · natecook1000 · commit 29f100c886ed · 2015-06-10T18:16:03.000-07:00
diff --git a/_assets/css/theme.css.less b/_assets/css/theme.css.less
@@ -138,9 +138,6 @@ body.home {
             }
         }
     }
-    .version {
-        color: rgba(255, 255, 255, 0.7);
-    }
 }
 
 .select2-results {
@@ -192,9 +189,6 @@ body.home {
     #accordion {
         margin: 30px 0;
     
-        #versions {
-            margin-top: 30px;
-        }
         .panel {
             color: @panel-text;
             background: @panel-bottom;
@@ -234,6 +228,15 @@ a {
     color: @content-link;
 }
 
+#version {
+    background: #eee;
+    
+    .container {
+        text-align: center;
+        padding: 5px 0;
+    }
+}
+
 .content {
     margin: 0 0 50px;
     
@@ -353,6 +356,10 @@ a {
         }
     }
     
+    .declaration .comment {
+        margin: -0.5em 0 20px 30px;
+    }
+    
     code {
         background: transparent;
         color: inherit;
diff --git a/_config.yml b/_config.yml
@@ -7,7 +7,7 @@ baseurl:            ""
 url:                "http://swiftdoc.org"
 twitter_username:   SwiftDocOrg
 github_username:    SwiftDocOrg
-swift_version:      "Swift version 1.2 (swiftlang-602.0.49.3)"
+swift_version:      "Swift version 1.2 (602.0.49.3) & 2.0 (700.0.38.1)"
 
 port:               4040
 include:            [ "_[A-Z]*", "__[A-Z]*" ]
diff --git a/_includes/head.html b/_includes/head.html
@@ -4,7 +4,11 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    {% if page.title == "Home" %}
+    <title>{{ site.title }} &#8212; {{ site.description }}</title>
+    {% else %}
     <title>{% if page.title %}{{ page.title | strip_html }} &#8212; {% endif %}{{ site.title }}</title>
+    {% endif %}
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="{{ meta_description }}">
     <meta name="keywords" content="{{ meta_keywords }}">
@@ -52,7 +56,7 @@
       <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-    {% if page.version %}
-    <script src="/assets/js/swift-linkdata-{{ page.version }}.js"></script>
+    {% if page.root %}
+    <script src="{{ page.root }}/assets/js/swift-linkdata.js"></script>
     {% endif %}
   </head>
diff --git a/_includes/header.html b/_includes/header.html
@@ -34,11 +34,23 @@ <h1><a href="/">SwiftDoc.org</a></h1>
 			<h1><a href="/">{{ site.title }}</a></h1>
 			<p>Auto-generated documentation for <a href="https://developer.apple.com/swift/">Swift</a>. Command-click no more.</p>
 			
-			{% if page.url == "/index.html" %}
+			{% if page.layout == "home" %}
     		<div class="form-group form-group-lg input-group-lg has-feedback">
     			<input type="hidden" class="form-control select2">
     			<span class="glyphicon glyphicon-search form-control-feedback"></span>
     		</div>
     		{% endif %}
 		</div>
 	</div>
+
+    {% unless page.url contains "/news" %}
+    <div id="version">
+		<div class="container">
+    		{% if page.url contains "/swift-2" %}
+			Swift version: <a href="/">1.2</a> &nbsp;|&nbsp; <strong>2.0</strong>
+    		{% else %}
+			Swift version: <strong>1.2</strong> &nbsp;|&nbsp; <a href="/swift-2/">2.0</a>
+    		{% endif %}
+		</div>
+    </div>
+    {% endunless %}
diff --git a/_includes/post.html b/_includes/post.html
@@ -9,13 +9,4 @@ <h1><a href="{{ post.url | prepend: site.baseurl }}">{{ post.title }}</a></h1>
     {{ content }}
     </article>
 
-    <p class="meta">
-      <span class="tags">
-      <span class="glyphicon glyphicon-tag"></span>
-      {% for tag in post.tags %}
-      <a href="{{ site.baseurl }}/news/tags/{{ tag }}">{{ tag }}</a>
-      {% endfor %}
-      </span>
-    </p>
-
   </div>
diff --git a/index.html b/index.html
@@ -1,6 +1,7 @@
 ---
 layout: "home"
 title: "Home"
+root: ""
 ---
 
     <div class="container-fluid home-block">
@@ -324,7 +325,6 @@ <h2>Operators</h2>
             <h2>Globals</h2>
 
             <ul class="main-list">
-<li><a href="/global/var/">Variables</a></li>
 <li><a href="/global/alias/">Type Aliases</a></li>
 </ul>
 

Original file line number	Diff line number	Diff line change
`@@ -138,9 +138,6 @@ body.home {`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`
`141`		`- .version {`
`142`		`- color: rgba(255, 255, 255, 0.7);`
`143`		`- }`
`144`	`141`	`}`
`145`	`142`
`146`	`143`	`.select2-results {`
`@@ -192,9 +189,6 @@ body.home {`
`192`	`189`	`#accordion {`
`193`	`190`	`margin: 30px 0;`
`194`	`191`
`195`		`- #versions {`
`196`		`- margin-top: 30px;`
`197`		`- }`
`198`	`192`	`.panel {`
`199`	`193`	`color: @panel-text;`
`200`	`194`	`background: @panel-bottom;`
`@@ -234,6 +228,15 @@ a {`
`234`	`228`	`color: @content-link;`
`235`	`229`	`}`
`236`	`230`
	`231`	`+#version {`
	`232`	`+ background: #eee;`
	`233`	`+`
	`234`	`+ .container {`
	`235`	`+ text-align: center;`
	`236`	`+ padding: 5px 0;`
	`237`	`+ }`
	`238`	`+}`
	`239`	`+`
`237`	`240`	`.content {`
`238`	`241`	`margin: 0 0 50px;`
`239`	`242`
`@@ -353,6 +356,10 @@ a {`
`353`	`356`	`}`
`354`	`357`	`}`
`355`	`358`
	`359`	`+ .declaration .comment {`
	`360`	`+ margin: -0.5em 0 20px 30px;`
	`361`	`+ }`
	`362`	`+`
`356`	`363`	`code {`
`357`	`364`	`background: transparent;`
`358`	`365`	`color: inherit;`