You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ke...@apache.org on 2017/11/29 21:33:01 UTC
[1/3] allura git commit: Add a stylized search button to sidebar
search boxes
Repository: allura
Updated Branches:
refs/heads/master e391f0b51 -> 8031ba781
Add a stylized search button to sidebar search boxes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4f962ac0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4f962ac0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4f962ac0
Branch: refs/heads/master
Commit: 4f962ac0d3d1f79341b85411a6be61342ff94467
Parents: 49fccb7
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Nov 22 15:12:49 2017 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Nov 22 15:12:49 2017 -0500
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 17 +++++++++++++++++
.../templates/jinja_master/sidebar_menu.html | 4 ++++
2 files changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4f962ac0/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 1f9935b..e7d5e65 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -1752,6 +1752,23 @@ a.active {
position: relative;
z-index: 2;
}
+#sidebar #search {
+ position: relative;
+}
+#sidebar #search .fa-search {
+ position: absolute;
+ z-index: 2;
+ top: 15px;
+ right: 0;
+ font-size: 14px;
+ text-align: center;
+ height: 23px;
+ width: 23px;
+ line-height: 23px;
+}
+#sidebar #search .fa-search:hover {
+ cursor: pointer;
+}
#sidebar ul {
border: 1px solid #aaaaaa;
-moz-border-radius: 4px;
http://git-wip-us.apache.org/repos/asf/allura/blob/4f962ac0/Allura/allura/templates/jinja_master/sidebar_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index 8d2831a..4c5acf6 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -47,6 +47,10 @@
{% if c.app and c.app.searchable %}
<form id="search" method="GET" action="{{c.app.url + 'search/'}}">
<input name="q" type="text" title="Search {{c.app.config.options.mount_label}}" placeholder="Search {{c.app.config.options.mount_label}}">
+ <label>
+ <input type="submit" style="display:none">
+ <b class="fa fa-search" title="Submit"></b>
+ </label>
</form>
{% else %}
<div> </div>
[2/3] allura git commit: Add a class to placeholder div,
for theme styling
Posted by ke...@apache.org.
Add a class to placeholder div, for theme styling
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8c091aac
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8c091aac
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8c091aac
Branch: refs/heads/master
Commit: 8c091aac6ba4b21bfd674fd55a3f710539b60193
Parents: 4f962ac
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Nov 22 17:14:19 2017 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Nov 22 17:14:19 2017 -0500
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/sidebar_menu.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/8c091aac/Allura/allura/templates/jinja_master/sidebar_menu.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/sidebar_menu.html b/Allura/allura/templates/jinja_master/sidebar_menu.html
index 4c5acf6..ff00db3 100644
--- a/Allura/allura/templates/jinja_master/sidebar_menu.html
+++ b/Allura/allura/templates/jinja_master/sidebar_menu.html
@@ -53,7 +53,7 @@
</label>
</form>
{% else %}
- <div> </div>
+ <div class="placeholder-no-searchbox"> </div>
{% endif %}
{% if c.custom_sidebar_menu %}
{% for s in c.custom_sidebar_menu %}
[3/3] allura git commit: Merge commit
'8c091aac6ba4b21bfd674fd55a3f710539b60193'
Posted by ke...@apache.org.
Merge commit '8c091aac6ba4b21bfd674fd55a3f710539b60193'
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8031ba78
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8031ba78
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8031ba78
Branch: refs/heads/master
Commit: 8031ba781d4caf5b39178c6cbe510d7eac1a19db
Parents: e391f0b 8c091aa
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Wed Nov 29 20:36:25 2017 +0000
Committer: Kenton Taylor <kt...@slashdotmedia.com>
Committed: Wed Nov 29 20:36:25 2017 +0000
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 17 +++++++++++++++++
.../templates/jinja_master/sidebar_menu.html | 6 +++++-
2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------