Mercurial > hg > thermostat-website
changeset 71:4980b1410c79
Update website with new front page look.
Merge from branch: development
| author | Jie Kang <jkang@redhat.com> |
|---|---|
| date | Fri, 03 Feb 2017 10:23:09 -0500 |
| parents | 3465c28a7b2e (diff) b5c26476b5b9 (current diff) |
| children | 1bde1edf0fc5 |
| files | content/contribute/content.html content/downloads/content.html content/getting-started/content.html content/head.1.html content/head.html css/style.css |
| diffstat | 7 files changed, 287 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Feb 03 09:54:54 2017 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# -# This is just a deployment helper. To use, type "make deploy" or even just "make" -# You will get a permission error if you are not a member of the "icedtea" group -# on the server, or possibly if your account's shell does not permit the use of -# rsync, It is assumed that your current user has pubkey set up for accessing the -# server. -# -# If your local user is not the same as the remote user, "REMOTE_USER=myuser make" -# will help you out. -# - -# Files matching this pattern will *not* be synced in either direction. -EXCLUDE_FILE = rsync-exclude -RSYNC = rsync -REMOTE_SERVER = icedtea.classpath.org -REMOTE_PATH = /var/lib/thermostat-web -REMOTE_ARGS = --exclude-from=$(EXCLUDE_FILE) -arvz ./ - -ifndef REMOTE_USER - REMOTE_USER=$(USER) -endif - -all: deploy - -deploy: - $(RSYNC) $(REMOTE_ARGS) $(REMOTE_USER)@$(REMOTE_SERVER):$(REMOTE_PATH) -
--- a/content/downloads/content.html Fri Feb 03 09:54:54 2017 -0500 +++ b/content/downloads/content.html Fri Feb 03 10:23:09 2017 -0500 @@ -8,7 +8,7 @@ <div class="row"> <div class="col-md-4"> <h3>Latest Stable Release</h3> - <a href="http://icedtea.classpath.org/download/thermostat/thermostat-1.6.4.tar.gz" class="btn btn-default btn-c1" role="button"><span class="glyphicon glyphicon-download-alt" aria-hidden="true"> Thermostat-1.6.4</a> + <a href="http://icedtea.classpath.org/download/thermostat/thermostat-1.6.6.tar.gz" class="btn btn-default btn-c1" role="button"><span class="glyphicon glyphicon-download-alt" aria-hidden="true"> Thermostat-1.6.6</a> </div> <div class="col-md-4"> <h3>Unstable Development Release</h3>
--- a/content/getting-started/content.html Fri Feb 03 09:54:54 2017 -0500 +++ b/content/getting-started/content.html Fri Feb 03 10:23:09 2017 -0500 @@ -33,15 +33,18 @@ </code></p> </div> <div class="col-md-4"> - <h4> Get the latest <a href="../downloads">Download</a>.</h4> + <h4> Get the latest <a href="../downloads">Release</a>.</h4> <p><code> - $ tar xvf thermostat-1.6.4.tar.gz + $ tar xvf thermostat-1.6.6.tar.gz </code></p> <p><code> - $ cd thermostat-1.6.4 && mvn clean integration-test + $ sudo dnf install mercurial maven mongodb mongodb-server java-1.8.0-openjdk libsecret-devel make gcc gtk2-devel autoconf automake libtool </code></p> <p><code> - $ export PATH=$PATH:path/to/thermostat-1.6.4/distribution/target/image/bin + $ cd thermostat-1.6.6 && mvn clean integration-test + </code></p> + <p><code> + $ export PATH=$PATH:path/to/thermostat-1.6.6/distribution/target/image/bin </code></p> </div> <div class="col-md-4">
--- a/content/head.1.html Fri Feb 03 09:54:54 2017 -0500 +++ b/content/head.1.html Fri Feb 03 10:23:09 2017 -0500 @@ -3,10 +3,10 @@ <!--<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> + <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">
--- a/content/head.html Fri Feb 03 09:54:54 2017 -0500 +++ b/content/head.html Fri Feb 03 10:23:09 2017 -0500 @@ -3,10 +3,10 @@ <!--<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> + <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">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/css/style.css Fri Feb 03 10:23:09 2017 -0500 @@ -0,0 +1,271 @@ +/* colours */ +/* sizes */ +/* content-divs */ +#content-header { + background-color: #27426e; +} +#content-body { + background-color: #ffffff; +} +#content-footer { + background-color: #ffffff; +} +.space10 { + margin-top: 10px; +} +.space40 { + margin-top: 40px; +} +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; + background-attachment: fixed; + margin-bottom: 0px; +} +/* front page get-started section */ +#front-page-get-started { + background-color: #27426e; +} +#front-page-images { + background-color: #ffffff; +} +/* front page video */ +#front-page-video { + margin: 25px; +} +/* front page image */ +.rel-box { + position: relative; +} +.graph-img { + max-width: 100%; +} +.graph-under { + position: absolute; + top: 35%; + left: 50%; + margin-right: -50%; + transform: translate(-50%, -50%); +} +.logo-img { + margin-top: 100px; + max-width: 20%; +} +@media (min-width: 768px) { + .logo-img { + max-width: 15%; + } +} +@media (min-width: 992px) { + .logo-img { + max-width: 10%; + } +} +/* background box */ +.bg-colour { + background-color: #27426e; +} +.bg-img { + background: url(../img/tms-graph.png); + background-size: cover; + background-repeat: no-repeat; +} +/* navbar */ +/**/ +.navbar-default { + background: #27426e; + font-size: 1.2em; + border: none; + margin-bottom: 0px; +} +.navbar-default .navbar-nav > li > a { + color: #ffffff; + background-color: #27426e; +} +.navbar-default .navbar-nav > li > a:hover, +.navbar-default .navbar-nav > li > a:focus { + color: #dcdcdc; + background-color: #27426e; +} +.navbar-default .navbar-nav > .active > a, +.navbar-default .navbar-nav > .active > a:hover, +.navbar-default .navbar-nav > .active > a:focus { + color: #ffffff; + font-size: 1.1em; + background-color: #27426e; +} +.navbar-default .navbar-nav > .open > a, +.navbar-default .navbar-nav > .open > a:hover, +.navbar-default .navbar-nav > .open > a:focus { + color: #ffffff; + background-color: #27426e; +} +.navbar-default .navbar-collapse, +.navbar-default .navbar-form { + border-color: #27426e; +} +.navbar-default .navbar-nav .open .dropdown-menu > li > a { + background-color: #27426e; + color: #ffffff; +} +.navbar-nav > li > .dropdown-menu { + background-color: #27426e; +} +.navbar-c1 { + margin-right: 0.1em; +} +.navbar-title { + font-size: 1.3em; + color: #ffffff !important; +} +/* bs-docs-sidebar */ +/**/ +body { + height: 100%; + position: relative; +} +.fixed { + position: fixed; +} +/* sidebar */ +.bs-docs-sidebar { + padding-left: 5px; + padding-right: 10px; + margin-top: 20px; + margin-bottom: 20px; +} +/* all links */ +.bs-docs-sidebar .nav > li > a { + color: #4c4c4c; + border-left: 2px solid transparent; + padding: 4px 10px; + font-size: 1.1em; + font-weight: 400; +} +/* nested links */ +.bs-docs-sidebar .nav .nav > li > a { + padding-top: 1px; + padding-bottom: 1px; + padding-left: 30px; + font-size: 12px; +} +/* active & hover links */ +.bs-docs-sidebar .nav > .active > a, +.bs-docs-sidebar .nav > li > a:hover, +.bs-docs-sidebar .nav > li > a:focus { + color: #27426e; + text-decoration: none; + background-color: transparent; + border-left-color: #27426e; +} +/* all active links */ +.bs-docs-sidebar .nav > .active > a, +.bs-docs-sidebar .nav > .active:hover > a, +.bs-docs-sidebar .nav > .active:focus > a { + font-weight: 700; +} +/* nested active links */ +.bs-docs-sidebar .nav .nav > .active > a, +.bs-docs-sidebar .nav .nav > .active:hover > a, +.bs-docs-sidebar .nav .nav > .active:focus > a { + font-weight: 500; +} +/* hide inactive nested list */ +.bs-docs-sidebar .nav ul.nav { + display: none; +} +/* show active nested list */ +.bs-docs-sidebar .nav > .active > ul.nav { + display: block; +} +.back-to-top { + color: #4c4c4c; + border-left: 2px solid transparent; + margin-top: 10px; + padding: 4px 10px; + font-size: 1em; + font-weight: 400; + display: block; +} +/* button */ +/**/ +.btn-c1 { + color: #27426e; +} +.btn-c1:hover, +.btn-c1:focus, +.btn-c1:active, +.btn-c1.active, +.open > .dropdown-toggle.btn-c1 { + background: rgba(255, 255, 255, 0.75); + color: #27426e; +} +.btn-large { + padding: 0.3em 1em; + font-size: 1.3em; +} +.btn-xlarge { + padding: 0.5em 3em; + font-size: 1.4em; +} +.btn-transparent { + background: rgba(255, 255, 255, 0.5); + color: #27426e; + border-color: #000000; +} +/* panel */ +/**/ +.panel-default { + border-color: #ffffff; +} +.panel-default .panel-heading { + background: #ffffff; + border-color: #ffffff; +} +h1.panel-title { + color: #27426e; + font-size: 2.2em; +} +h2.panel-title { + color: #27426e; + font-size: 2em; +} +.h3-steps { + margin-top: 1.5em; +} +/* text */ +.wordwrap { + word-wrap: break-word; +} +/**/ +h1 { + color: #27426e; +} +h2 { + color: #27426e; +} +h3 { + color: #27426e; +} +.black { + color: #000000; +} +.white { + color: #ffffff; +} +.h3c { + color: #ffffff; +} +.h4c { + margin-top: 2em; + font-size: 1.5em; + color: #27426e; +} +.terminology-link { + color: #4c4c4c; +}