allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [30/50] [abbrv] allura git commit: [#7919] Fix styling issues on Add Tool dropdown
Date Fri, 08 Jan 2016 19:30:35 GMT
[#7919] Fix styling issues on Add Tool dropdown


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

Branch: refs/heads/master
Commit: ed0170f3bea01976096c1ee2623a44b7479dca5a
Parents: ffea9dc
Author: Heith Seewald <heiths@gmail.com>
Authored: Fri Dec 11 17:08:16 2015 -0500
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Fri Jan 8 14:06:17 2016 -0500

----------------------------------------------------------------------
 Allura/allura/public/nf/css/navbar.css   | 28 +++++++--------------------
 Allura/allura/public/nf/js/navbar.es6.js |  7 +++++--
 2 files changed, 12 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/ed0170f3/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 4203c45..6d9b0e4 100644
--- a/Allura/allura/public/nf/css/navbar.css
+++ b/Allura/allura/public/nf/css/navbar.css
@@ -61,7 +61,6 @@
 
 .config-tool {
     color: #555;
-    cursor: pointer;
     cursor: context-menu;
 }
 
@@ -83,7 +82,7 @@
 .react-reorderable-item-active {
     border: 3px dashed #9e9e9e;
     background: #c9c9c9;
-    width: 7rem; /* dynamic would be nice */
+    width: 6rem; /* dynamic would be nice */
     height: 30px;
 }
 
@@ -98,7 +97,9 @@
 /* this is the div that moves around with the cursor, when dragging */
 #top_nav_admin .react-reorderable-handle {
     position: absolute;
-    background: transparent;
+    background: rgba(255, 48, 13, 0.2);
+    border: 3px dashed rgba(255, 48, 13, 0.3);
+    min-width: 4em;
 }
 
 #top_nav_admin .tb-item a {
@@ -189,7 +190,7 @@
     background: white;
     position: absolute;
     top: 32px;
-    /*z-index: 2100;*/
+    white-space: nowrap;
 }
 
 .tb-item-container {
@@ -204,7 +205,6 @@
 .tb-item-grouper .react-reorderable-item-active {
     border: 3px dashed #9e9e9e;
     background: #c9c9c9;
-    width: 100%;
     width: calc(100% - 6px);
     height: 24px;
 }
@@ -212,7 +212,6 @@
 .react-reorderable-item .tb-item-grouper > div {
     position: relative;
     background: white;
-    /*z-index: 1620;*/
 }
 
 .react-reorderable-item .tb-item-grouper > div > div {
@@ -279,6 +278,7 @@
     margin-left: 15px;
     border-radius: 4px;
     z-index: 20200;
+    white-space: nowrap;
     clear: both;
 }
 
@@ -290,7 +290,7 @@
 }
 
 #top_nav_admin .contextMenu > ul > li > a {
-    margin: 4px;
+    margin: 4px 0;
     border-right: none;
     min-width: 6em;
     clear: both;
@@ -300,20 +300,6 @@
     border-right: none !important;
 }
 
-/*.modal {*/
-    /*background: rgb(47, 47, 47) none !important;*/
-    /*box-shadow: none !important;*/
-    /*border-radius: 15px !important;*/
-    /*border: 5px solid #404040 !important;*/
-/*}*/
-
-/*.modal input{*/
-    /*margin-bottom: 3px;*/
-    /*padding-left: 2px;*/
-    /*font-weight: 700;*/
-    /*margin-top: 5px;*/
-    /*font-size: medium;*/
-/*}*/
 .options-context-menu{
     /*border: 10px solid red;*/
 }

http://git-wip-us.apache.org/repos/asf/allura/blob/ed0170f3/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 c0f9a1a..63d303e 100644
--- a/Allura/allura/public/nf/js/navbar.es6.js
+++ b/Allura/allura/public/nf/js/navbar.es6.js
@@ -97,11 +97,14 @@ var NavBarItem = React.createClass({
                 </a>
                 {this.props.currentOptionMenu.tool
                 && this.props.currentOptionMenu.tool === this.props.mount_point
-                && <ContextMenu
+                &&
+                <div className="options-context-menu">
+                    <ContextMenu
                     {...this.props}
                         items={this.props.options}
                         onOptionClick={this.props.onOptionClick}
-                    />}
+                    />
+                </div>}
             </div>
         );
     },


Mime
View raw message