Mercurial > hg > thermostat-website
changeset 64:6e03d0b7c037 development
Update front-page (WIP). Add hgignore. Change structure of header, body divs. Add footer div.
| author | Jie Kang <jkang@redhat.com> |
|---|---|
| date | Thu, 17 Nov 2016 14:49:50 -0500 |
| parents | 5e1777059f9d |
| children | 236c53729f3c |
| files | .hgignore content/head.1.html content/head.html content/home/content.html contribute/index.html css/style.less documentation/index.html downloads/index.html getting-started/index.html img/flexibility_curved_building_istock.png index.html |
| diffstat | 11 files changed, 157 insertions(+), 95 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Thu Nov 17 14:49:50 2016 -0500 @@ -0,0 +1,2 @@ +syntax:glob +css/style.css
--- a/content/head.1.html Wed Nov 02 18:10:24 2016 -0400 +++ b/content/head.1.html Thu Nov 17 14:49:50 2016 -0500 @@ -1,36 +1,38 @@ -<nav class="navbar navbar-default"> - <!--<nav class="navbar navbar-default navbar-fixed-top">--> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#top-navbar"> +<div class="container" id="nav-container"> + <nav class="navbar navbar-default"> + <!--<nav class="navbar navbar-default navbar-fixed-top">--> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#top-navbar"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a id="nav-home" class="navbar-brand navbar-title" href="../">Thermostat</a> - </div> - <div class="collapse navbar-collapse" id="top-navbar"> - <ul class="nav navbar-nav"> - <li id="nav-getting-started"><a href="../getting-started">Getting Started</a></li> - <li id="nav-documentation"><a href="../documentation">Documentation</a></li> - <li id="nav-contribute"><a href="../contribute">Contribute</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="http://icedtea.classpath.org/mailman/listinfo/thermostat">Mailing List</a></li> - <li><a href="http://webchat.freenode.net/?channels=#thermostat">Chat over IRC</a></li> - </ul> - </li> - </ul> - <ul class="nav navbar-nav navbar-right navbar-c1"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Sources <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="http://icedtea.classpath.org/hg/thermostat/">2.0 (HEAD)</a></li> - <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.6/">1.6</a></li> - <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.4">1.4</a></li> - </ul> - </li> - <li id="nav-downloads"><a href="../downloads">Downloads</a></li> - </ul> - </div> -</nav> \ No newline at end of file + <a id="nav-home" class="navbar-brand navbar-title" href="../">Thermostat</a> + </div> + <div class="collapse navbar-collapse" id="top-navbar"> + <ul class="nav navbar-nav"> + <li id="nav-getting-started"><a href="../getting-started">Getting Started</a></li> + <li id="nav-documentation"><a href="../documentation">Documentation</a></li> + <li id="nav-contribute"><a href="../contribute">Contribute</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="http://icedtea.classpath.org/mailman/listinfo/thermostat">Mailing List</a></li> + <li><a href="http://webchat.freenode.net/?channels=#thermostat">Chat over IRC</a></li> + </ul> + </li> + </ul> + <ul class="nav navbar-nav navbar-right navbar-c1"> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Sources <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="http://icedtea.classpath.org/hg/thermostat/">2.0 (HEAD)</a></li> + <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.6/">1.6</a></li> + <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.4">1.4</a></li> + </ul> + </li> + <li id="nav-downloads"><a href="../downloads">Downloads</a></li> + </ul> + </div> + </nav> +</div> \ No newline at end of file
--- a/content/head.html Wed Nov 02 18:10:24 2016 -0400 +++ b/content/head.html Thu Nov 17 14:49:50 2016 -0500 @@ -1,36 +1,38 @@ -<nav class="navbar navbar-default"> - <!--<nav class="navbar navbar-default navbar-fixed-top">--> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#top-navbar"> +<div class="container" id="nav-container"> + <nav class="navbar navbar-default"> + <!--<nav class="navbar navbar-default navbar-fixed-top">--> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#top-navbar"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a id="nav-home" class="navbar-brand navbar-title" href="./">Thermostat</a> - </div> - <div class="collapse navbar-collapse" id="top-navbar"> - <ul class="nav navbar-nav"> - <li id="nav-getting-started"><a href="./getting-started">Getting Started</a></li> - <li id="nav-documentation"><a href="./documentation">Documentation</a></li> - <li id="nav-contribute"><a href="./contribute">Contribute</a></li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="http://icedtea.classpath.org/mailman/listinfo/thermostat">Mailing List</a></li> - <li><a href="http://webchat.freenode.net/?channels=#thermostat">Chat over IRC</a></li> - </ul> - </li> - </ul> - <ul class="nav navbar-nav navbar-right navbar-c1"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Sources <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="http://icedtea.classpath.org/hg/thermostat/">2.0 (HEAD)</a></li> - <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.6/">1.6</a></li> - <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.4">1.4</a></li> - </ul> - </li> - <li id="nav-downloads"><a href="./downloads">Downloads</a></li> - </ul> - </div> -</nav> \ No newline at end of file + <a id="nav-home" class="navbar-brand navbar-title" href="./">Thermostat</a> + </div> + <div class="collapse navbar-collapse" id="top-navbar"> + <ul class="nav navbar-nav"> + <li id="nav-getting-started"><a href="./getting-started">Getting Started</a></li> + <li id="nav-documentation"><a href="./documentation">Documentation</a></li> + <li id="nav-contribute"><a href="./contribute">Contribute</a></li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Community <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="http://icedtea.classpath.org/mailman/listinfo/thermostat">Mailing List</a></li> + <li><a href="http://webchat.freenode.net/?channels=#thermostat">Chat over IRC</a></li> + </ul> + </li> + </ul> + <ul class="nav navbar-nav navbar-right navbar-c1"> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Sources <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="http://icedtea.classpath.org/hg/thermostat/">2.0 (HEAD)</a></li> + <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.6/">1.6</a></li> + <li><a href="http://icedtea.classpath.org/hg/release/thermostat-1.4">1.4</a></li> + </ul> + </li> + <li id="nav-downloads"><a href="./downloads">Downloads</a></li> + </ul> + </div> + </nav> +</div> \ No newline at end of file
--- a/content/home/content.html Wed Nov 02 18:10:24 2016 -0400 +++ b/content/home/content.html Thu Nov 17 14:49:50 2016 -0500 @@ -1,16 +1,17 @@ -<div class="rel-box"> - <img class="graph-img" src="./img/tms-graph-50.png" alt="" /> - <div class="text-center graph-under"> - <img class="logo-img" src="./img/thermostat_icon_500px.png" alt="Thermostat" /> - <h2> - Thermostat - </h2> - <h3> - The powerful instrumentation tool for the Hotspot JVM. - </h3> - <a href="downloads" class="btn btn-default navbar-btn btn-c1 btn-xlarge" role="button"><span class="glyphicon glyphicon-download-alt" aria-hidden="true"></span> Download</a> +<div class="jumbotron" id="front-page-jumbotron"> + <div class="container"> + <div class="text-center"> + <img class="logo-img" src="./img/thermostat_icon_500px.png" alt="Thermostat" /> + <h2> + Thermostat + </h2> + <h3> + The powerful instrumentation tool for the Hotspot JVM. + </h3> + </div> </div> </div> + <!--<div class="row"> <div class="col-sm-4"> </div>
--- a/contribute/index.html Wed Nov 02 18:10:24 2016 -0400 +++ b/contribute/index.html Thu Nov 17 14:49:50 2016 -0500 @@ -17,12 +17,15 @@ </head> <body> - <div class="container" id="content-header"> + <div id="content-header"> </div> <div class="container" id="content-body"> </div> + <div class="container" id="content-footer"> + </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 -->
--- a/css/style.less Wed Nov 02 18:10:24 2016 -0400 +++ b/css/style.less Thu Nov 17 14:49:50 2016 -0500 @@ -9,6 +9,33 @@ /* sizes */ @screen-md-min: 992px; +/* content-divs */ +#content-header { + background-color: @dark-blue; + height: 10%; + max-height: 50px; +} + +#content-body { + height: 90%; + background-color: @white; +} + +#content-footer { + background-color: @white; +} + +html { + height: 100%; +} + +/* front page jumbotron */ +#front-page-jumbotron { + background-image: url(../img/flexibility_curved_building_istock.png); + background-size: cover; + background-repeat: no-repeat; +} + /* front page image */ .rel-box { position:relative; @@ -33,7 +60,7 @@ @media (min-width: @screen-md-min) { .logo-img { margin-top: 100px; - max-width: 25%; + max-width: 10%; } } @@ -50,32 +77,37 @@ /* navbar */ /**/ + +#nav-container { + max-height: 50px; +} + .navbar-default { background: none; + font-size: 1.2em; border: none; -// border-bottom-color: @dark-blue; - font-size: 1.2em; + margin-bottom: 0px; } .navbar-default .navbar-nav > li > a { - color: @dark-blue; + color: @white; } .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus { - color: @grey; + color: @light-grey; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus { - color: @dark-blue; + color: @white; font-size: 1.1em; - background-color: @white; + background-color: @dark-blue; } .navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:focus { - color: @grey; - background-color: @white; + color: @white; + background-color: @dark-blue; } .navbar-default .navbar-collapse, @@ -89,11 +121,12 @@ .navbar-title { font-size: 1.3em; - color: @dark-blue !important; + color: @white !important; } /* bs-docs-sidebar */ /**/ body { + height: 100%; position: relative; } @@ -219,6 +252,14 @@ color: @dark-blue; } +.black { + color: @black; +} + +.white { + color: @white; +} + .h3c { color: @white; }
--- a/documentation/index.html Wed Nov 02 18:10:24 2016 -0400 +++ b/documentation/index.html Thu Nov 17 14:49:50 2016 -0500 @@ -17,11 +17,15 @@ </head> <body> - <div class="container" id="content-header"> + <div id="content-header"> </div> <div class="container" id="content-body"> </div> + + <div class="container" id="content-footer"> + </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 -->
--- a/downloads/index.html Wed Nov 02 18:10:24 2016 -0400 +++ b/downloads/index.html Thu Nov 17 14:49:50 2016 -0500 @@ -17,11 +17,15 @@ </head> <body> - <div class="container" id="content-header"> + <div id="content-header"> </div> <div class="container" id="content-body"> </div> + + <div class="container" id="content-footer"> + </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 -->
--- a/getting-started/index.html Wed Nov 02 18:10:24 2016 -0400 +++ b/getting-started/index.html Thu Nov 17 14:49:50 2016 -0500 @@ -17,12 +17,15 @@ </head> <body> - <div class="container" id="content-header"> + <div id="content-header"> </div> <div class="container" id="content-body"> </div> + <div class="container" id="content-footer"> + </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 -->
--- a/index.html Wed Nov 02 18:10:24 2016 -0400 +++ b/index.html Thu Nov 17 14:49:50 2016 -0500 @@ -12,17 +12,18 @@ <!-- 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/bootstrap.min.css">--> <link rel="stylesheet" href="./css/normalize.css"> - <link rel="stylesheet" href="./css/style.css" > + <link href="./css/style.css" rel="stylesheet"> </head> <body> - - <div class="container" id="content-header"> + <div id="content-header"> </div> - <div class="container" id="content-body"> + <div id="content-body"> + </div> + + <div class="container" id="content-footer"> </div> <!-- jQuery (necessary for Bootstrap's JavaScript plugins) --> @@ -31,7 +32,6 @@ <!-- 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> - <!--<script src="./js/bootstrap.min.js"></script>--> <script src="./js/load-page.js"></script> <script>