You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/01/08 20:30:33 UTC
[28/50] [abbrv] allura git commit: [#7919] show Add Tool button in
unlocked mode too. Its menu needs some class/style fixes
[#7919] show Add Tool button in unlocked mode too. Its menu needs some class/style fixes
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/148b9f4d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/148b9f4d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/148b9f4d
Branch: refs/heads/master
Commit: 148b9f4dcbdbd570febc7d8746392d6bb51c32cd
Parents: 36e2170
Author: Dave Brondsema <da...@brondsema.net>
Authored: Thu Dec 10 17:47:41 2015 -0500
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jan 8 14:06:17 2016 -0500
----------------------------------------------------------------------
Allura/allura/public/nf/css/navbar.css | 10 +++++++++-
Allura/allura/public/nf/js/navbar.es6.js | 7 ++++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/148b9f4d/Allura/allura/public/nf/css/navbar.css
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/css/navbar.css b/Allura/allura/public/nf/css/navbar.css
index c6f07ce..4203c45 100644
--- a/Allura/allura/public/nf/css/navbar.css
+++ b/Allura/allura/public/nf/css/navbar.css
@@ -107,7 +107,6 @@
margin: 10px 0;
}
-#top_nav_admin .tb-item.anchored:last-child a,
#top_nav_admin .tb-item-grouper a {
border-right: 1px transparent;
}
@@ -124,6 +123,15 @@
background: #ccc;
}
+/* .react-drag used to distinguish container used in locked vs unlocked modes */
+.react-drag #add-tool-container {
+ float: left;
+ margin-left: 10px;
+}
+.react-drag #add-tool-container .add-tool-toggle {
+ margin-top: 5px;
+}
+
.tb-item-edit a {
margin-left: 2px;
}
http://git-wip-us.apache.org/repos/asf/allura/blob/148b9f4d/Allura/allura/public/nf/js/navbar.es6.js
----------------------------------------------------------------------
diff --git a/Allura/allura/public/nf/js/navbar.es6.js b/Allura/allura/public/nf/js/navbar.es6.js
index 28f87c7..c0f9a1a 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -261,9 +261,7 @@ var NormalNavBar = React.createClass({
className="dropdown">
{ listItems }
<li id="add-tool-container">
- <ToggleAddNewTool
- {...this.props}
- onOptionClick={this.onOptionClick} />
+ <ToggleAddNewTool installableTools={this.props.installableTools}/>
</li>
</ul>
);
@@ -338,6 +336,9 @@ var AdminNav = React.createClass({
{ tools }
</ReactReorderable>
{ end_tools }
+ <div id="add-tool-container">
+ <ToggleAddNewTool installableTools={this.props.installableTools}/>
+ </div>
</div>
);
},