allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [30/47] allura git commit: [#7919] Fix style issues with "Add New Tool" menu
Date Tue, 27 Oct 2015 21:36:56 GMT
[#7919] Fix style issues with "Add New Tool" menu


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/e1f41c46
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/e1f41c46
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/e1f41c46

Branch: refs/heads/db/7919
Commit: e1f41c4616ef1e9133df487b9d4121bb3d355e10
Parents: 394e8b7
Author: Heith Seewald <hseewald@hsmb.local>
Authored: Mon Oct 12 15:02:24 2015 -0400
Committer: Heith Seewald <hseewald@hsmb.local>
Committed: Fri Oct 23 13:10:03 2015 -0400

----------------------------------------------------------------------
 Allura/allura/public/nf/css/navbar.css           | 12 +++++++++---
 Allura/allura/public/nf/js/navbar.es6.js         | 12 ++----------
 Allura/allura/templates/jinja_master/master.html |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/e1f41c46/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 a5d24bc..8c28509 100644
--- a/Allura/allura/public/nf/css/navbar.css
+++ b/Allura/allura/public/nf/css/navbar.css
@@ -301,10 +301,15 @@ ul.dropdown .hover, ul.dropdown li:hover {
     color: rgb(85, 85, 85);
 }
 
+#add_tool_menu{
+    position: relative;
+    z-index: 1000;
+}
+
 .tool-card {
     width: 800px;
-    margin-left: 25px;
-    background-color: white;
+    /* margin-left: 25px; */
+    background-color: #CB6666;
     display: block;
     border: 1px solid #777;
     border-radius: 2px 2px 5px 5px;
@@ -313,6 +318,7 @@ ul.dropdown .hover, ul.dropdown li:hover {
     overflow: auto;
     right: 0;
     min-height: 21rem;
+    z-index: inherit;
 }
 
 .box-title {
@@ -382,7 +388,7 @@ ul.dropdown .hover, ul.dropdown li:hover {
 }
 
 .tool-info-right {
-    background: rgba(239, 239, 239, .7);
+    background: rgba(239, 239, 239, 1);
     width: 40%;
     height: 100%;
     right: 0;

http://git-wip-us.apache.org/repos/asf/allura/blob/e1f41c46/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 5d62002..7d64b08 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -399,7 +399,7 @@ var InstallNewToolForm = React.createClass({
 var NewToolInfo = React.createClass({
     propTypes: {
         name: React.PropTypes.string,
-        description: React.PropTypes.description,
+        description: React.PropTypes.string,
         handleAddButton: React.PropTypes.func
     },
 
@@ -439,6 +439,7 @@ var NewToolMain = React.createClass({
 
     componentDidMount: function () {
         let _this = this;
+        console.log(_getProjectUrl() + "/admin/installable_tools/");
         $.get(_getProjectUrl(true) + "/admin/installable_tools/", function (result) {
             if (this.isMounted()) {
                 console.log('hit is mounted', result['tools']);
@@ -522,14 +523,6 @@ var NewToolMain = React.createClass({
 });
 
 
-
-
-
-
-
-
-
-
 ////////////////////////////////////////////
 
 /**
@@ -679,6 +672,5 @@ var Main = React.createClass({
     }
 });
 
-
    React.render(React.createElement(NewToolMain, {
         }), document.getElementById("add_tool_menu"));
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/allura/blob/e1f41c46/Allura/allura/templates/jinja_master/master.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index bb03bf1..0032b74 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -27,7 +27,7 @@
 {% do g.register_forge_js('js/jquery.notify.js') %}
 {% do g.register_forge_js('js/browser-polyfill.js') %}
 {% do g.register_forge_js('js/underscore-min.js') %}
-{% do g.register_forge_js('js/react-with-addons.min.js') %}
+{% do g.register_forge_js('js/react-with-addons.js') %}
 {% do g.register_forge_js("js/react-drag.js") %}
 {% do g.register_forge_js('js/react-reorderable.js') %}
 {% do g.register_forge_js('js/jquery.tooltipster.js') %}


Mime
View raw message