You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2015/12/10 21:35:03 UTC
docs commit: CB-10182 Adding search field and linking it to Google
search.
Repository: cordova-docs
Updated Branches:
refs/heads/master de535f6fa -> 466f58443
CB-10182 Adding search field and linking it to Google search.
Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/466f5844
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/466f5844
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/466f5844
Branch: refs/heads/master
Commit: 466f5844327d3d1b9150b8d5fb2ca006b840cc2c
Parents: de535f6
Author: Dmitry Blotsky <dm...@gmail.com>
Authored: Fri Dec 4 04:30:47 2015 -0800
Committer: Dmitry Blotsky <dm...@gmail.com>
Committed: Thu Dec 10 12:34:18 2015 -0800
----------------------------------------------------------------------
Makefile | 2 +
_config.yml | 3 +-
www/_includes/header.html | 87 +++++++++++++++++--------------
www/static/css-src/_home.scss | 16 +++---
www/static/css-src/main.scss | 17 ++++++
www/static/img/search_icon_hover.svg | 12 +++++
www/static/js/index.js | 4 +-
7 files changed, 93 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/466f5844/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index d0d24a7..517774b 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,8 @@ $(TOC_FILES): $(BIN_DIR)/toc.js Makefile
$(MAIN_STYLE_FILE): $(SCSS_SRC)
+# pattern rules
+
# NODE:
# $(@D) means "directory part of target"
$(CSS_DEST_DIR)/%.css: $(CSS_SRC_DIR)/%.less Makefile
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/466f5844/_config.yml
----------------------------------------------------------------------
diff --git a/_config.yml b/_config.yml
index d98edae..91b1e9d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -24,7 +24,8 @@ repo:
latest_docs_version: dev
# NOTE:
-# this value might get overwritten on some pages; see _defaults.yml
+# this value _might_ get overwritten on some pages;
+# see _defaults.yml, which is a generated file
language: en
# NOTE:
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/466f5844/www/_includes/header.html
----------------------------------------------------------------------
diff --git a/www/_includes/header.html b/www/_includes/header.html
index fa81447..906a57a 100644
--- a/www/_includes/header.html
+++ b/www/_includes/header.html
@@ -1,40 +1,49 @@
-<a class="scroll-point pt-top" name="top"></a>
-<nav class="navbar navbar-inverse navbar-fixed-top">
- <div class="container-fluid">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="{{ site.baseurl }}/"><img id="logo_top" src="{{ site.baseurl }}/static/img/cordova-logo-newbrand.svg"/></a>
- </div>
- <div id="navbar" class="navbar-collapse collapse">
- <!-- <img class="pull-right hidden-xs" style="width:25px" src="{{ site.baseurl }}/static/img/search_icon.svg"/> -->
- <div class="nav_bar_center">
- <ul class="nav navbar-nav">
- <li {% if page.docs_tab %}class="active"{% endif %}>
- <a href="{{ site.baseurl }}/docs/en/latest/guide/overview/">Documentation</a>
- </li>
- <li {% if page.plugins_tab %}class="active"{% endif %}>
- <a href="{{ site.baseurl }}/plugins">Plugins</a>
- </li>
- <li {% if page.blog_tab %}class="active"{% endif %}>
- <a href="{{ site.baseurl }}/blog" id="blog_button">Blog<span class="badge" id="new_blog_count"></span></a>
- </li>
- <li {% if page.contribute_tab %}class="active"{% endif %}>
- <a href="{{ site.baseurl }}/contribute">Contribute</a>
- </li>
- <li>
- <a href="{{ site.baseurl }}/#getstarted">Get Started</a>
- </li>
- <!-- <li class="visible-xs">
- <img class="" style="width:25px;margin-left:13px" src="{{ site.baseurl }}/static/img/search_icon.svg"/>
- </li> -->
- </ul>
+<header>
+ <a class="scroll-point pt-top" name="top"></a>
+ <nav class="navbar navbar-inverse navbar-fixed-top">
+ <div class="container-fluid">
+ <div class="navbar-header">
+ <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="{{ site.baseurl }}/"><img id="logo_top" src="{{ site.baseurl }}/static/img/cordova-logo-newbrand.svg"/></a>
</div>
- </div><!--/.navbar-collapse -->
- </div>
-</nav>
-<div id="_fixed_navbar_spacer" style="padding-top:50px"></div>
+ <div id="navbar" class="navbar-collapse collapse">
+ <div class="nav_bar_center">
+ <ul class="nav navbar-nav">
+ <li {% if page.docs_tab %}class="active"{% endif %}>
+ <a href="{{ site.baseurl }}/docs/en/latest/guide/overview/">Documentation</a>
+ </li>
+ <li {% if page.plugins_tab %}class="active"{% endif %}>
+ <a href="{{ site.baseurl }}/plugins">Plugins</a>
+ </li>
+ <li {% if page.blog_tab %}class="active"{% endif %}>
+ <a href="{{ site.baseurl }}/blog" id="blog_button">Blog<span class="badge" id="new_blog_count"></span></a>
+ </li>
+ <li {% if page.contribute_tab %}class="active"{% endif %}>
+ <a href="{{ site.baseurl }}/contribute">Contribute</a>
+ </li>
+ <li>
+ <a href="{{ site.baseurl }}/#getstarted">Get Started</a>
+ </li>
+ </ul>
+ <form action="https://www.google.com/search" method="GET" class="navbar-form navbar-right" id="header-search-form" role="search">
+ <div class="input-group">
+ <input type="text" name="q" class="form-control hidden-sm" placeholder="Site-wide Search">
+ <span class="input-group-btn">
+ <button type="submit" class="btn search-button">
+ <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+ </button>
+ </span>
+ </div>
+ <input type="hidden" name="q" value="site:cordova.apache.org">
+ </form>
+ </div>
+ </div><!--/.navbar-collapse -->
+ </div>
+ </nav>
+ <div id="_fixed_navbar_spacer" style="padding-top:50px"></div>
+</header>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/466f5844/www/static/css-src/_home.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/_home.scss b/www/static/css-src/_home.scss
index 6c671fc..351762f 100644
--- a/www/static/css-src/_home.scss
+++ b/www/static/css-src/_home.scss
@@ -175,24 +175,26 @@ html {
#sprite_apis { @include sprite-img(100%, 0) }
.navbar-brand {
- padding:0;
+ padding: 0;
position: absolute;
}
+
img#logo_top {
- width:150px;
- padding:10px;
+ width: 150px;
+ padding: 10px;
+ height: 50px;
}
@media (min-width: 767px) { /* Center the navs when not collapsed */
.nav_bar_center {
- text-align:center;
- height:50px;
+ text-align: center;
+ height: 50px;
}
.nav_bar_center > ul {
display: inline-block;
- float:none;
+ float: none;
}
- }
+}
.vertical-center-parent {
position: relative;
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/466f5844/www/static/css-src/main.scss
----------------------------------------------------------------------
diff --git a/www/static/css-src/main.scss b/www/static/css-src/main.scss
index 1c948fa..d0f718a 100644
--- a/www/static/css-src/main.scss
+++ b/www/static/css-src/main.scss
@@ -53,6 +53,23 @@ $screen-md-max: $screen-lg - 1;
#{$property}: #{$argument};
}
+/* header */
+header {
+ .navbar-form {
+ margin-bottom: 0px;
+ }
+ .btn.search-button {
+ padding: 0px 10px 0px 15px;
+ font-size: 27px;
+ background-color: rgba(0, 0, 0, 0);
+ border-radius: 0px;
+ color: $gray-40;
+ &:hover {
+ color: $gray-10;
+ }
+ }
+}
+
/* footer */
footer {
background-color: $gray-5;
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/466f5844/www/static/img/search_icon_hover.svg
----------------------------------------------------------------------
diff --git a/www/static/img/search_icon_hover.svg b/www/static/img/search_icon_hover.svg
new file mode 100644
index 0000000..cbd6a16
--- /dev/null
+++ b/www/static/img/search_icon_hover.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 30 60.3" style="enable-background:new 0 0 30 60.3;" xml:space="preserve">
+<style type="text/css">
+ .st0{fill:#ACAAAA;}
+</style>
+<path class="st0" d="M26.2,18.5c-4.1-4.1-10.8-4.1-15,0c-3.5,3.5-4,9-1.5,13.1c-0.2,0.1-0.3,0.2-0.5,0.4l-6.9,6.9
+ c-1.2,1.2-1.2,3.1,0,4.2c0.6,0.6,1.4,0.9,2.1,0.9s1.5-0.3,2.1-0.9l6.9-6.9c0.2-0.2,0.4-0.5,0.5-0.7c1.5,0.7,3.1,1.1,4.7,1.1
+ c2.7,0,5.4-1,7.5-3.1c2-2,3.1-4.7,3.1-7.5S28.2,20.5,26.2,18.5z M23.4,30.6c-1.2,1.2-2.9,1.9-4.7,1.9c-1.8,0-3.4-0.7-4.7-1.9
+ c-2.6-2.6-2.6-6.7,0-9.3c1.2-1.2,2.9-1.9,4.7-1.9c1.8,0,3.4,0.7,4.7,1.9c1.2,1.2,1.9,2.9,1.9,4.7C25.3,27.7,24.6,29.4,23.4,30.6z"/>
+</svg>
http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/466f5844/www/static/js/index.js
----------------------------------------------------------------------
diff --git a/www/static/js/index.js b/www/static/js/index.js
index d8ff155..c134d7b 100644
--- a/www/static/js/index.js
+++ b/www/static/js/index.js
@@ -168,7 +168,9 @@ $(document).ready(function () {
// jira search code
$("#jira-search-button").on("click", submitJiraSearchForm);
$("#jira-search-box").on("keypress", function searchKeypressEventHandler (e) {
- if(e.keyCode == 13) submitJiraSearchForm();
+ if(e.keyCode == 13) {
+ submitJiraSearchForm();
+ }
});
// add prettyprint class to code blocks for prettify.js
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org