Repository: incubator-geode Updated Branches: refs/heads/develop 850e143d3 -> 7ad9cc945
GEODE-1576: Website needs to be upgraded to include WAN and CQ fixed icons in the header Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7ad9cc94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7ad9cc94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7ad9cc94 Branch: refs/heads/develop Commit: 7ad9cc9451212f1c8a0acba3ec78a9eb562d3780 Parents: 95eff48 Author: Swapnil Bawaskar <sbawas...@pivotal.io> Authored: Fri Jun 24 16:02:56 2016 -0700 Committer: Swapnil Bawaskar <sbawas...@pivotal.io> Committed: Fri Jun 24 16:05:36 2016 -0700 ---------------------------------------------------------------------- geode-site/website/content/css/geode-site.css | 41 ++++++++++------------ geode-site/website/layouts/header.html | 18 +++++----- 2 files changed, 27 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ad9cc94/geode-site/website/content/css/geode-site.css ---------------------------------------------------------------------- diff --git a/geode-site/website/content/css/geode-site.css b/geode-site/website/content/css/geode-site.css index 136a757..bfb9ba9 100644 --- a/geode-site/website/content/css/geode-site.css +++ b/geode-site/website/content/css/geode-site.css @@ -1291,17 +1291,17 @@ h2.icns-tools:before{ /* Phone and below */ @media screen and (max-width: 768px) { #home-logo { opacity: 1; height: 25px;} - span.icon-book:after { + span.fa-book:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Docs"; } - span.icon-group:after { + span.fa-users:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Community"; } - span.icon-github-sign:after { + span.fa-github-square:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Github"; @@ -1311,12 +1311,12 @@ h2.icns-tools:before{ font-weight: 600; content: " Trello"; } - span.icon-bug:after { + span.fa-bug:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " JIRA"; } - span.icon-stackexchange:after { + span.fa-stack-overflow:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " StackOverflow"; @@ -1326,17 +1326,17 @@ h2.icns-tools:before{ font-weight: 600; content: " HipChat"; } - span.icon-twitter:after { + span.fa-twitter:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Twitter"; } - span.icon-edit:after { + span.fa-pencil-square-o:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Wiki"; } - span.icon-releases:after { + span.fa-arrow-circle-o-down:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Releases"; @@ -1346,16 +1346,11 @@ h2.icns-tools:before{ font-weight: 600; content: " Chat"; } - span.icon-envelope:after { + span.fa-envelope:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Mailing Lists"; } - span.icon-cloud-download:after { - font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; - font-weight: 600; - content: " Releases"; - } span.icon-flag-checkered:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; @@ -1495,17 +1490,17 @@ h2.icns-tools:before{ /* Tablets/desktops and up */ @media screen and (min-width: 1200px) { - span.icon-book:after { + span.fa-book:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Docs"; } - span.icon-group:after { + span.fa-users:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Community"; } - span.icon-github-sign:after { + span.fa-github-square:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Github"; @@ -1515,12 +1510,12 @@ h2.icns-tools:before{ font-weight: 600; content: " Trello"; } - span.icon-bug:after { + span.fa-bug:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " JIRA"; } - span.icon-stackexchange:after { + span.fa-stack-overflow:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " StackOverflow"; @@ -1530,17 +1525,17 @@ h2.icns-tools:before{ font-weight: 600; content: " HipChat"; } - span.icon-twitter:after { + span.fa-twitter:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Twitter"; } - span.icon-edit:after { + span.fa-pencil-square-o:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Wiki"; } - span.icon-releases:after { + span.fa-arrow-circle-o-down:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Releases"; @@ -1550,7 +1545,7 @@ h2.icns-tools:before{ font-weight: 600; content: " Chat"; } - span.icon-envelope:after { + span.fa-envelope:after { font-family: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; font-weight: 600; content: " Mailing Lists"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ad9cc94/geode-site/website/layouts/header.html ---------------------------------------------------------------------- diff --git a/geode-site/website/layouts/header.html b/geode-site/website/layouts/header.html index b5a4ca7..843c689 100644 --- a/geode-site/website/layouts/header.html +++ b/geode-site/website/layouts/header.html @@ -245,18 +245,18 @@ </a> <nav class="collapse navbar-collapse bf-navbar-collapse" role="navigation"> <ul class="nav navbar-nav navbar-right"> - <li class="<%= 'active' if @community %>"><a href="/community/"><span class="icns icon-group"></span></a></li> - <li class="<%= 'active' if @docs %>"><a href="/docs/"><span class="icns icon-book"></span></a></li> - <li><a href="http://github.com/apache/incubator-geode" target="_blank"><span class="icns icon-github-sign"></span></a></li> + <li class="<%= 'active' if @community %>"><a href="/community/"><span class="fa fa-users"></span></a></li> + <li class="<%= 'active' if @docs %>"><a href="/docs/"><span class="fa fa-book"></span></a></li> + <li><a href="http://github.com/apache/incubator-geode" target="_blank"><span class="fa fa-github-square"></span></a></li> <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>--> <li><a href="https://issues.apache.org/jira/browse/GEODE/" - target="_blank"><span class="icns icon-bug"></span></a></li> - <li><a href="http://stackoverflow.com/search?q=Apache%20Geode" target="_blank"><span class="icns icon-stackexchange"></span></a></li> - <li><a href="/community/#mailing-lists"><span class="icns icon-envelope"></span></a></li> + target="_blank"><span class="fa fa-bug"></span></a></li> + <li><a href="http://stackoverflow.com/search?q=Apache%20Geode" target="_blank"><span class="fa fa-stack-overflow"></span></a></li> + <li><a href="/community/#mailing-lists"><span class="fa fa-envelope"></span></a></li> <!-- <li><a href="/community/#live"><span class="icns icon-comments"></span></a></li> --> - <li><a href="https://twitter.com/apachegeode" target="_blank"><span class="icns icon-twitter"></span></a></li> - <li><a href="https://cwiki.apache.org/confluence/display/geode/" target="_blank"><span class="icns icon-edit"></span></a></li> - <li><a href="/releases/"><span class="icns icon-releases"></span></a></li> + <li><a href="https://twitter.com/apachegeode" target="_blank"><span class="fa fa-twitter"></span></a></li> + <li><a href="https://cwiki.apache.org/confluence/display/geode/" target="_blank"><span class="fa fa-pencil-square-o"></span></a></li> + <li><a href="/releases/"><span class="fa fa-arrow-circle-o-down"></span></a></li> </ul> </nav> </div>