You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2016/04/24 08:29:26 UTC
[1/3] incubator-guacamole-website git commit: List correct
copyright/license in footer.
Repository: incubator-guacamole-website
Updated Branches:
refs/heads/master 0eb340d55 -> d355a2e86
List correct copyright/license in footer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/a650e55f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/a650e55f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/a650e55f
Branch: refs/heads/master
Commit: a650e55fb5d9391799aa4ded4939c7382a7668ae
Parents: 0eb340d
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Apr 23 22:06:58 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Apr 23 22:06:58 2016 -0700
----------------------------------------------------------------------
_includes/footer.html | 26 +++++++++++++++++++++++---
styles/main.css | 26 +++++---------------------
2 files changed, 28 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/a650e55f/_includes/footer.html
----------------------------------------------------------------------
diff --git a/_includes/footer.html b/_includes/footer.html
index 814f98d..26023fc 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,9 +1,29 @@
<!-- Footer -->
<div id="footer">
+
<!-- Copyright -->
<p class="copyright">
- <img class="glyptodon" src="/images/glyptodon.png" alt=".:(_)>"/>
- Copyright © 2015,
- <a href="http://glyptodon.org/">Glyptodon LLC</a>.
+ Copyright © 2016 <a href="http://www.apache.org/">The Apache
+ Software Foundation</a>, Licensed under the Apache License, Version
+ 2.0.
</p>
+
+ <!-- Trademarks -->
+ <p class="trademarks">
+ Apache and the Apache feather logo are trademarks of The Apache
+ Software Foundation.
+ </p>
+
+ <!-- Incubation disclaimer -->
+ <p class="disclaimer">
+ Apache Guacamole is an effort undergoing Incubation at The Apache
+ Software Foundation (ASF), sponsored by the Incubator. Incubation is
+ required of all newly accepted projects until a further review
+ indicates that the infrastructure, communications, and decision making
+ process have stabilized in a manner consistent with other successful
+ ASF projects. While incubation status is not necessarily a reflection
+ of the completeness or stability of the code, it does indicate that the
+ project has yet to be fully endorsed by the ASF.
+ </p>
+
</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/a650e55f/styles/main.css
----------------------------------------------------------------------
diff --git a/styles/main.css b/styles/main.css
index 5c8e256..5a4413e 100644
--- a/styles/main.css
+++ b/styles/main.css
@@ -21,7 +21,7 @@ div#header {
}
-div#header, div#footer {
+div#header {
text-align: center;
}
@@ -293,12 +293,10 @@ p {
}
div#footer {
- text-align: center;
- background: black;
- color: white;
font-size: 0.9em;
- padding-top: 1em;
- margin-top: 2em;
+ border-top: 1px solid black;
+ margin: 1em;
+ padding: 1em;
}
#footer .block-menu {
@@ -320,20 +318,6 @@ div#footer {
display: inline-block;
}
-#footer .copyright {
- margin: 0;
- opacity: 0.8;
- font-style: italic;
- text-align: right;
- font-size: 0.8em;
- padding: 0.5em;
-}
-
-#footer a[href] {
- text-decoration: none;
- color: white;
-}
-
#footer ul {
text-align: left;
min-width: 10%;
@@ -815,7 +799,7 @@ input.donate {
background: inherit;
}
- #navigation, #footer, .social-buttons, .hook{
+ #navigation, .social-buttons, .hook{
display: none;
}
[3/3] incubator-guacamole-website git commit: Clean up header and
navigation menu.
Posted by mj...@apache.org.
Clean up header and navigation menu.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/d355a2e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/d355a2e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/d355a2e8
Branch: refs/heads/master
Commit: d355a2e861aeae8d9861a5a0d392066345389804
Parents: f81f521
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Apr 23 23:21:52 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Apr 23 23:21:52 2016 -0700
----------------------------------------------------------------------
_includes/header.html | 46 +++++++++++++++++--------------------
images/github-mark.png | Bin 4268 -> 4044 bytes
images/guac-download.png | Bin 6732 -> 5704 bytes
images/guac-logo.png | Bin 0 -> 4366 bytes
styles/main.css | 52 +++++++++++++++++-------------------------
5 files changed, 42 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d355a2e8/_includes/header.html
----------------------------------------------------------------------
diff --git a/_includes/header.html b/_includes/header.html
index 04a8d8a..8baf192 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -1,30 +1,26 @@
<!-- Header -->
<div id="header">
- <div class="logo"><a href="/"><img src="/images/guac-tricolor.png"
- alt="\_^/"/></a></div>
- <h1><a href="/">Guacamole</a></h1>
- <div id="navigation">
- <ul class="menu">
- {% assign menu_pages = site.pages %}
- {% for link in site.links %}
- {% assign menu_pages = menu_pages | push: link %}
- {% endfor %}
- {% assign menu_pages = menu_pages | sort: 'menu-weight') %}
- {% for menu_page in menu_pages %}
- {% if menu_page.menu-title %}
- <li><a
- {% if menu_page.location %}
- href="{{ menu_page.location }}"
- {% else %}
- href="{{ menu_page.url | prepend: site.baseurl }}"
- {% endif %}
- {% if menu_page.menu-class %}
- class="{{ menu_page.menu-class }}"
- {% endif %}>{{ menu_page.menu-title }}</a></li>
- {% endif %}
- {% endfor %}
- </ul>
- </div>
+ <h1><a href="/">Apache Guacamole</a></h1>
+ <ul id="navigation" class="menu">
+ {% assign menu_pages = site.pages %}
+ {% for link in site.links %}
+ {% assign menu_pages = menu_pages | push: link %}
+ {% endfor %}
+ {% assign menu_pages = menu_pages | sort: 'menu-weight') %}
+ {% for menu_page in menu_pages %}
+ {% if menu_page.menu-title %}
+ <li><a
+ {% if menu_page.location %}
+ href="{{ menu_page.location }}"
+ {% else %}
+ href="{{ menu_page.url | prepend: site.baseurl }}"
+ {% endif %}
+ {% if menu_page.menu-class %}
+ class="{{ menu_page.menu-class }}"
+ {% endif %}>{{ menu_page.menu-title }}</a></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
</div>
<!-- Social stuff -->
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d355a2e8/images/github-mark.png
----------------------------------------------------------------------
diff --git a/images/github-mark.png b/images/github-mark.png
index ea6ff54..192846a 100644
Binary files a/images/github-mark.png and b/images/github-mark.png differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d355a2e8/images/guac-download.png
----------------------------------------------------------------------
diff --git a/images/guac-download.png b/images/guac-download.png
index abde6e1..e2b3991 100644
Binary files a/images/guac-download.png and b/images/guac-download.png differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d355a2e8/images/guac-logo.png
----------------------------------------------------------------------
diff --git a/images/guac-logo.png b/images/guac-logo.png
new file mode 100644
index 0000000..abe08b2
Binary files /dev/null and b/images/guac-logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/d355a2e8/styles/main.css
----------------------------------------------------------------------
diff --git a/styles/main.css b/styles/main.css
index f1363ee..94c03de 100644
--- a/styles/main.css
+++ b/styles/main.css
@@ -1,9 +1,14 @@
+
+* {
+ box-sizing: border-box;
+}
+
body {
color: black;
background: white;
- font-family: 'FreeSans', 'Liberation Sans', 'Arial', 'Helvetica', sans-serif;
+ font-family: 'Carlito', 'FreeSans', 'Liberation Sans', 'Arial', 'Helvetica', sans-serif;
text-rendering: optimizeLegibility;
margin: 0;
@@ -16,39 +21,33 @@ a[href] { color: #080; }
a[href]:visited { color: #884; }
div#header {
- color: black;
- background: rgb(139, 168, 116);
+ color: white;
+ background: #474747;
+ display: table;
+ width: 100%;
+ padding: 1em;
}
-div#header {
- text-align: center;
-}
-
div#header > * {
+ display: table-cell;
vertical-align: middle;
}
#header h1 {
- display: inline-block;
text-align: left;
- font-size: 2.5em;
- text-transform: uppercase;
+ font-size: 1.75em;
margin: 0.25em 0;
}
#header h1 a[href] {
color: inherit;
text-decoration: inherit;
-}
-
-#header div.logo {
- display: inline-block;
-}
-
-#header .logo img {
- max-height: 3em;
- margin: 0.5em;
+ padding-left: 1.5em;
+ background-image: url('/images/guac-logo.png');
+ background-repeat: no-repeat;
+ background-size: 1em;
+ background-position: 0.25em center;
}
.hook {
@@ -140,13 +139,9 @@ table.downloads td {
padding-right: 1em;
}
-div#navigation {
- text-align: center;
+ul#navigation {
+ text-align: right;
font-size: 0.9em;
- background: rgba(255, 255, 255, 0.8);
-}
-
-#navigation ul {
padding: 0;
margin: 0;
}
@@ -157,14 +152,11 @@ div#navigation {
#navigation li {
display: inline-block;
- padding-left: 0.5em;
- padding-right: 0.5em;
white-space: nowrap;
}
#navigation a[href] {
- color: black;
- text-shadow: rgba(255, 255, 255, 0.8) 1px 1px;
+ color: inherit;
text-decoration: none;
}
@@ -176,8 +168,6 @@ div#navigation {
}
#navigation li a:hover {
- color: black;
- background-color: white;
text-decoration: underline;
}
[2/3] incubator-guacamole-website git commit: Remove section styling
and Glyptodon logo from index.
Posted by mj...@apache.org.
Remove section styling and Glyptodon logo from index.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/commit/f81f5212
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/tree/f81f5212
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/diff/f81f5212
Branch: refs/heads/master
Commit: f81f5212e8a984d580ca2dcb7ed778c4da1e34cf
Parents: a650e55
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Apr 23 22:20:28 2016 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Sat Apr 23 22:20:28 2016 -0700
----------------------------------------------------------------------
index.md | 14 ----
styles/main.css | 231 ---------------------------------------------------
2 files changed, 245 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/f81f5212/index.md
----------------------------------------------------------------------
diff --git a/index.md b/index.md
index ae23325..6584c98 100644
--- a/index.md
+++ b/index.md
@@ -12,14 +12,6 @@ layout: default
</div>
</div>
-<!-- Latest Version -->
-<!--<div class="announce">
- <div class="version"><a href="/release/release-notes-0-9-6">0.9.6</a></div>
- <div class="summary">PostgreSQL support, database speed improvements, RDP memory fixes, session management.</div>
-</div>-->
-
-<div class="main">
-<div class="section guac-description" markdown="1">
What is Guacamole?
------------------------------
@@ -38,10 +30,6 @@ Guacamole is and will always be **free and open source software**. It is license
We feel this sets us apart from other remote desktop solutions, and gives us a [distinct advantage](/open-source).
-<div class="attribution"><span>HTML5 Logo © <a href="http://www.w3.org/"><abbr title="World Wide Web Consortium">W3C</abbr></a></span>.</div>
-</div>
-
-<div class="section support" markdown="1">
What about support?
------------------------------
@@ -50,6 +38,4 @@ As an open source project, free support is always available to anyone through ou
We maintain thorough documentation for Guacamole and its components in an [online manual](/doc/gug/), as well as full [API documentation](/api-documentation) for the Guacamole core. Like the software itself, these resources will always be free.
For enterprises, dedicated commercial support is also available through **[Glyptodon LLC](http://glyptodon.org/)**, the company founded around the Guacamole project. If interested, please <a href="mailto:contact@glyptodon.org" class="piwik_link" onclick="piwikTracker.trackGoal(8)">contact us for a quote</a>. Paid support helps drive development, and benefits both the project and the community.
-</div>
-</div>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-website/blob/f81f5212/styles/main.css
----------------------------------------------------------------------
diff --git a/styles/main.css b/styles/main.css
index 5a4413e..f1363ee 100644
--- a/styles/main.css
+++ b/styles/main.css
@@ -208,85 +208,6 @@ div#navigation {
background-image: url('/images/guac-sponsors.png');
}
-.main {
- text-align: center;
-}
-
-.main > * {
- text-align: left;
- vertical-align: top;
-}
-
-.section {
- padding: 1.5cm 2.5cm;
- background-repeat: no-repeat;
-}
-
-.section h2 {
- margin: 1em 0;
- margin-top: 0;
- font-weight: bold;
-}
-
-.section h2 ~ h2 {
- margin-top: 1.5cm;
-}
-
-.section.guac-description {
-
- position: relative;
- padding-right: 8.5cm;
- border-right: 2.5cm solid transparent;
-
- -moz-background-position: right center;
- -webkit-background-position: right center;
- background-position: right center;
-
- min-height: 8.5cm;
- -moz-background-size: 6cm;
- -webkit-background-size: 6cm;
- background-size: 6cm;
-
- background-image: url('/images/html5-color.png');
-
-}
-
-.section.guac-description .attribution {
-
- position: absolute;
- right: 0;
- top: 50%;
-
- width: 6cm;
- margin-top: 3cm;
- padding-top: 1em;
-
- text-align: center;
- font-size: 0.75em;
- font-style: italic;
-
-}
-
-
-.section.support {
-
- padding-top: 0;
- padding-left: 13.5cm;
- margin-bottom: -3em;
-
- -moz-background-position: 3cm bottom;
- -webkit-background-position: 3cm bottom;
- background-position: 3cm bottom;
-
- min-height: 5cm;
- -moz-background-size: 7.5cm;
- -webkit-background-size: 7.5cm;
- background-size: 7.5cm;
-
- background-image: url('/images/official-glyptodon-logo.png');
-
-}
-
p {
line-height: 1.5;
text-align: justify;
@@ -328,11 +249,6 @@ div#footer {
list-style-type: none;
}
-#footer img.glyptodon {
- max-height: 1em;
- vertical-align: baseline;
-}
-
.social-buttons {
padding: 0.5em;
text-align: right;
@@ -561,121 +477,6 @@ table.releases td {
width: 16cm;
}
-/*
- * Sponsors
- */
-
-.sponsored-by {
- background: white;
- color: black;
- padding: 1em;
-}
-
-.sponsored-by h2 {
- font-size: 1em;
- font-weight: bold;
-}
-
-.sponsor {
- display: inline-block;
- margin: 1em;
-}
-
-.sponsor .logo {
- padding: 1em;
- display: inline-block;
-}
-
-.platinum .sponsor .logo,
-.gold .sponsor .logo,
-.silver .sponsor .logo,
-.bronze .sponsor .logo {
- border: 1px solid rgba(0, 0, 0, 0.5);
- box-shadow: inset -1px -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.platinum .sponsor {
- display: table;
-}
-
-.platinum .sponsor .sponsor-section {
- display: table-cell;
- vertical-align: middle;
- padding: 1em;
-}
-
-.sponsored-by .sponsor .logo img,
-.platinum .sponsor .logo img,
-.gold .sponsor .logo img {
- max-width: 256px;
- max-height: 192px;
-}
-
-.silver .sponsor .logo img {
- max-width: 160px;
- max-height: 120px;
-}
-
-.bronze .sponsor .logo img {
- max-width: 100px;
- max-height: 75px;
-}
-
-.sponsor-page .sponsor-profile {
- float: right;
- margin: 2em;
-}
-
-.sponsor-page .sponsor-profile img {
- max-width: 320px;
- width: 100%;
-}
-
-table.benefits {
- border-collapse: collapse;
- margin: 2em auto;
-}
-
-table.benefits th,
-table.benefits td {
- margin: 0;
- padding: 1em;
-}
-
-table.benefits tbody td {
- border: 1px solid #CCC;
- text-align: center;
-}
-
-table.benefits th .level {
- font-weight: bold;
-}
-
-table.benefits th .description{
- font-weight: normal;
-}
-
-table.benefits tbody tr:nth-child(even) {
- background: #F5F5F5;
-}
-
-table.benefits tbody th,
-table.benefits tbody th p {
- text-align: left;
- font-weight: normal;
-}
-
-table.benefits thead td,
-table.benefits thead th,
-table.benefits thead td p,
-table.benefits thead th p {
- text-align: center;
-}
-
-table.benefits p {
- margin: 0;
-}
-
/* Donation section */
form.standalone {
@@ -803,14 +604,6 @@ input.donate {
display: none;
}
- .section {
- display: block;
- max-width: none;
- width: auto;
- margin: 0;
- padding: 0;
- }
-
h2 {
margin-top: 1em;
margin-bottom: 0.75em;
@@ -837,27 +630,3 @@ input.donate {
#donate::after { display: none; }
}
-@media screen and (max-width: 25cm) {
-
- .section.guac-description {
- padding: 1em;
- border: none;
- background: none;
- min-height: 0;
- }
-
- .section.guac-description .attribution {
- display: none;
- }
-
- .section.support {
- padding: 1em;
- padding-bottom: 5cm;
- -moz-background-position: center bottom;
- -webkit-background-position: center bottom;
- background-position: center bottom;
- border: none;
- }
-
-}
-