Mercurial > hg > thermostat-website

changeset 51:4c8b5fbdf707 development

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move divs above scripts. Use normalize.css. Temporarily use local boostrap js/css files on home page.
author Jie Kang <jkang@redhat.com>
date Tue, 01 Nov 2016 11:07:05 -0400
parents 06fac27b853d
children 076502ce51ab
files contribute/index.html documentation/index.html downloads/index.html getting-started/index.html index.html
diffstat 5 files changed, 39 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/contribute/index.html	Mon Oct 31 16:39:34 2016 -0400
+++ b/contribute/index.html	Tue Nov 01 11:07:05 2016 -0400
@@ -12,10 +12,17 @@
   <!-- Latest compiled and minified CSS -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
     crossorigin="anonymous">
+  <link rel="stylesheet" href="./css/normalize.css">
   <link href="../css/style.css" rel="stylesheet">
 </head>
 
 <body>
+  <div class="container" id="content-header">
+  </div>
+
+  <div class="container" id="content-body">
+  </div>
+
   <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
   <!-- Include all compiled plugins (below), or include individual files as needed -->
@@ -23,12 +30,6 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
     crossorigin="anonymous"></script>
 
-  <div class="container" id="content-header">
-  </div>
-
-  <div class="container" id="content-body">
-  </div>
-
   <script>
     $( "#content-header" ).load( "../content/head.1.html" );
     $( "#content-body" ).load( "../content/contribute/content.html" );
--- a/documentation/index.html	Mon Oct 31 16:39:34 2016 -0400
+++ b/documentation/index.html	Tue Nov 01 11:07:05 2016 -0400
@@ -12,10 +12,16 @@
   <!-- Latest compiled and minified CSS -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
     crossorigin="anonymous">
+  <link rel="stylesheet" href="./css/normalize.css">
   <link href="../css/style.css" rel="stylesheet">
 </head>
 
 <body>
+  <div class="container" id="content-header">
+  </div>
+
+  <div class="container" id="content-body">
+  </div>
   <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
   <!-- Include all compiled plugins (below), or include individual files as needed -->
@@ -23,12 +29,6 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
     crossorigin="anonymous"></script>
 
-  <div class="container" id="content-header">
-  </div>
-
-  <div class="container" id="content-body">
-  </div>
-
   <script>
     $( "#content-header" ).load( "../content/head.1.html" );
     $( "#content-body" ).load( "../content/documentation/content.html" );
--- a/downloads/index.html	Mon Oct 31 16:39:34 2016 -0400
+++ b/downloads/index.html	Tue Nov 01 11:07:05 2016 -0400
@@ -12,10 +12,16 @@
   <!-- Latest compiled and minified CSS -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
     crossorigin="anonymous">
+  <link rel="stylesheet" href="./css/normalize.css">
   <link href="../css/style.css" rel="stylesheet">
 </head>
 
 <body>
+  <div class="container" id="content-header">
+  </div>
+
+  <div class="container" id="content-body">
+  </div>
   <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
   <!-- Include all compiled plugins (below), or include individual files as needed -->
@@ -23,12 +29,6 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
     crossorigin="anonymous"></script>
 
-  <div class="container" id="content-header">
-  </div>
-
-  <div class="container" id="content-body">
-  </div>
-
   <script>
     $( "#content-header" ).load( "../content/head.1.html" );
     $( "#content-body" ).load( "../content/downloads/content.html" );
--- a/getting-started/index.html	Mon Oct 31 16:39:34 2016 -0400
+++ b/getting-started/index.html	Tue Nov 01 11:07:05 2016 -0400
@@ -12,10 +12,17 @@
   <!-- Latest compiled and minified CSS -->
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
     crossorigin="anonymous">
+  <link rel="stylesheet" href="./css/normalize.css">
   <link href="../css/style.css" rel="stylesheet">
 </head>
 
 <body>
+  <div class="container" id="content-header">
+  </div>
+
+  <div class="container" id="content-body">
+  </div>
+
   <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
   <!-- Include all compiled plugins (below), or include individual files as needed -->
@@ -23,12 +30,6 @@
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
     crossorigin="anonymous"></script>
 
-  <div class="container" id="content-header">
-  </div>
-
-  <div class="container" id="content-body">
-  </div>
-
   <script>
     $( "#content-header" ).load( "../content/head.1.html" );
     $( "#content-body" ).load( "../content/getting-started/content.html" );
--- a/index.html	Mon Oct 31 16:39:34 2016 -0400
+++ b/index.html	Tue Nov 01 11:07:05 2016 -0400
@@ -10,24 +10,28 @@
 
   <!-- Bootstrap -->
   <!-- Latest compiled and minified CSS -->
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
-    crossorigin="anonymous">
-  <link href="./css/style.css" rel="stylesheet">
+  <!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u"
+    crossorigin="anonymous">-->
+  <link rel="stylesheet" href="./css/bootstrap.min.css">
+  <link rel="stylesheet" href="./css/normalize.css">
+  <link rel="stylesheet" href="./css/style.css" >
 </head>
 
 <body>
+     
+  <div class="container" id="content-header">
+  </div>
+
+  <div class="container" id="content-body">
+  </div>
+
   <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
   <!-- Include all compiled plugins (below), or include individual files as needed -->
   <!-- Latest compiled and minified JavaScript -->
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
     crossorigin="anonymous"></script>
-
-  <div class="container" id="content-header">
-  </div>
-
-  <div class="container" id="content-body">
-  </div>
+  <script src="./js/bootstrap.min.js"></script>
 
   <script>
     $( "#content-header" ).load( "./content/head.html" );