You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ri...@apache.org on 2014/12/22 14:47:44 UTC
[1/8] incubator-brooklyn git commit: refactor docs (no content or
style changes)
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master d14c06961 -> fda04de83
refactor docs (no content or style changes)
inherit from a common base, move footer to an inclue, add comments to CSS for readability, and introduce a guide-base from which guide-normal inherits
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/4dc23aa0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/4dc23aa0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/4dc23aa0
Branch: refs/heads/master
Commit: 4dc23aa0d4731e778df3ad9e5ef222ef43a8ec9d
Parents: c4d907a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Dec 18 12:59:16 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Dec 18 13:31:14 2014 +0000
----------------------------------------------------------------------
docs/_includes/base-head.html | 9 ++
docs/_includes/footer.html | 18 +++
docs/_layouts/base.html | 25 ++++
docs/_layouts/guide-base.html | 185 ++++++++++++++++++++++++++++
docs/_layouts/guide-normal.html | 206 ++++----------------------------
docs/_layouts/website-base.html | 35 ++++--
docs/_layouts/website-landing.html | 17 +++
docs/_layouts/website-normal.html | 39 +++---
docs/style/css/base.css | 54 +++++++++
docs/style/css/guide.css | 4 +-
docs/style/css/website.css | 49 --------
11 files changed, 375 insertions(+), 266 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_includes/base-head.html
----------------------------------------------------------------------
diff --git a/docs/_includes/base-head.html b/docs/_includes/base-head.html
new file mode 100644
index 0000000..2d5a0b4
--- /dev/null
+++ b/docs/_includes/base-head.html
@@ -0,0 +1,9 @@
+
+<title>{{ page.title }} - Apache Brooklyn (incubating)</title>
+
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+
+<link href="{% dependency_url bootstrap.css %}" rel="stylesheet">
+<link href="{{site.path.style}}/deps/bootstrap-theme.css" rel="stylesheet">
+<link href="{{site.path.style}}/css/base.css" rel="stylesheet">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_includes/footer.html
----------------------------------------------------------------------
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
new file mode 100644
index 0000000..f9121cf
--- /dev/null
+++ b/docs/_includes/footer.html
@@ -0,0 +1,18 @@
+<div id="footer">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-10 text-muted">
+ Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
+ License v2.0</a>.
+ <br />
+ Apache Brooklyn is currently undergoing Incubation at The Apache Software
+ Foundation.
+ </div>
+ <div class="col-md-2">
+ <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/{{ page.path }}">Edit This Page</a>
+ <br />
+ <a href="{{ site.url_root }}{{ site.path.website }}/community/how-to-contribute-docs.html">help with editing</a>
+ </div>
+ </div>
+ </div>
+</div>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_layouts/base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
new file mode 100644
index 0000000..8b77367
--- /dev/null
+++ b/docs/_layouts/base.html
@@ -0,0 +1,25 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+{{ content }}
+
+</html>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_layouts/guide-base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-base.html b/docs/_layouts/guide-base.html
new file mode 100644
index 0000000..ab41e68
--- /dev/null
+++ b/docs/_layouts/guide-base.html
@@ -0,0 +1,185 @@
+---
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+layout: base
+---
+
+<head>
+ <meta http-equiv="content-type" content="text/html; charset=utf-8" />
+ <title>{{ page.title }}</title>
+
+ <link rel="stylesheet" href="{{ site.path.style }}/css/website.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{{ site.path.style }}/css/guide.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{{ site.path.style }}/css/guide-toc.css" type="text/css" media="screen" />
+ <link rel="stylesheet" href="{{ site.path.style }}/css/code.css" type="text/css" media="screen" />
+
+ <script type="text/javascript" src="https://www.google.com/jsapi"></script>
+
+ <!-- Sidebar/ToC Scripts and CSS -->
+ <script src="{{ site.path.style }}/deps/jquery.js"></script>
+ <script src="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.min.js"></script>
+ <link rel="stylesheet" type="text/css" href="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.css" />
+
+ <script type="text/javascript" src="{{ site.path.style }}/deps/superfish.js"></script>
+ <script type="text/javascript" src="{{ site.path.style }}/deps/jquery.cookie.js"></script>
+
+<!-- Clipboard support -->
+<script src="//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.3.1/ZeroClipboard.min.js"></script>
+<style type="text/css">
+.clipboard_container { float: right; padding: 8px; }
+.clipboard_button {
+ background-image: url("{{ site.path.style }}/img/clipboard-green-normal.png");
+ background-size: 18px 21px;
+ width: 18px; height: 21px;
+}
+.clipboard_button:hover, .clipboard_button.zeroclipboard-is-hover { background-image: url("{{ site.path.style }}/img/clipboard-green-hover.png"); }
+.clipboard_button:active, .clipboard_button.zeroclipboard-is-active { background-image: url("{{ site.path.style }}/img/clipboard-green-click.png"); }'
+</style>
+<script type="text/javascript"> <!-- clipboard -->
+ ZeroClipboard.config({ moviePath: '//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.3.1/ZeroClipboard.swf' });
+</script>
+<script type="text/javascript"> <!-- clipboard positioning -->
+$(document).ready(function() {
+ $('<div class="clipboard_container" title="Copy to Clipboard">'+
+ '<div class="clipboard_button"/>'+
+ '</div>').insertBefore($('div.highlight'))
+ $('div.clipboard_container').each(function(index) {
+ var clipboard = new ZeroClipboard();
+ clipboard.clip( $(this).find(":first")[0], $(this)[0] );
+ var target = $(this).next();
+ var txt = target.text().trim();
+ if (target.find('code.bash')) {
+ // Strip out bash prompts from the start of each line (i.e. '$' or '%' characters
+ // at the very start, or immediately following any newline). Correctly handles continuation
+ // lines, where a leading '$' or '%' is *not* a prompt character.
+ txt = txt.replace(/(^|[^\\]\n)[$%] /g, "$1");
+ }
+ clipboard.on( 'dataRequested', function (client, args) {
+ client.setText( txt );
+ });
+ });
+});
+</script>
+
+ <script type="text/javascript">
+ // initialise menu delay
+ jQuery(function(){
+ jQuery('ul#mainmenu').superfish({
+ autoArrows: false, // disable generation of arrow mark-up
+ dropShadows: false, // disable drop shadows
+ disableHI: true, // set to true to disable hoverIntent detection
+ delay: 500, // the delay in milliseconds that the mouse can remain outside a submenu without it closing
+ speed: 'fast',
+ });
+ });
+ </script>
+
+<script type="text/javascript">
+
+<!-- search -->
+ $(function() {
+ $('#simple_google')
+ .submit(function() {
+ $('input[name="q"]').val("site:" + document.location.hostname + " " + $('input[name="brooklyn-search"]').val());
+ return true;
+ });
+ $('input[name="brooklyn-search"]').focus(function() {
+ if ($(this).val() === $(this).attr('placeholder')) {
+ $(this).val('');
+ }
+ })
+ .blur(function() {
+ if ($(this).val() === '') {
+ $(this).val($(this).attr('placeholder'));
+ }
+ })
+ .blur();
+ });
+
+<!-- page notes -->
+ $(function() {
+ if (document.location.pathname.replace(/^\/([^\/]*).*$/, '$1') === "v"){
+ var thisversion = document.location.pathname.split("/")[2],
+ msg = "";
+
+ if (thisversion != 'latest' && !$.cookie('brooklyn_versions') ||
+ (($.inArray('ALL', $.cookie('brooklyn_versions').split(",")) === -1) &&
+ ($.inArray(thisversion, $.cookie('brooklyn_versions').split(",")) === -1)) ){
+ msg += "<div class='warning_banner_image'><img src='{{ site.path.style }}/img/warning.png'/></div>";
+ msg += "<p>This content is for <strong>Brooklyn "+thisversion+"</strong>, and may differ across versions.</p>";
+ msg += "<p>Are you using version "+thisversion+"?</p>";
+ msg += "<p class='warning_banner_buttons'>";
+ msg += "<a href = '#' onclick=\"set_user_version('"+thisversion+"');\">Yes, hide this warning</a>";
+ msg += "<a href = '{{ site.page.guide }}'>No, show me the latest version</a>";
+ msg += "<a href = '{{ site.page.guide }}/meta/versions.html'>Show all versions</a>";
+ msg += "</p>"
+
+ $('#page_notes').html(msg);
+ $('#page_notes').fadeIn('slow');
+ }
+ }
+ });
+ function get_user_versions() {
+ return $.cookie("brooklyn_versions") ? $.cookie("brooklyn_versions").split(",") : [];
+ };
+ function set_user_version(version) {
+ var version_cookie = get_user_versions();
+ version_cookie.push(version);
+ $.cookie('brooklyn_versions', version_cookie, { expires: 365, path: '/' });
+ $('#page_notes').fadeOut();
+ event.preventDefault ? event.preventDefault() : event.returnValue = false;
+ };
+ function set_user_versions_all() {
+ var version_cookie = get_user_versions();
+ version_cookie.push("ALL");
+ $.cookie('brooklyn_versions', version_cookie, { expires: 365, path: '/' });
+ $('#page_notes').fadeOut();
+ event.preventDefault ? event.preventDefault() : event.returnValue = false;
+ };
+ function clear_user_versions() {
+ $.removeCookie('brooklyn_versions', { path: '/' });
+ $('#page_notes').fadeIn('slow');
+ event.preventDefault ? event.preventDefault() : event.returnValue = false;
+ };
+
+
+ <!-- analytics -->
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-30530918-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+</script>
+
+</head>
+
+<body>
+
+ <ul id="shortcuts" title="Accessibility shortcuts menu">
+ <li><a href="#maincontent">Skip to main content</a></li>
+ </ul>
+
+
+{{ content }}
+
+
+</body>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_layouts/guide-normal.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-normal.html b/docs/_layouts/guide-normal.html
index 8633bbc..10356cb 100644
--- a/docs/_layouts/guide-normal.html
+++ b/docs/_layouts/guide-normal.html
@@ -1,186 +1,23 @@
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>{{ page.title }}</title>
-
- <link rel="stylesheet" href="{{ site.path.style }}/css/guide.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="{{ site.path.style }}/css/guide-toc.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="{{ site.path.style }}/css/code.css" type="text/css" media="screen" />
-
- <script type="text/javascript" src="https://www.google.com/jsapi"></script>
-
- <!-- Sidebar/ToC Scripts and CSS -->
- <script src="{{ site.path.style }}/deps/jquery.js"></script>
- <script src="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.min.js"></script>
- <link rel="stylesheet" type="text/css" href="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.css" />
-
- <script type="text/javascript" src="{{ site.path.style }}/deps/superfish.js"></script>
- <script type="text/javascript" src="{{ site.path.style }}/deps/jquery.cookie.js"></script>
-
-
-<!-- Clipboard support -->
-<script src="//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.3.1/ZeroClipboard.min.js"></script>
-<style type="text/css">
-.clipboard_container { float: right; padding: 8px; }
-.clipboard_button {
- background-image: url("{{ site.path.style }}/img/clipboard-green-normal.png");
- background-size: 18px 21px;
- width: 18px; height: 21px;
-}
-.clipboard_button:hover, .clipboard_button.zeroclipboard-is-hover { background-image: url("{{ site.path.style }}/img/clipboard-green-hover.png"); }
-.clipboard_button:active, .clipboard_button.zeroclipboard-is-active { background-image: url("{{ site.path.style }}/img/clipboard-green-click.png"); }'
-</style>
-<script type="text/javascript"> <!-- clipboard -->
- ZeroClipboard.config({ moviePath: '//cdnjs.cloudflare.com/ajax/libs/zeroclipboard/1.3.1/ZeroClipboard.swf' });
-</script>
-<script type="text/javascript"> <!-- clipboard positioning -->
-$(document).ready(function() {
- $('<div class="clipboard_container" title="Copy to Clipboard">'+
- '<div class="clipboard_button"/>'+
- '</div>').insertBefore($('div.highlight'))
- $('div.clipboard_container').each(function(index) {
- var clipboard = new ZeroClipboard();
- clipboard.clip( $(this).find(":first")[0], $(this)[0] );
- var target = $(this).next();
- var txt = target.text().trim();
- if (target.find('code.bash')) {
- // Strip out bash prompts from the start of each line (i.e. '$' or '%' characters
- // at the very start, or immediately following any newline). Correctly handles continuation
- // lines, where a leading '$' or '%' is *not* a prompt character.
- txt = txt.replace(/(^|[^\\]\n)[$%] /g, "$1");
- }
-console.log("setting text to "+txt);
- clipboard.on( 'dataRequested', function (client, args) {
- client.setText( txt );
- });
- });
-});
-</script>
-
- <script type="text/javascript">
- // initialise menu delay
- jQuery(function(){
- jQuery('ul#mainmenu').superfish({
- autoArrows: false, // disable generation of arrow mark-up
- dropShadows: false, // disable drop shadows
- disableHI: true, // set to true to disable hoverIntent detection
- delay: 500, // the delay in milliseconds that the mouse can remain outside a submenu without it closing
- speed: 'fast',
- });
- });
- </script>
-
-<script type="text/javascript">
-
-<!-- search -->
- $(function() {
- $('#simple_google')
- .submit(function() {
- $('input[name="q"]').val("site:" + document.location.hostname + " " + $('input[name="brooklyn-search"]').val());
- return true;
- });
- $('input[name="brooklyn-search"]').focus(function() {
- if ($(this).val() === $(this).attr('placeholder')) {
- $(this).val('');
- }
- })
- .blur(function() {
- if ($(this).val() === '') {
- $(this).val($(this).attr('placeholder'));
- }
- })
- .blur();
- });
-
-<!-- page notes -->
- $(function() {
- if (document.location.pathname.replace(/^\/([^\/]*).*$/, '$1') === "v"){
- var thisversion = document.location.pathname.split("/")[2],
- msg = "";
-
- if (thisversion != 'latest' && !$.cookie('brooklyn_versions') ||
- (($.inArray('ALL', $.cookie('brooklyn_versions').split(",")) === -1) &&
- ($.inArray(thisversion, $.cookie('brooklyn_versions').split(",")) === -1)) ){
- msg += "<div class='warning_banner_image'><img src='{{ site.path.style }}/img/warning.png'/></div>";
- msg += "<p>This content is for <strong>Brooklyn "+thisversion+"</strong>, and may differ across versions.</p>";
- msg += "<p>Are you using version "+thisversion+"?</p>";
- msg += "<p class='warning_banner_buttons'>";
- msg += "<a href = '#' onclick=\"set_user_version('"+thisversion+"');\">Yes, hide this warning</a>";
- msg += "<a href = '{{ site.page.guide }}'>No, show me the latest version</a>";
- msg += "<a href = '{{ site.page.guide }}/meta/versions.html'>Show all versions</a>";
- msg += "</p>"
-
- $('#page_notes').html(msg);
- $('#page_notes').fadeIn('slow');
- }
- }
- });
- function get_user_versions() {
- return $.cookie("brooklyn_versions") ? $.cookie("brooklyn_versions").split(",") : [];
- };
- function set_user_version(version) {
- var version_cookie = get_user_versions();
- version_cookie.push(version);
- $.cookie('brooklyn_versions', version_cookie, { expires: 365, path: '/' });
- $('#page_notes').fadeOut();
- event.preventDefault ? event.preventDefault() : event.returnValue = false;
- };
- function set_user_versions_all() {
- var version_cookie = get_user_versions();
- version_cookie.push("ALL");
- $.cookie('brooklyn_versions', version_cookie, { expires: 365, path: '/' });
- $('#page_notes').fadeOut();
- event.preventDefault ? event.preventDefault() : event.returnValue = false;
- };
- function clear_user_versions() {
- $.removeCookie('brooklyn_versions', { path: '/' });
- $('#page_notes').fadeIn('slow');
- event.preventDefault ? event.preventDefault() : event.returnValue = false;
- };
-
-
- <!-- analytics -->
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-30530918-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-</script>
-
-</head>
-
-<body>
-
- <ul id="shortcuts" title="Accessibility shortcuts menu">
- <li><a href="#maincontent">Skip to main content</a></li>
- </ul>
-
+---
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+layout: guide-base
+---
<div id="container">
@@ -242,6 +79,3 @@ console.log("setting text to "+txt);
</div><!--footer -->
</div><!--container-->
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_layouts/website-base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/website-base.html b/docs/_layouts/website-base.html
index 17cb459..c63aaf7 100644
--- a/docs/_layouts/website-base.html
+++ b/docs/_layouts/website-base.html
@@ -1,15 +1,31 @@
-<!DOCTYPE html>
-<html lang="en">
+---
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+layout: base
+---
<head>
-<title>{{ page.title }} - Apache Brooklyn (incubating)</title>
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<link href="{% dependency_url bootstrap.css %}" rel="stylesheet">
-<link href="{{site.path.style}}/deps/bootstrap-theme.css" rel="stylesheet">
-<link href="{{site.path.style}}/css/website.css" rel="stylesheet">
+
+ {% include base-head.html %}
+
</head>
+
<body>
<nav class="navbar navbar-default navbar-fixed-top" id="header" role="navigation">
@@ -71,6 +87,3 @@
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
});</script>
</body>
-
-</html>
-
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_layouts/website-landing.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/website-landing.html b/docs/_layouts/website-landing.html
index 4b9878d..a3ae36a 100644
--- a/docs/_layouts/website-landing.html
+++ b/docs/_layouts/website-landing.html
@@ -1,4 +1,21 @@
---
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
# layout for front page, contianing only the footer, with a bit more text
layout: website-base
---
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/_layouts/website-normal.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/website-normal.html b/docs/_layouts/website-normal.html
index 130819d..a0596e4 100644
--- a/docs/_layouts/website-normal.html
+++ b/docs/_layouts/website-normal.html
@@ -1,5 +1,23 @@
---
-# layout for most website (non-guide) pages, inheriting base for the menu bar, and providing a main column of content and a menu column
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# layout for most website pages, inheriting base for the menu bar, and providing a main column of content and a menu column
+# (not used for the landing page, and not used for the guide)
layout: website-base
---
<div class="container">
@@ -21,21 +39,4 @@ layout: website-base
</div>
</div>
-<div id="footer">
- <div class="container">
- <div class="row">
- <div class="col-md-10 text-muted">
- Apache Brooklyn is distributed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache
- License v2.0</a>.
- <br />
- Apache Brooklyn is currently undergoing Incubation at The Apache Software
- Foundation.
- </div>
- <div class="col-md-2">
- <a class="btn btn-sm btn-default" href="https://github.com/apache/incubator-brooklyn/edit/master/docs/{{ page.path }}">Edit This Page</a>
- <br />
- <a href="{{ site.url_root }}{{ site.path.website }}/community/how-to-contribute-docs.html">help with editing</a>
- </div>
- </div>
- </div>
-</div>
+{% include footer.html %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/style/css/base.css
----------------------------------------------------------------------
diff --git a/docs/style/css/base.css b/docs/style/css/base.css
new file mode 100644
index 0000000..46fd90d
--- /dev/null
+++ b/docs/style/css/base.css
@@ -0,0 +1,54 @@
+
+/* WEBSITE MENUS
+ ----------------------------------------------------------------------- */
+
+/* top menu bar */
+.navbar-brand {
+ margin-top: -4px;
+ margin-left: -30px !important;
+}
+
+/* pop-up menu */
+ul.nav li.dropdown:hover > ul.dropdown-menu {
+ display: block;
+}
+
+
+/* FOOTER
+ ----------------------------------------------------------------------- */
+
+/* sticky footer */
+html {
+ position: relative;
+ min-height: 100%;
+}
+
+@media (min-width: 1200px) {
+ .slightlyNarrowContainer {
+ width: 970px;
+ }
+}
+
+#footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ /* Set the fixed height of the footer here */
+ padding-top: 1em;
+ padding-bottom: 1em;
+ background-color: #f5f5f5;
+ text-align: center;
+}
+
+
+/* LANDING PAGE
+ ----------------------------------------------------------------------- */
+
+#apachebrooklynbanner {
+ background-image: url("../img/apache-brooklyn-logo-817px-wide.png");
+ background-repeat: no-repeat;
+ background-position: center;
+ width: 817px;
+ height: 99px;
+ margin-bottom: 50px;
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/style/css/guide.css
----------------------------------------------------------------------
diff --git a/docs/style/css/guide.css b/docs/style/css/guide.css
index 93d93b1..0a89027 100644
--- a/docs/style/css/guide.css
+++ b/docs/style/css/guide.css
@@ -135,7 +135,9 @@ div.warning{
#footer p#linklove a {color: #b6b6b6; text-decoration: none;}
#footer p#linklove a:hover {text-decoration: underline;}
-/* CODE */
+
+/* CODE RENDERING
+ ----------------------------------------------------------------------- */
pre {
font-family: Consolas, Lucida Console, Monaco, monospace;
background-color:#e8eded;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/4dc23aa0/docs/style/css/website.css
----------------------------------------------------------------------
diff --git a/docs/style/css/website.css b/docs/style/css/website.css
deleted file mode 100644
index 135c2b0..0000000
--- a/docs/style/css/website.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Sticky footer styles
--------------------------------------------------- */
-html {
- position: relative;
- min-height: 100%;
-}
-
-@media (min-width: 1200px) {
- .slightlyNarrowContainer {
- width: 970px;
- }
-}
-
-.navbar-brand {
- margin-top: -4px;
- margin-left: -30px !important;
-}
-
-ul.nav li.dropdown:hover > ul.dropdown-menu {
- display: block;
-}
-
-#apachebrooklynbanner {
- background-image: url("../img/apache-brooklyn-logo-817px-wide.png");
- background-repeat: no-repeat;
- background-position: center;
- width: 817px;
- height: 99px;
- margin-bottom: 50px;
-}
-
-#brooklynbridge {
- background-image: url("../img/bridge-large-no-title.png");
- background-repeat: no-repeat;
- background-position: center;
- width: 342px;
- height: 242px;
-}
-
-#footer {
- position: absolute;
- bottom: 0;
- width: 100%;
- /* Set the fixed height of the footer here */
- padding-top: 1em;
- padding-bottom: 1em;
- background-color: #f5f5f5;
- text-align: center;
-}
[6/8] incubator-brooklyn git commit: notes on use of rdiscount and
pygments (neither helpful though)
Posted by ri...@apache.org.
notes on use of rdiscount and pygments (neither helpful though)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e6307edf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e6307edf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e6307edf
Branch: refs/heads/master
Commit: e6307edf163aa3ed27844c53cd6a8123581e7566
Parents: bc54341
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Dec 19 10:04:44 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Dec 19 11:44:10 2014 +0000
----------------------------------------------------------------------
docs/_build/config-pygments.yml | 28 ++++++++++++++++++++++++++++
docs/_build/config-rdiscount.yml | 28 ++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6307edf/docs/_build/config-pygments.yml
----------------------------------------------------------------------
diff --git a/docs/_build/config-pygments.yml b/docs/_build/config-pygments.yml
new file mode 100644
index 0000000..29f85d5
--- /dev/null
+++ b/docs/_build/config-pygments.yml
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# this uses python pygments engine to render code;
+# with recent jekyll (dec 2014) i can't see any difference,
+# and the formatting appears to be following pygments rules
+# without it, so perhaps the jekyll ruby highlighter is very
+# good (identical? i see a pygments gem, even if the docs
+# say it is using something called "rouge");
+# included here so it is documented at least.
+# NB: you may need `python easy_install pygments`
+highlighter: pygments
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e6307edf/docs/_build/config-rdiscount.yml
----------------------------------------------------------------------
diff --git a/docs/_build/config-rdiscount.yml b/docs/_build/config-rdiscount.yml
new file mode 100644
index 0000000..aa82ee3
--- /dev/null
+++ b/docs/_build/config-rdiscount.yml
@@ -0,0 +1,28 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+# add this file as a config to use "rdiscount" markdown processor
+# instead of the default ruby/jekyll one.
+# rdiscount is the original, and C-based, so a bit faster
+# (but not much, 7s vs 8.5s on my system -alex)
+# and slightly more forgiving, e.g. for <a href="chapter"> tags
+# on a line directly about a section header
+# (ruby markdown seems to want a blank line between the two).
+# NB: this requires adding "rdiscount" to your Gemfile, then `cd ~ ; cd -`
+markdown: rdiscount
[3/8] incubator-brooklyn git commit: add icon links for twitter,
github, and IRC; and use scss, because jekyll allows
Posted by ri...@apache.org.
add icon links for twitter, github, and IRC; and use scss, because jekyll allows
just using a bit of scss, but it looks like it can help a lot to ensure consistent colors
also restored helvetica neue is font of choice
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5bf2807c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5bf2807c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5bf2807c
Branch: refs/heads/master
Commit: 5bf2807cb0ba4031e35b3825fd6dc0dd1cd894d5
Parents: 09c98bd
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Dec 18 21:40:54 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Dec 19 11:43:36 2014 +0000
----------------------------------------------------------------------
docs/_includes/base-scss.scss | 10 +
docs/_includes/topmenu.html | 13 +
docs/_layouts/base.html | 7 +-
docs/_layouts/guide-normal.html | 14 -
docs/style/css/base.css | 115 ------
docs/style/css/base.scss | 150 +++++++
docs/style/img/github-1024-black.png | Bin 0 -> 15613 bytes
docs/style/img/github-256-black.png | Bin 0 -> 12166 bytes
docs/style/img/github-256-green.png | Bin 0 -> 13875 bytes
docs/style/img/irc-256-black.png | Bin 0 -> 4446 bytes
docs/style/img/irc-256-green.png | Bin 0 -> 5731 bytes
docs/style/img/irc-icon.graffle | 640 +++++++++++++++++++++++++++++
docs/style/img/twitter-256-black.png | Bin 0 -> 10590 bytes
docs/style/img/twitter-256-green.png | Bin 0 -> 11732 bytes
docs/style/img/twitter-4096-black.png | Bin 0 -> 45680 bytes
docs/website/learnmore/index.md | 6 +-
16 files changed, 824 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/_includes/base-scss.scss
----------------------------------------------------------------------
diff --git a/docs/_includes/base-scss.scss b/docs/_includes/base-scss.scss
new file mode 100644
index 0000000..85ab671
--- /dev/null
+++ b/docs/_includes/base-scss.scss
@@ -0,0 +1,10 @@
+
+$text_color: #393939;
+
+/* this green is approx what is in the logo (taken from image picker) */
+$brooklyn_green: #6db34b;
+
+$a_color: #483;
+$a_hover_color: $brooklyn_green;
+
+$code_bg_color: #e8eded;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/_includes/topmenu.html
----------------------------------------------------------------------
diff --git a/docs/_includes/topmenu.html b/docs/_includes/topmenu.html
index 9d33243..0230f1c 100644
--- a/docs/_includes/topmenu.html
+++ b/docs/_includes/topmenu.html
@@ -1,5 +1,17 @@
<nav class="navbar navbar-default navbar-fixed-top" id="header" role="navigation">
<div class="container">
+
+ <div id="navbar-icons-extra">
+ <a href="https://github.com/apache/incubator-brooklyn" class="navbar-icon navbar-icon-shift icon-github"
+ data-toggle="tooltip" data-placement="bottom" title="GitHub: apache/incubator-brooklyn" data-delay="400"/>
+ <a href="https://twitter.com/#!/search?q=brooklyncentral" class="navbar-icon navbar-icon-shift icon-twitter"
+ data-toggle="tooltip" data-placement="bottom" title="Twitter: @brooklyncentral" data-delay="400"/>
+ <a href="http://webchat.freenode.net/?channels=brooklyncentral" class="navbar-icon icon-irc"
+ data-toggle="tooltip" data-placement="bottom" title="IRC: freenode #brooklyncentral" data-delay="400"/>
+ <!-- extra a element seems needed else landing page first menu item copies an icon above (!?) -->
+ <a style="width: 0px; height: 0px;"></a>
+ </div>
+
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
@@ -37,6 +49,7 @@
{% endfor %}
</ul>
</div><!-- /.navbar-collapse -->
+
</div><!-- /.container-fluid -->
</div>
</nav>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/_layouts/base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index 4299467..da97748 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -35,7 +35,12 @@ under the License.
$(window).load(function () {
$('body').css('padding-top', parseInt($('#header').css("height"))+10);
$('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
- });</script>
+ });
+ $(function () {
+ $('[data-toggle="tooltip"]').tooltip()
+ })
+</script>
+
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/_layouts/guide-normal.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-normal.html b/docs/_layouts/guide-normal.html
index 04840e3..736c838 100644
--- a/docs/_layouts/guide-normal.html
+++ b/docs/_layouts/guide-normal.html
@@ -25,20 +25,6 @@ layout: guide-base
<div id="header">
-<!--
- <div id="identity">
- <a href="{{ site.path.website }}/">Brooklyn</a>
- </div>
-
- <ul id="quicklinks">
- <li><a href="{{site.path.guide}}/meta/versions.html">{{ site.brooklyn-version }}</a></li>
- <li><a href="{{site.path.guide}}/start/download.html">Download</a></li>
- <li><a href="https://github.com/apache/incubator-brooklyn">GitHub</a></li>
- <li><a href="https://twitter.com/#!/search?q=brooklyncentral">Twitter</a></li>
- <li><a href="{{site.path.guide}}/meta/contact.html">Contact</a></li>
- </ul>
--->
-
<div id="menubar">
{% include topbar.html %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/css/base.css
----------------------------------------------------------------------
diff --git a/docs/style/css/base.css b/docs/style/css/base.css
deleted file mode 100644
index 30bfafd..0000000
--- a/docs/style/css/base.css
+++ /dev/null
@@ -1,115 +0,0 @@
-
-/* BASIC STYLES
- ----------------------------------------------------------------------- */
-body {margin: 0px; padding: 10px 0px 20px 0px; font-family: arial, helvetica, sans-serif; background-color: #ffffff; color: #393939; }
-h1, h2, h3, h4, h5, h6 {}
-input, select, textarea {}
-p, li, label, td, th,input, select, textarea {}
-h1 {margin: 0 0 20px 0; padding: 0; font-size: 32px; font-weight: normal; color: #4d9d3a; border-bottom: 1px solid #e9e9e9;}
-h2 {margin: 1.25em 0 20px 0; font-size: 20px; font-weight: normal; color: #4f8243}
-h3 {margin: 1.1em 0 20px 0; font-size: 17px; font-weight: bold; color: #111111;}
-h4 {margin: 1.1em 0 20px 0; font-size: 15px; font-weight: bold;}
-textarea {width: 500px; padding: 2px 5px;}
-p, input, label, li {}
-p { margin: 0.75em 0; line-height: 1.4em;}
-form {padding: 0; margin: 0;}
-img {border: 0;}
-a {color: #4f9d3c;}
-a:hover {text-decoration: none;}
-
-
-/* WEBSITE MENUS
- ----------------------------------------------------------------------- */
-
-/* top menu bar */
-.navbar-brand {
- margin-top: -4px;
- margin-left: -30px !important;
-}
-
-/* pop-up menu */
-ul.nav li.dropdown:hover > ul.dropdown-menu {
- display: block;
-}
-
-
-/* FOOTER
- ----------------------------------------------------------------------- */
-
-/* sticky footer */
-html {
- position: relative;
- min-height: 100%;
-}
-
-@media (min-width: 1200px) {
- .slightlyNarrowContainer {
- width: 970px;
- }
-}
-
-#footer {
- position: absolute;
- bottom: 0;
- width: 100%;
- /* Set the fixed height of the footer here */
- padding-top: 1em;
- padding-bottom: 1em;
- background-color: #f5f5f5;
- text-align: center;
-}
-
-
-/* CODE RENDERING
- ----------------------------------------------------------------------- */
-pre {
- font-family: Consolas, Lucida Console, Monaco, monospace;
- background-color:#e8eded;
- padding: 0.4em 0.8em;
- white-space: pre;
- word-wrap: normal;
- overflow-y: scroll;
- overflow-x: scroll;
- /* override border and line-height on 'pre' from bootstrap */
- border: none;
- border-radius: 2px;
- line-height: 1;
-}
-code {
- font-family: Consolas, Lucida Console, Monaco, monospace;
- font-size: 85%;
- /* override color and bg-color on 'code' from bootstrap, and a touch more padding on top since font-size is smaller */
- color: black;
- background-color:#e8eded;
- padding: 4px 4px 2px 4px;
- border-radius: 3px;
-}
-pre code {
- /* override settings on 'pre code' from bootstrap */
- font-size: 85%;
- line-height: 1;
- white-space: pre;
- word-wrap: normal;
- overflow-x: scroll;
- /** and no padding since pre already has some */
- padding: 0px;
-}
-.highlight { background-color:#e8eded; } /* clipboard icon should have the same background color as the code */
-
-.nowrap {
- white-space: pre;
- word-wrap: normal;
- overflow-x: scroll;
-}
-
-/* LANDING PAGE
- ----------------------------------------------------------------------- */
-
-#apachebrooklynbanner {
- background-image: url("../img/apache-brooklyn-logo-817px-wide.png");
- background-repeat: no-repeat;
- background-position: center;
- width: 817px;
- height: 99px;
- margin-bottom: 50px;
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/css/base.scss
----------------------------------------------------------------------
diff --git a/docs/style/css/base.scss b/docs/style/css/base.scss
new file mode 100644
index 0000000..8356379
--- /dev/null
+++ b/docs/style/css/base.scss
@@ -0,0 +1,150 @@
+---
+---
+
+{% include base-scss.scss %}
+
+/* BASIC STYLES
+ ----------------------------------------------------------------------- */
+body {
+ margin: 0px;
+ padding: 10px 0px 20px 0px;
+ font-family: helvetica neue, helvetica, arial, sans-serif;
+ background-color: #ffffff;
+ color: $text_color;
+}
+h1, h2, h3, h4, h5, h6 {}
+input, select, textarea {}
+p, li, label, td, th,input, select, textarea {}
+p, input, label, li {}
+p { margin: 0.75em 0; line-height: 1.4em;}
+form {padding: 0; margin: 0;}
+img {border: 0;}
+
+a {color: $a_color;}
+a:hover {text-decoration: none; color: $a_hover_color;}
+
+
+/* WEBSITE MENUS
+ ----------------------------------------------------------------------- */
+
+/* top menu bar */
+.navbar-brand {
+ margin-top: -4px;
+ margin-left: -30px !important;
+}
+
+@mixin icon($name) {
+ .icon-#{$name} {
+ width: 32px;
+ height: 32px;
+ background: url('{{ site.path.style }}/img/'+$name+'-256-black.png');
+ background-size: 32px 32px;
+ }
+ .icon-#{$name}:hover {
+ background: url('{{ site.path.style }}/img/'+$name+'-256-green.png');
+ background-size: 32px 32px;
+ }
+}
+
+.navbar {
+ @include icon('github');
+ @include icon('twitter');
+ @include icon('irc');
+}
+
+#navbar-icons-extra {
+ float: right;
+ margin-right: -114px;
+ padding-top: 10px;
+ a {
+ display: inline-block;
+ width: 32px;
+ height: 32px;
+ }
+}
+.navbar-icon-shift { margin-right: -2px; }
+
+/* pop-up menu */
+ul.nav li.dropdown:hover > ul.dropdown-menu {
+ display: block;
+}
+
+
+/* FOOTER
+ ----------------------------------------------------------------------- */
+
+/* sticky footer */
+html {
+ position: relative;
+ min-height: 100%;
+}
+
+@media (min-width: 1200px) {
+ .slightlyNarrowContainer {
+ width: 970px;
+ }
+}
+
+#footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ /* Set the fixed height of the footer here */
+ padding-top: 1em;
+ padding-bottom: 1em;
+ background-color: #f5f5f5;
+ text-align: center;
+}
+
+
+/* CODE RENDERING
+ ----------------------------------------------------------------------- */
+@mixin nowrap() {
+ white-space: pre;
+ word-wrap: normal;
+ overflow-y: scroll;
+}
+
+pre {
+ font-family: Consolas, Lucida Console, Monaco, monospace;
+ @include nowrap();
+ background-color:$code_bg_color;
+ padding: 0.4em 0.8em;
+ overflow-x: scroll;
+ /* override border and line-height on 'pre' from bootstrap */
+ border: none;
+ border-radius: 2px;
+ line-height: 1;
+ code {
+ /* override settings on 'pre code' from bootstrap */
+ font-size: 85%;
+ line-height: 1;
+ @include nowrap();
+ /** and no padding since pre already has some */
+ padding: 0px;
+ }
+}
+code {
+ font-family: Consolas, Lucida Console, Monaco, monospace;
+ font-size: 85%;
+ /* override color and bg-color on 'code' from bootstrap, and a touch more padding on top since font-size is smaller */
+ color: black;
+ background-color:$code_bg_color;
+ padding: 4px 4px 2px 4px;
+ border-radius: 3px;
+}
+.highlight { background-color:$code_bg_color; } /* clipboard icon should have the same background color as the code */
+
+.nowrap { @include nowrap(); }
+
+/* LANDING PAGE
+ ----------------------------------------------------------------------- */
+
+#apachebrooklynbanner {
+ background-image: url("../img/apache-brooklyn-logo-817px-wide.png");
+ background-repeat: no-repeat;
+ background-position: center;
+ width: 817px;
+ height: 99px;
+ margin-bottom: 50px;
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/github-1024-black.png
----------------------------------------------------------------------
diff --git a/docs/style/img/github-1024-black.png b/docs/style/img/github-1024-black.png
new file mode 100644
index 0000000..4da00ba
Binary files /dev/null and b/docs/style/img/github-1024-black.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/github-256-black.png
----------------------------------------------------------------------
diff --git a/docs/style/img/github-256-black.png b/docs/style/img/github-256-black.png
new file mode 100644
index 0000000..2352523
Binary files /dev/null and b/docs/style/img/github-256-black.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/github-256-green.png
----------------------------------------------------------------------
diff --git a/docs/style/img/github-256-green.png b/docs/style/img/github-256-green.png
new file mode 100644
index 0000000..2b42448
Binary files /dev/null and b/docs/style/img/github-256-green.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/irc-256-black.png
----------------------------------------------------------------------
diff --git a/docs/style/img/irc-256-black.png b/docs/style/img/irc-256-black.png
new file mode 100644
index 0000000..91469f5
Binary files /dev/null and b/docs/style/img/irc-256-black.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/irc-256-green.png
----------------------------------------------------------------------
diff --git a/docs/style/img/irc-256-green.png b/docs/style/img/irc-256-green.png
new file mode 100644
index 0000000..ab18118
Binary files /dev/null and b/docs/style/img/irc-256-green.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/irc-icon.graffle
----------------------------------------------------------------------
diff --git a/docs/style/img/irc-icon.graffle b/docs/style/img/irc-icon.graffle
new file mode 100644
index 0000000..77f9e67
--- /dev/null
+++ b/docs/style/img/irc-icon.graffle
@@ -0,0 +1,640 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>ActiveLayerIndex</key>
+ <integer>0</integer>
+ <key>ApplicationVersion</key>
+ <array>
+ <string>com.omnigroup.OmniGrafflePro</string>
+ <string>139.16.0.171715</string>
+ </array>
+ <key>AutoAdjust</key>
+ <true/>
+ <key>BackgroundGraphic</key>
+ <dict>
+ <key>Bounds</key>
+ <string>{{0, 0}, {389.19683837890625, 366.19683837890625}}</string>
+ <key>Class</key>
+ <string>SolidGraphic</string>
+ <key>ID</key>
+ <integer>2</integer>
+ <key>Style</key>
+ <dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>NO</string>
+ </dict>
+ <key>stroke</key>
+ <dict>
+ <key>Draws</key>
+ <string>NO</string>
+ </dict>
+ </dict>
+ </dict>
+ <key>BaseZoom</key>
+ <integer>0</integer>
+ <key>CanvasOrigin</key>
+ <string>{0, 0}</string>
+ <key>ColumnAlign</key>
+ <integer>1</integer>
+ <key>ColumnSpacing</key>
+ <real>36</real>
+ <key>CreationDate</key>
+ <string>2014-12-18 16:05:16 +0000</string>
+ <key>Creator</key>
+ <string>Alex Heneveld</string>
+ <key>DisplayScale</key>
+ <string>1 0/72 in = 1.0000 in</string>
+ <key>ExportShapes</key>
+ <array>
+ <dict>
+ <key>InspectorGroup</key>
+ <real>255</real>
+ <key>ShapeImageRect</key>
+ <string>{{2, 2}, {22, 22}}</string>
+ <key>ShapeName</key>
+ <string>526C5B7C-5295-4482-893C-75F7C6CA2E76-2420-00001A8176C16DE0</string>
+ <key>ShouldExport</key>
+ <string>YES</string>
+ <key>StrokePath</key>
+ <dict>
+ <key>elements</key>
+ <array>
+ <dict>
+ <key>element</key>
+ <string>MOVETO</string>
+ <key>point</key>
+ <string>{-0.49999999999999978, 0.42951541232656054}</string>
+ </dict>
+ <dict>
+ <key>control1</key>
+ <string>{-0.5, 0.42951541438301799}</string>
+ <key>control2</key>
+ <string>{-0.5, 0.42951541644074975}</string>
+ <key>element</key>
+ <string>CURVETO</string>
+ <key>point</key>
+ <string>{-0.5, 0.42951541850220254}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.49999999999999922, 0.42951543032272177}</string>
+ </dict>
+ <dict>
+ <key>control1</key>
+ <string>{-0.49999999361171732, 0.46844298434992426}</string>
+ <key>control2</key>
+ <string>{-0.46844297402146889, 0.5}</string>
+ <key>element</key>
+ <string>CURVETO</string>
+ <key>point</key>
+ <string>{-0.42951541850220287, 0.5}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.42951541850220276, 0.5}</string>
+ </dict>
+ <dict>
+ <key>control1</key>
+ <string>{0.46844297796164214, 0.5}</string>
+ <key>control2</key>
+ <string>{0.5, 0.46844297796164192}</string>
+ <key>element</key>
+ <string>CURVETO</string>
+ <key>point</key>
+ <string>{0.5, 0.42951541850220254}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.5, -0.42951541850220254}</string>
+ </dict>
+ <dict>
+ <key>control1</key>
+ <string>{0.5, -0.46844297796164175}</string>
+ <key>control2</key>
+ <string>{0.46844297796164214, -0.5}</string>
+ <key>element</key>
+ <string>CURVETO</string>
+ <key>point</key>
+ <string>{0.42951541850220276, -0.5}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.42951541850220287, -0.5}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.42951541850220248, -0.49999999999999967}</string>
+ </dict>
+ <dict>
+ <key>control1</key>
+ <string>{-0.42951541850220248, -0.49999999999999967}</string>
+ <key>control2</key>
+ <string>{-0.42951541850220282, -0.49999999999999967}</string>
+ <key>element</key>
+ <string>CURVETO</string>
+ <key>point</key>
+ <string>{-0.42951541850220282, -0.49999999999999967}</string>
+ </dict>
+ <dict>
+ <key>control1</key>
+ <string>{-0.46844298245515681, -0.49999999999999961}</string>
+ <key>control2</key>
+ <string>{-0.50000000728542671, -0.46844297067621399}</string>
+ <key>element</key>
+ <string>CURVETO</string>
+ <key>point</key>
+ <string>{-0.49999999999999978, -0.42951542379283686}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.49999999999999772, 0.42951539973102326}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>CLOSE</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>MOVETO</string>
+ <key>point</key>
+ <string>{0.14158672168671183, -0.240892693784162}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.16740088105726869, -0.35682819383259862}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.32599118942731287, -0.35682819383258274}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.30024547259531276, -0.24097246808860406}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.41892734805343945, -0.24103214007880958}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.38460212293551743, -0.086201055249212954}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.26582755467159336, -0.086091828897296829}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.22760864809744774, 0.085893242151787952}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.34646298391557173, 0.085833483450332371}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.31213775879765038, 0.24066456827992888}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.1931907241188997, 0.24077395325095741}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.16740088105726758, 0.35682819383259945}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.0088105726872246271, 0.35542611841478178}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.034306452491342454, 0.24092007710475327}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.14167948350382509, 0.24108190345771074}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.16740088105727002, 0.35682819383259967}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.32599118942731287, 0.35542611841478178}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.30056387773897308, 0.24122802743061822}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.41755850742135858, 0.24133560474094962}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.38460212293551843, 0.086201055249213399}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.26603236334031088, 0.086141439625016858}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.22778403040141659, -0.085637896069951647}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.34509414328349108, -0.085530018788192219}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.31213775879765104, -0.24066456827992855}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.19325253982725199, -0.2407243425137584}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.16740088105726902, -0.35682819383259867}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.0088105726872246271, -0.35682819383258291}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.034593711677514016, -0.2408041144924612}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>CLOSE</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>MOVETO</string>
+ <key>point</key>
+ <string>{0.10708630915590744, -0.085945848750396014}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.069042648000694151, -0.085783878677932024}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{-0.10723053405021399, 0.086061595746854902}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>LINETO</string>
+ <key>point</key>
+ <string>{0.06880690169345427, 0.085973085989160536}</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>CLOSE</string>
+ </dict>
+ <dict>
+ <key>element</key>
+ <string>MOVETO</string>
+ <key>point</key>
+ <string>{0.10708630915590744, -0.085945848750396014}</string>
+ </dict>
+ </array>
+ </dict>
+ <key>TextBounds</key>
+ <string>{{0, 0}, {1, 1}}</string>
+ </dict>
+ </array>
+ <key>GraphDocumentVersion</key>
+ <integer>8</integer>
+ <key>GraphicsList</key>
+ <array>
+ <dict>
+ <key>Bounds</key>
+ <string>{{215, 286}, {81, 40}}</string>
+ <key>Class</key>
+ <string>ShapedGraphic</string>
+ <key>ID</key>
+ <integer>41</integer>
+ <key>Shape</key>
+ <string>Bezier</string>
+ <key>ShapeData</key>
+ <dict>
+ <key>UnitPoints</key>
+ <array>
+ <string>{0.50000000000000044, 0.5}</string>
+ <string>{0.50000000000000178, 0.5}</string>
+ <string>{0.27941176470589246, -0.50000000000000444}</string>
+ <string>{0.27941176470588935, -0.5}</string>
+ <string>{0.27941176470588935, -0.5}</string>
+ <string>{-0.49999999999999956, -0.47503396739132331}</string>
+ <string>{-0.49999999999999956, -0.47503396739132331}</string>
+ <string>{-0.49999999999999956, -0.47503396739132331}</string>
+ <string>{0.49999999999999112, 0.49999999999997158}</string>
+ </array>
+ </dict>
+ <key>Style</key>
+ <dict>
+ <key>fill</key>
+ <dict>
+ <key>Color</key>
+ <dict>
+ <key>b</key>
+ <string>0</string>
+ <key>g</key>
+ <string>0</string>
+ <key>r</key>
+ <string>0</string>
+ </dict>
+ </dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>NO</string>
+ </dict>
+ <key>stroke</key>
+ <dict>
+ <key>Draws</key>
+ <string>NO</string>
+ </dict>
+ </dict>
+ </dict>
+ <dict>
+ <key>Bounds</key>
+ <string>{{81.098419189453125, 65.598419189453068}, {227, 227.00000000000006}}</string>
+ <key>Class</key>
+ <string>ShapedGraphic</string>
+ <key>ID</key>
+ <integer>66</integer>
+ <key>Shape</key>
+ <string>526C5B7C-5295-4482-893C-75F7C6CA2E76-2420-00001A8176C16DE0</string>
+ <key>Style</key>
+ <dict>
+ <key>fill</key>
+ <dict>
+ <key>Color</key>
+ <dict>
+ <key>b</key>
+ <string>0</string>
+ <key>g</key>
+ <string>0</string>
+ <key>r</key>
+ <string>0</string>
+ </dict>
+ </dict>
+ <key>shadow</key>
+ <dict>
+ <key>Draws</key>
+ <string>NO</string>
+ </dict>
+ <key>stroke</key>
+ <dict>
+ <key>Draws</key>
+ <string>NO</string>
+ </dict>
+ </dict>
+ <key>Text</key>
+ <dict>
+ <key>VerticalPad</key>
+ <integer>10</integer>
+ </dict>
+ <key>TextPlacement</key>
+ <integer>0</integer>
+ </dict>
+ </array>
+ <key>GridInfo</key>
+ <dict/>
+ <key>GuidesLocked</key>
+ <string>NO</string>
+ <key>GuidesVisible</key>
+ <string>YES</string>
+ <key>HPages</key>
+ <integer>1</integer>
+ <key>ImageCounter</key>
+ <integer>2</integer>
+ <key>KeepToScale</key>
+ <false/>
+ <key>Layers</key>
+ <array>
+ <dict>
+ <key>Lock</key>
+ <string>NO</string>
+ <key>Name</key>
+ <string>Layer 1</string>
+ <key>Print</key>
+ <string>YES</string>
+ <key>View</key>
+ <string>YES</string>
+ </dict>
+ </array>
+ <key>LayoutInfo</key>
+ <dict>
+ <key>Animate</key>
+ <string>NO</string>
+ <key>circoMinDist</key>
+ <real>18</real>
+ <key>circoSeparation</key>
+ <real>0.0</real>
+ <key>layoutEngine</key>
+ <string>dot</string>
+ <key>neatoSeparation</key>
+ <real>0.0</real>
+ <key>twopiSeparation</key>
+ <real>0.0</real>
+ </dict>
+ <key>LinksVisible</key>
+ <string>NO</string>
+ <key>MagnetsVisible</key>
+ <string>NO</string>
+ <key>MasterSheets</key>
+ <array/>
+ <key>ModificationDate</key>
+ <string>2014-12-18 21:44:26 +0000</string>
+ <key>Modifier</key>
+ <string>Alex Heneveld</string>
+ <key>NotesVisible</key>
+ <string>NO</string>
+ <key>Orientation</key>
+ <integer>2</integer>
+ <key>OriginVisible</key>
+ <string>NO</string>
+ <key>PageBreaks</key>
+ <string>YES</string>
+ <key>PrintInfo</key>
+ <dict>
+ <key>NSBottomMargin</key>
+ <array>
+ <string>float</string>
+ <string>41</string>
+ </array>
+ <key>NSHorizonalPagination</key>
+ <array>
+ <string>coded</string>
+ <string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG</string>
+ </array>
+ <key>NSLeftMargin</key>
+ <array>
+ <string>float</string>
+ <string>18</string>
+ </array>
+ <key>NSPaperName</key>
+ <array>
+ <string>string</string>
+ <string>E9719E8A-0C82-4AC7-9E88-45ADFF583DA8</string>
+ </array>
+ <key>NSPaperSize</key>
+ <array>
+ <string>size</string>
+ <string>{425.19683837890625, 425.19683837890625}</string>
+ </array>
+ <key>NSPrintReverseOrientation</key>
+ <array>
+ <string>int</string>
+ <string>0</string>
+ </array>
+ <key>NSRightMargin</key>
+ <array>
+ <string>float</string>
+ <string>18</string>
+ </array>
+ <key>NSTopMargin</key>
+ <array>
+ <string>float</string>
+ <string>18</string>
+ </array>
+ </dict>
+ <key>PrintOnePage</key>
+ <false/>
+ <key>ReadOnly</key>
+ <string>NO</string>
+ <key>RowAlign</key>
+ <integer>1</integer>
+ <key>RowSpacing</key>
+ <real>36</real>
+ <key>SheetTitle</key>
+ <string>Canvas 1</string>
+ <key>SmartAlignmentGuidesActive</key>
+ <string>YES</string>
+ <key>SmartDistanceGuidesActive</key>
+ <string>YES</string>
+ <key>UniqueID</key>
+ <integer>1</integer>
+ <key>UseEntirePage</key>
+ <false/>
+ <key>VPages</key>
+ <integer>1</integer>
+ <key>WindowInfo</key>
+ <dict>
+ <key>CurrentSheet</key>
+ <integer>0</integer>
+ <key>ExpandedCanvases</key>
+ <array>
+ <dict>
+ <key>name</key>
+ <string>Canvas 1</string>
+ </dict>
+ </array>
+ <key>Frame</key>
+ <string>{{633, 4}, {1059, 1153}}</string>
+ <key>ListView</key>
+ <true/>
+ <key>OutlineWidth</key>
+ <integer>142</integer>
+ <key>RightSidebar</key>
+ <false/>
+ <key>ShowRuler</key>
+ <true/>
+ <key>Sidebar</key>
+ <true/>
+ <key>SidebarWidth</key>
+ <integer>120</integer>
+ <key>VisibleRegion</key>
+ <string>{{-267, -322}, {924, 1011}}</string>
+ <key>Zoom</key>
+ <real>1</real>
+ <key>ZoomValues</key>
+ <array>
+ <array>
+ <string>Canvas 1</string>
+ <real>1</real>
+ <real>4</real>
+ </array>
+ </array>
+ </dict>
+</dict>
+</plist>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/twitter-256-black.png
----------------------------------------------------------------------
diff --git a/docs/style/img/twitter-256-black.png b/docs/style/img/twitter-256-black.png
new file mode 100644
index 0000000..bee8c8e
Binary files /dev/null and b/docs/style/img/twitter-256-black.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/twitter-256-green.png
----------------------------------------------------------------------
diff --git a/docs/style/img/twitter-256-green.png b/docs/style/img/twitter-256-green.png
new file mode 100644
index 0000000..8b111db
Binary files /dev/null and b/docs/style/img/twitter-256-green.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/style/img/twitter-4096-black.png
----------------------------------------------------------------------
diff --git a/docs/style/img/twitter-4096-black.png b/docs/style/img/twitter-4096-black.png
new file mode 100644
index 0000000..6616e08
Binary files /dev/null and b/docs/style/img/twitter-4096-black.png differ
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5bf2807c/docs/website/learnmore/index.md
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/index.md b/docs/website/learnmore/index.md
index 3befae6..b185ace 100644
--- a/docs/website/learnmore/index.md
+++ b/docs/website/learnmore/index.md
@@ -2,10 +2,14 @@
layout: website-normal
title: Learn More
children:
-- { path: yaml-explained.md }
+# - { path: yaml-explained.md }
- { path: theory.md, title: Theory }
---
+<!--
TODO have a list of resources here? or start w yaml explained?
TODO include { path: catalog/index.html }
+-->
+
+* [The Theory of Brooklyn](theory.html)
[5/8] incubator-brooklyn git commit: link to repo GUI *and* to dir,
simplify (a bit) how url's are computed, and tidy guide downloads page
Posted by ri...@apache.org.
link to repo GUI *and* to dir, simplify (a bit) how url's are computed, and tidy guide downloads page
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bc543411
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bc543411
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bc543411
Branch: refs/heads/master
Commit: bc5434112d02c1bf9b31ecd1611a2df4dd250fc0
Parents: 5bf2807
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Dec 19 01:16:24 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Dec 19 11:44:10 2014 +0000
----------------------------------------------------------------------
docs/_includes/fields.md | 14 ++++++++------
docs/guide/start/download.md | 28 ++++++++++++++++++----------
2 files changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bc543411/docs/_includes/fields.md
----------------------------------------------------------------------
diff --git a/docs/_includes/fields.md b/docs/_includes/fields.md
index 5089b74..10ac024 100644
--- a/docs/_includes/fields.md
+++ b/docs/_includes/fields.md
@@ -14,21 +14,23 @@
{% capture apache_snapshots_repo_groupid_url %}{{ this_repo_base_url }}/content/repositories/snapshots/{{ brooklyn_group_id_path }}{% endcapture %}
{% capture apache_releases_repo_groupid_url %}{{ this_repo_base_url }}/content/repositories/releases/{{ brooklyn_group_id_path }}{% endcapture %}
+{% capture this_repo_base_url_content %}{{ apache_snapshots_repo_groupid_url }}{% endcapture %}
+{% capture this_dist_url_list %}{{ this_repo_base_url_content }}/brooklyn-dist/{{ site.brooklyn-version }}/{% endcapture %}
+{% capture this_alljar_url_list %}{{ this_repo_base_url_content }}/brooklyn-all/{{ site.brooklyn-version }}/{% endcapture %}
+
{% if SNAPSHOT %}
- {% capture this_repo_base_url_content %}{{ apache_snapshots_repo_groupid_url }}{% endcapture %}
{% capture this_dist_url_zip %}{{ this_repo_base_url_artifact }}?r=snapshots&g={{ brooklyn_group_id }}&a=brooklyn-dist&v={{ site.brooklyn-version }}&e=zip&c=dist{% endcapture %}
{% capture this_dist_url_tgz %}{{ this_repo_base_url_artifact }}?r=snapshots&g={{ brooklyn_group_id }}&a=brooklyn-dist&v={{ site.brooklyn-version }}&e=tgz&c=dist{% endcapture %}
{% capture this_alljar_url_jar %}{{ this_repo_base_url_artifact }}?r=snapshots&g={{ brooklyn_group_id }}&a=brooklyn-all&v={{ site.brooklyn-version }}&e=jar&c=with-dependencies{% endcapture %}
{% else %}<!--- RELEASE -->
- {% capture this_repo_base_url_content %}{{ apache_releases_repo_groupid_url }}{% endcapture %}
- {% capture this_dist_url_zip %}{{ this_repo_base_url_content }}/brooklyn-dist/{{ site.brooklyn-version }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.zip{% endcapture %}
- {% capture this_dist_url_tgz %}{{ this_repo_base_url_content }}/brooklyn-dist/{{ site.brooklyn-version }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.tar.gz{% endcapture %}
- {% capture this_alljar_url_jar %}{{ this_repo_base_url_content }}/brooklyn-all/{{ site.brooklyn-version }}/brooklyn-all-{{ site.brooklyn-version }}-with-dependencies.jar{% endcapture %}
+ {% capture this_dist_url_zip %}{{ this_dist_url_list }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.zip{% endcapture %}
+ {% capture this_dist_url_tgz %}{{ this_dist_url_list }}/brooklyn-dist-{{ site.brooklyn-version }}-dist.tar.gz{% endcapture %}
+ {% capture this_alljar_url_jar %}{{ this_alljar_url_list }}/brooklyn-all-{{ site.brooklyn-version }}-with-dependencies.jar{% endcapture %}
{% endif %}
{% capture this_anything_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~~{{ site.brooklyn-version }}~~{% endcapture %}
{% capture this_dist_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~brooklyn-dist~{{ site.brooklyn-version }}~~{% endcapture %}
-{% capture this_dist_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~brooklyn-all~{{ site.brooklyn-version }}~~{% endcapture %}
+{% capture this_alljar_url_search %}{{ this_repo_base_url_search }};gav~{{ brooklyn_group_id }}~brooklyn-all~{{ site.brooklyn-version }}~~{% endcapture %}
<!-- OLD things -->
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/bc543411/docs/guide/start/download.md
----------------------------------------------------------------------
diff --git a/docs/guide/start/download.md b/docs/guide/start/download.md
index 08ea26f..34e07ff 100644
--- a/docs/guide/start/download.md
+++ b/docs/guide/start/download.md
@@ -30,14 +30,18 @@ First time user? The [getting started]({{ site.path.guide }}/use/guide/quickstar
<td><small><a href='{{ this_alljar_url_jar }}.asc'>PGP</a>, <a href='{{ this_alljar_url_jar }}.sha1'>SHA1</a></small></td>
</tr>
<tr>
- <td style='text-align:left'>Other Variants</td>
- <td style='text-align:left'><a href='{{ this_anything_url_search }}' title='Other Variants'><i>listing</i></a></td>
- <td> - </td>
+ <td style='text-align:left'>Apache Repo</td>
+ <td style='text-align:left'>
+ <a href='{{ this_anything_url_search }}' title='Search'><i>GUI</i></a>
+ —
+ <a href='{{ this_dist_url_list }}' title='List'><i>dir</i></a>
+ </td>
+ <td> — </td>
</tr>
<tr>
- <td style='text-align:left'>Release notes</td>
+ <td style='text-align:left'>Release Notes</td>
<td style='text-align:left'><a href='{{ site.path.guide }}/start/release-notes.html'>{{ site.brooklyn-version }}</a></td>
- <td> - </td>
+ <td> — </td>
</tr>
</table>
@@ -99,7 +103,11 @@ A good example to start with is the [Elastic Web Cluster]({{site.path.guide}}/us
If you use Maven, you can add Brooklyn with the following in your pom:
+<!-- the comment is included due to a jekyll/highlight bug which
+ removes indentation on the first line in a highlight block;
+ we want the actual XML indented so you can cut and paste into a pom.xml sensibly -->
{% highlight xml %}
+<!-- include all Brooklyn items in our project -->
<dependencies>
<dependency>
<groupId>org.apache.brooklyn</groupId>
@@ -118,13 +126,9 @@ If you wish to use the Apache snapshot repo and/or Cloudsoft repositories,
you can add some of the following sections:
{% highlight xml %}
+<!-- include repos for snapshot items and other dependencies -->
<repositories>
<repository>
- <id>cloudsoft-cloudfront-releases-repo</id>
- <url>http://developers.cloudsoftcorp.com/maven/releases/</url>
- </repository>
- <!-- optional for snapshot versions -->
- <repository>
<id>apache-nexus-snapshots</id>
<name>Apache Nexus Snapshots</name>
<url>https://repository.apache.org/content/repositories/snapshots</url>
@@ -132,6 +136,10 @@ you can add some of the following sections:
<snapshots> <enabled>true</enabled> </snapshots>
</repository>
<repository>
+ <id>cloudsoft-cloudfront-releases-repo</id>
+ <url>http://developers.cloudsoftcorp.com/maven/releases/</url>
+ </repository>
+ <repository>
<id>cloudsoft-cloudfront-snapshots-repo</id>
<url>http://developers.cloudsoftcorp.com/maven/snapshots/</url>
<snapshots>
[8/8] incubator-brooklyn git commit: Merge and close #408
Posted by ri...@apache.org.
Merge and close #408
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fda04de8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fda04de8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fda04de8
Branch: refs/heads/master
Commit: fda04de8373f8940b90068057b94b2abe9895557
Parents: d14c069 adcddb7
Author: Richard Downer <ri...@apache.org>
Authored: Mon Dec 22 13:47:14 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Mon Dec 22 13:47:14 2014 +0000
----------------------------------------------------------------------
docs/_build/config-pygments.yml | 28 ++
docs/_build/config-rdiscount.yml | 28 ++
docs/_includes/base-head.html | 15 +
docs/_includes/base-scss.scss | 10 +
docs/_includes/fields.md | 14 +-
docs/_includes/footer.html | 18 +
docs/_includes/topmenu.html | 55 +++
docs/_layouts/base.html | 44 ++
docs/_layouts/guide-base.html | 183 ++++++++
docs/_layouts/guide-normal.html | 230 +--------
docs/_layouts/website-base.html | 93 +---
docs/_layouts/website-landing.html | 17 +
docs/_layouts/website-normal.html | 39 +-
docs/guide/start/download.md | 28 +-
docs/style/css/base.scss | 150 ++++++
docs/style/css/guide-toc.css | 2 +-
docs/style/css/guide.css | 53 +--
docs/style/css/website.css | 49 --
docs/style/img/github-1024-black.png | Bin 0 -> 15613 bytes
docs/style/img/github-256-black.png | Bin 0 -> 12166 bytes
docs/style/img/github-256-green.png | Bin 0 -> 13875 bytes
docs/style/img/irc-256-black.png | Bin 0 -> 4446 bytes
docs/style/img/irc-256-green.png | Bin 0 -> 5731 bytes
docs/style/img/irc-icon.graffle | 640 ++++++++++++++++++++++++++
docs/style/img/twitter-256-black.png | Bin 0 -> 10590 bytes
docs/style/img/twitter-256-green.png | Bin 0 -> 11732 bytes
docs/style/img/twitter-4096-black.png | Bin 0 -> 45680 bytes
docs/website/index.md | 2 +-
docs/website/learnmore/index.md | 6 +-
docs/website/learnmore/theory.md | 2 +-
docs/website/learnmore/yaml-explained.md | 1 -
31 files changed, 1301 insertions(+), 406 deletions(-)
----------------------------------------------------------------------
[4/8] incubator-brooklyn git commit: remove duplicate jquery js load
Posted by ri...@apache.org.
remove duplicate jquery js load
this was breaking superfish; but things seemed to be working, so maybe we don't need superfish!
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3e8334af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3e8334af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3e8334af
Branch: refs/heads/master
Commit: 3e8334afb8b4369ef834dff96620ebff6c14ad38
Parents: e6307ed
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Dec 19 10:16:29 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Dec 19 11:44:10 2014 +0000
----------------------------------------------------------------------
docs/_includes/base-head.html | 3 +++
docs/_layouts/base.html | 4 +---
docs/_layouts/guide-base.html | 5 ++---
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e8334af/docs/_includes/base-head.html
----------------------------------------------------------------------
diff --git a/docs/_includes/base-head.html b/docs/_includes/base-head.html
index 9afadea..ed15d08 100644
--- a/docs/_includes/base-head.html
+++ b/docs/_includes/base-head.html
@@ -10,3 +10,6 @@
<link rel="stylesheet" href="{{ site.path.style }}/css/code.css" type="text/css" media="screen" />
<link href="{{site.path.style}}/css/base.css" rel="stylesheet">
+
+<script src="{% dependency_url jquery.js %}"></script>
+<script src="{% dependency_url bootstrap.js %}"></script>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e8334af/docs/_layouts/base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index da97748..c6713b2 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -20,11 +20,9 @@ under the License.
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-{{ content }}
+{{ content }}
-<script src="{% dependency_url jquery.js %}"></script>
-<script src="{% dependency_url bootstrap.js %}"></script>
<script language="JavaScript" type="application/javascript">
$(window).resize(function () {
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/3e8334af/docs/_layouts/guide-base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-base.html b/docs/_layouts/guide-base.html
index eecb5ea..3facdb6 100644
--- a/docs/_layouts/guide-base.html
+++ b/docs/_layouts/guide-base.html
@@ -29,7 +29,6 @@ layout: base
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<!-- Sidebar/ToC Scripts and CSS -->
- <script src="{{ site.path.style }}/deps/jquery.js"></script>
<script src="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.min.js"></script>
<link rel="stylesheet" type="text/css" href="{{ site.path.style }}/deps/jquery-ui/jquery-ui-1.8.18.custom.css" />
@@ -77,8 +76,8 @@ $(document).ready(function() {
<script type="text/javascript">
// initialise menu delay
- jQuery(function(){
- jQuery('ul#mainmenu').superfish({
+ $(document).ready(function() {
+ $('ul#mainmenu').superfish({
autoArrows: false, // disable generation of arrow mark-up
dropShadows: false, // disable drop shadows
disableHI: true, // set to true to disable hoverIntent detection
[2/8] incubator-brooklyn git commit: combining style sheets and
layouts, esp for user guide
Posted by ri...@apache.org.
combining style sheets and layouts, esp for user guide
user guide now has the same top+bottom branding as rest of site
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/09c98bd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/09c98bd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/09c98bd4
Branch: refs/heads/master
Commit: 09c98bd4c31d1025e3b9e6d1507c4287535d454e
Parents: 4dc23aa
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Dec 18 15:00:08 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Dec 18 15:00:08 2014 +0000
----------------------------------------------------------------------
docs/_includes/base-head.html | 3 ++
docs/_includes/topmenu.html | 42 +++++++++++++++++++++++++
docs/_layouts/base.html | 16 ++++++++++
docs/_layouts/guide-base.html | 7 ++---
docs/_layouts/guide-normal.html | 18 +++++------
docs/_layouts/website-base.html | 58 +---------------------------------
docs/style/css/base.css | 61 ++++++++++++++++++++++++++++++++++++
docs/style/css/guide-toc.css | 2 +-
docs/style/css/guide.css | 55 ++++++--------------------------
9 files changed, 145 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/_includes/base-head.html
----------------------------------------------------------------------
diff --git a/docs/_includes/base-head.html b/docs/_includes/base-head.html
index 2d5a0b4..9afadea 100644
--- a/docs/_includes/base-head.html
+++ b/docs/_includes/base-head.html
@@ -6,4 +6,7 @@
<link href="{% dependency_url bootstrap.css %}" rel="stylesheet">
<link href="{{site.path.style}}/deps/bootstrap-theme.css" rel="stylesheet">
+
+<link rel="stylesheet" href="{{ site.path.style }}/css/code.css" type="text/css" media="screen" />
+
<link href="{{site.path.style}}/css/base.css" rel="stylesheet">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/_includes/topmenu.html
----------------------------------------------------------------------
diff --git a/docs/_includes/topmenu.html b/docs/_includes/topmenu.html
new file mode 100644
index 0000000..9d33243
--- /dev/null
+++ b/docs/_includes/topmenu.html
@@ -0,0 +1,42 @@
+<nav class="navbar navbar-default navbar-fixed-top" id="header" role="navigation">
+ <div class="container">
+ <div class="container-fluid">
+ <!-- Brand and toggle get grouped for better mobile display -->
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ {% if page.navgroup != 'home' %}<a class="navbar-brand" href="{{site.path.website}}/"><img src="{{site.path.style}}/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>{% endif %}
+ </div>
+
+ <!-- Collect the nav links, forms, and other content for toggling -->
+ <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+ <ul class="nav navbar-nav navbar-right">
+ {% for navgroup in site.data.navgroups %}
+ {% if navgroup.page.menu2 %}
+ <li class="dropdown{% if page.navgroup == navgroup.id %} active{% endif %}">
+ <a href="{{navgroup.page.url}}">{{navgroup.title}}</a>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="{{navgroup.page.url}}">{{navgroup.title_in_menu}}</a>
+ </li>
+ <li class="divider"></li>
+ {% for child in navgroup.page.menu2 %}
+ <li>
+ <a href="{{child.reference.url}}">{{child.reference.title}}</a>
+ </li>
+ {% endfor %}
+ </ul>
+ </li><!-- {{ navgroup.id }} -->
+ {% else %}
+ <li class="{% if page.navgroup == navgroup.id %}active{% endif %}"><a href="{{navgroup.page.url}}">{{navgroup.title}}</a></li><!-- {{ navgroup.id }} -->
+ {% endif %}
+ {% endfor %}
+ </ul>
+ </div><!-- /.navbar-collapse -->
+ </div><!-- /.container-fluid -->
+ </div>
+</nav>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/_layouts/base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/base.html b/docs/_layouts/base.html
index 8b77367..4299467 100644
--- a/docs/_layouts/base.html
+++ b/docs/_layouts/base.html
@@ -22,4 +22,20 @@ under the License.
{{ content }}
+
+<script src="{% dependency_url jquery.js %}"></script>
+<script src="{% dependency_url bootstrap.js %}"></script>
+
+<script language="JavaScript" type="application/javascript">
+ $(window).resize(function () {
+ $('body').css('padding-top', parseInt($('#header').css("height"))+10);
+ $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
+ });
+
+ $(window).load(function () {
+ $('body').css('padding-top', parseInt($('#header').css("height"))+10);
+ $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
+ });</script>
+</body>
+
</html>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/_layouts/guide-base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-base.html b/docs/_layouts/guide-base.html
index ab41e68..eecb5ea 100644
--- a/docs/_layouts/guide-base.html
+++ b/docs/_layouts/guide-base.html
@@ -20,13 +20,11 @@ layout: base
---
<head>
- <meta http-equiv="content-type" content="text/html; charset=utf-8" />
- <title>{{ page.title }}</title>
- <link rel="stylesheet" href="{{ site.path.style }}/css/website.css" type="text/css" media="screen" />
+ {% include base-head.html %}
+
<link rel="stylesheet" href="{{ site.path.style }}/css/guide.css" type="text/css" media="screen" />
<link rel="stylesheet" href="{{ site.path.style }}/css/guide-toc.css" type="text/css" media="screen" />
- <link rel="stylesheet" href="{{ site.path.style }}/css/code.css" type="text/css" media="screen" />
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
@@ -46,6 +44,7 @@ layout: base
background-image: url("{{ site.path.style }}/img/clipboard-green-normal.png");
background-size: 18px 21px;
width: 18px; height: 21px;
+ overflow: auto;
}
.clipboard_button:hover, .clipboard_button.zeroclipboard-is-hover { background-image: url("{{ site.path.style }}/img/clipboard-green-hover.png"); }
.clipboard_button:active, .clipboard_button.zeroclipboard-is-active { background-image: url("{{ site.path.style }}/img/clipboard-green-click.png"); }'
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/_layouts/guide-normal.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/guide-normal.html b/docs/_layouts/guide-normal.html
index 10356cb..04840e3 100644
--- a/docs/_layouts/guide-normal.html
+++ b/docs/_layouts/guide-normal.html
@@ -19,10 +19,13 @@
layout: guide-base
---
+{% include topmenu.html %}
+
<div id="container">
<div id="header">
-
+
+<!--
<div id="identity">
<a href="{{ site.path.website }}/">Brooklyn</a>
</div>
@@ -34,13 +37,14 @@ layout: guide-base
<li><a href="https://twitter.com/#!/search?q=brooklyncentral">Twitter</a></li>
<li><a href="{{site.path.guide}}/meta/contact.html">Contact</a></li>
</ul>
+-->
<div id="menubar">
{% include topbar.html %}
<form method="get" id="simple_google" class="searchform" action="http://www.google.com/search" method="get">
- <input type="text" class="searchinput" name="brooklyn-search" placeholder="Search: type & hit enter" />
+ <input type="text" class="searchinput" name="brooklyn-search" placeholder=" Search: type & hit enter" />
<input type="hidden" name="q" value="" />
</form>
@@ -69,13 +73,7 @@ layout: guide-base
</div>
</div><!--contentcontainer-->
-
- <div id="footer">
- <p id="copyright">
- <b>brooklyn is distributed under the Apache License v2.0.</b><br/>
- brooklyn is a registered trademark of Cloudsoft Corporation.<br/>
- © 2013 Cloudsoft Corporation.
- </p>
- </div><!--footer -->
</div><!--container-->
+
+{% include footer.html %}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/_layouts/website-base.html
----------------------------------------------------------------------
diff --git a/docs/_layouts/website-base.html b/docs/_layouts/website-base.html
index c63aaf7..8f8c24a 100644
--- a/docs/_layouts/website-base.html
+++ b/docs/_layouts/website-base.html
@@ -28,62 +28,6 @@ layout: base
<body>
-<nav class="navbar navbar-default navbar-fixed-top" id="header" role="navigation">
- <div class="container">
- <div class="container-fluid">
- <!-- Brand and toggle get grouped for better mobile display -->
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- {% if page.navgroup != 'home' %}<a class="navbar-brand" href="{{site.path.website}}/"><img src="{{site.path.style}}/img/apache-brooklyn-logo-244px-wide.png" alt="brooklyn"></a>{% endif %}
- </div>
-
- <!-- Collect the nav links, forms, and other content for toggling -->
- <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav navbar-right">
- {% for navgroup in site.data.navgroups %}
- {% if navgroup.page.menu2 %}
- <li class="dropdown{% if page.navgroup == navgroup.id %} active{% endif %}">
- <a href="{{navgroup.page.url}}">{{navgroup.title}}</a>
- <ul class="dropdown-menu" role="menu">
- <li>
- <a href="{{navgroup.page.url}}">{{navgroup.title_in_menu}}</a>
- </li>
- <li class="divider"></li>
- {% for child in navgroup.page.menu2 %}
- <li>
- <a href="{{child.reference.url}}">{{child.reference.title}}</a>
- </li>
- {% endfor %}
- </ul>
- </li><!-- {{ navgroup.id }} -->
- {% else %}
- <li class="{% if page.navgroup == navgroup.id %}active{% endif %}"><a href="{{navgroup.page.url}}">{{navgroup.title}}</a></li><!-- {{ navgroup.id }} -->
- {% endif %}
- {% endfor %}
- </ul>
- </div><!-- /.navbar-collapse -->
- </div><!-- /.container-fluid -->
- </div>
-</nav>
+{% include topmenu.html %}
{{ content }}
-
-<script src="{% dependency_url jquery.js %}"></script>
-<script src="{% dependency_url bootstrap.js %}"></script>
-
-<script language="JavaScript" type="application/javascript">
- $(window).resize(function () {
- $('body').css('padding-top', parseInt($('#header').css("height"))+10);
- $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
- });
-
- $(window).load(function () {
- $('body').css('padding-top', parseInt($('#header').css("height"))+10);
- $('body').css('padding-bottom', parseInt($('#footer').css("height"))+10);
- });</script>
-</body>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/style/css/base.css
----------------------------------------------------------------------
diff --git a/docs/style/css/base.css b/docs/style/css/base.css
index 46fd90d..30bfafd 100644
--- a/docs/style/css/base.css
+++ b/docs/style/css/base.css
@@ -1,4 +1,23 @@
+/* BASIC STYLES
+ ----------------------------------------------------------------------- */
+body {margin: 0px; padding: 10px 0px 20px 0px; font-family: arial, helvetica, sans-serif; background-color: #ffffff; color: #393939; }
+h1, h2, h3, h4, h5, h6 {}
+input, select, textarea {}
+p, li, label, td, th,input, select, textarea {}
+h1 {margin: 0 0 20px 0; padding: 0; font-size: 32px; font-weight: normal; color: #4d9d3a; border-bottom: 1px solid #e9e9e9;}
+h2 {margin: 1.25em 0 20px 0; font-size: 20px; font-weight: normal; color: #4f8243}
+h3 {margin: 1.1em 0 20px 0; font-size: 17px; font-weight: bold; color: #111111;}
+h4 {margin: 1.1em 0 20px 0; font-size: 15px; font-weight: bold;}
+textarea {width: 500px; padding: 2px 5px;}
+p, input, label, li {}
+p { margin: 0.75em 0; line-height: 1.4em;}
+form {padding: 0; margin: 0;}
+img {border: 0;}
+a {color: #4f9d3c;}
+a:hover {text-decoration: none;}
+
+
/* WEBSITE MENUS
----------------------------------------------------------------------- */
@@ -41,6 +60,48 @@ html {
}
+/* CODE RENDERING
+ ----------------------------------------------------------------------- */
+pre {
+ font-family: Consolas, Lucida Console, Monaco, monospace;
+ background-color:#e8eded;
+ padding: 0.4em 0.8em;
+ white-space: pre;
+ word-wrap: normal;
+ overflow-y: scroll;
+ overflow-x: scroll;
+ /* override border and line-height on 'pre' from bootstrap */
+ border: none;
+ border-radius: 2px;
+ line-height: 1;
+}
+code {
+ font-family: Consolas, Lucida Console, Monaco, monospace;
+ font-size: 85%;
+ /* override color and bg-color on 'code' from bootstrap, and a touch more padding on top since font-size is smaller */
+ color: black;
+ background-color:#e8eded;
+ padding: 4px 4px 2px 4px;
+ border-radius: 3px;
+}
+pre code {
+ /* override settings on 'pre code' from bootstrap */
+ font-size: 85%;
+ line-height: 1;
+ white-space: pre;
+ word-wrap: normal;
+ overflow-x: scroll;
+ /** and no padding since pre already has some */
+ padding: 0px;
+}
+.highlight { background-color:#e8eded; } /* clipboard icon should have the same background color as the code */
+
+.nowrap {
+ white-space: pre;
+ word-wrap: normal;
+ overflow-x: scroll;
+}
+
/* LANDING PAGE
----------------------------------------------------------------------- */
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/style/css/guide-toc.css
----------------------------------------------------------------------
diff --git a/docs/style/css/guide-toc.css b/docs/style/css/guide-toc.css
index 6ae9aaf..be38a11 100644
--- a/docs/style/css/guide-toc.css
+++ b/docs/style/css/guide-toc.css
@@ -56,7 +56,7 @@
position: relative;
height: 0px;
/* right: -180px; to make appear at right */
- left: -180px;
+ left: -158px;
width: 180px;
top: -17px;
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/09c98bd4/docs/style/css/guide.css
----------------------------------------------------------------------
diff --git a/docs/style/css/guide.css b/docs/style/css/guide.css
index 0a89027..6cfa2d0 100644
--- a/docs/style/css/guide.css
+++ b/docs/style/css/guide.css
@@ -20,23 +20,6 @@
Brooklyn minisite
*/
-/* BASIC STYLES */
-body {margin: 0px; padding: 10px 0px 20px 0px; font-family: arial, helvetica, sans-serif; background-color: #ffffff; color: #393939; font-size: 15px;}
-h1, h2, h3, h4, h5, h6 {}
-input, select, textarea {}
-p, li, label, td, th,input, select, textarea {}
-h1 {margin: 0 0 20px 0; padding: 0; font-size: 32px; font-weight: normal; color: #4d9d3a; border-bottom: 1px solid #e9e9e9;}
-h2 {margin: 1.25em 0 20px 0; font-size: 20px; font-weight: normal; color: #4f8243}
-h3 {margin: 1.1em 0 20px 0; font-size: 17px; font-weight: bold; color: #111111;}
-h4 {margin: 1.1em 0 20px 0; font-size: 15px; font-weight: bold;}
-textarea {width: 500px; padding: 2px 5px;}
-p, input, label, li {}
-p { margin: 0.75em 0; line-height: 1.4em;}
-form {padding: 0; margin: 0;}
-img {border: 0;}
-a {color: #4f9d3c;}
-a:hover {text-decoration: none;}
-
/*ACCESSIBILITY*/
#shortcuts {display: block; position: absolute; top: -100px; z-index: 0}
#shortcuts a {padding: 0 0.5em; left: 0; z-index: 0}
@@ -53,7 +36,15 @@ a:hover {text-decoration: none;}
#identity {float: left; margin: 0; padding: 30px 0 15px 10px;}
#identity a {text-decoration: none; display: block; margin: 0; color: #4d9d3a; font-size: 2.5em; padding: 0; background: transparent url(../img/brooklyn.gif) no-repeat 0 0; width: 206px; height: 44px; text-indent: -1000px; overflow: hidden;}
.searchform {float: right; width: 160px; margin: 0; padding: 5px 5px 0 0; overflow: hidden; text-align: right;}
-.searchinput {width: 147px; background: #ffffff; border: 1px solid #b1b7c2; -moz-border-radius: 5px; border-radius: 5px; color: #c8ccd5; padding: 3px;}
+.searchinput {
+ width: 147px;
+ padding: 3px;
+ color: #c8ccd5;
+ background: #ffffff;
+ border: 1px solid #b1b7c2;
+ -moz-border-radius: 5px; border-radius: 5px;
+ font: -webkit-small-control;
+}
.searchinput:focus {color: #333333;}
/*MENUS*/
@@ -61,7 +52,7 @@ a:hover {text-decoration: none;}
#header #quicklinks li {margin: 0; padding: 0 5px 0 7px; text-transform: uppercase; font-size: 10px; float: left; background: #ffffff url(../img/divider-quicklinks.gif) no-repeat left center;}
#header #quicklinks li:first-child {background-image: none;}
#header #quicklinks a {text-decoration: none; color: #4f8243;}
-#menubar {clear: both; width: 978px; height: 34px; background-color: #e8eded; border: 1px solid #d5dade; -moz-border-radius: 8px; border-radius: 8px;}
+#menubar {clear: both; width: 978px; height: 36px; background-color: #e8eded; border: 1px solid #d5dade; -moz-border-radius: 8px; border-radius: 8px;}
#mainmenu {list-style: none; margin: 0; padding: 4px 0 0 2px; width: 765px; display: block; float: left; font-size: 15px;}
#mainmenu li {float: left; position: relative; margin: 0; padding: 0; }
#mainmenu>li {border: 1px solid transparent; border-top-left-radius: 5px; -moz-border-radius-topleft: 5px; border-top-right-radius: 5px; -moz-border-radius-topright: 5px; border-bottom: 0;}
@@ -126,29 +117,3 @@ div.warning{
#sidebar li {margin: 0 0 5px; padding: 0;}
#sidebar li a {text-decoration: none;}
#sidebar li a:hover {text-decoration: underline;}
-
-/* FOOTER */
-#footer {color: #9aa2a6; margin: 0; height: auto; margin: 0 10px; overflow: hidden; border-top: 1px solid #cbcbcb; font-size: 10px;}
-#footer p {padding: 0; line-height: 12px; font-size: 10px;}
-#footer p#copyright {float: right; text-align: right; color: #6c6c6c;}
-#footer p#linklove {float: left; text-align: left; color: #b6b6b6;}
-#footer p#linklove a {color: #b6b6b6; text-decoration: none;}
-#footer p#linklove a:hover {text-decoration: underline;}
-
-
-/* CODE RENDERING
- ----------------------------------------------------------------------- */
-pre {
- font-family: Consolas, Lucida Console, Monaco, monospace;
- background-color:#e8eded;
- padding: 1em;
- font-size: 85%;
- overflow-y: auto; /* horizontal scroll bar if line length is too long */
-}
-code {
- font-family: Consolas, Lucida Console, Monaco, monospace;
- font-size: 85%;
- line-height: 85%;
-}
-pre code { font-size: 85%; }
-.highlight { background-color:#e8eded; } /* clipboard icon should have the same background color as the code */
[7/8] incubator-brooklyn git commit: fix navgroup id's so menu
highlights correctly
Posted by ri...@apache.org.
fix navgroup id's so menu highlights correctly
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/adcddb75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/adcddb75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/adcddb75
Branch: refs/heads/master
Commit: adcddb75c71769958d3bce35463312063bef232a
Parents: 3e8334a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Dec 22 09:35:56 2014 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Dec 22 09:35:56 2014 +0000
----------------------------------------------------------------------
docs/website/index.md | 2 +-
docs/website/learnmore/theory.md | 2 +-
docs/website/learnmore/yaml-explained.md | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/adcddb75/docs/website/index.md
----------------------------------------------------------------------
diff --git a/docs/website/index.md b/docs/website/index.md
index 33f33e7..2892e94 100644
--- a/docs/website/index.md
+++ b/docs/website/index.md
@@ -13,7 +13,7 @@ navgroups:
- { id: download, page: download.md, title: download }
- { id: getstarted, page: quickstart/index.md, title: get started, title_in_menu: Get Started }
- { id: documentation, page: documentation.md, title: documentation, title_in_menu: All Documentation }
-- { id: website/community, page: community/index.md, title: community, title_in_menu: Community Home }
+- { id: community, page: community/index.md, title: community, title_in_menu: Community Home }
---
<div class="jumbotron">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/adcddb75/docs/website/learnmore/theory.md
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/theory.md b/docs/website/learnmore/theory.md
index 9a654e2..33d9b18 100644
--- a/docs/website/learnmore/theory.md
+++ b/docs/website/learnmore/theory.md
@@ -1,7 +1,7 @@
---
layout: website-normal
title: The Theory behind Brooklyn
-navgroup: Learn More
+navgroup: learnmore
---
<div class="jumobotron" markdown="1">
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/adcddb75/docs/website/learnmore/yaml-explained.md
----------------------------------------------------------------------
diff --git a/docs/website/learnmore/yaml-explained.md b/docs/website/learnmore/yaml-explained.md
index 12d4e17..6ada16c 100644
--- a/docs/website/learnmore/yaml-explained.md
+++ b/docs/website/learnmore/yaml-explained.md
@@ -1,7 +1,6 @@
---
layout: website-normal
title: YAML Explained
-navgroup: Learn More
---
<div class="jumobotron" markdown="1">