allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject [1/8] allura git commit: Fix positioning of Create project button
Date Mon, 02 Oct 2017 19:45:12 GMT
Repository: allura
Updated Branches:
  refs/heads/master 4d73755d1 -> c6a8804a6


Fix positioning of Create project button


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

Branch: refs/heads/master
Commit: c6a8804a6e22e1a22a7c00b3b518526e76b5eb62
Parents: 8034f73
Author: Dave Brondsema <dave@brondsema.net>
Authored: Wed Sep 27 13:29:07 2017 -0400
Committer: Kenton Taylor <ktaylor@slashdotmedia.com>
Committed: Mon Oct 2 19:45:01 2017 +0000

----------------------------------------------------------------------
 Allura/allura/lib/widgets/resources/css/add_project.css | 4 +++-
 Brocfile.js                                             | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/c6a8804a/Allura/allura/lib/widgets/resources/css/add_project.css
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/css/add_project.css b/Allura/allura/lib/widgets/resources/css/add_project.css
index a4eac98..9e27db5 100644
--- a/Allura/allura/lib/widgets/resources/css/add_project.css
+++ b/Allura/allura/lib/widgets/resources/css/add_project.css
@@ -103,7 +103,9 @@ div.welcome div.grid-3{
     border: 1px solid black;
 }
 div.button-row {
-    margin: 30px 0 100px 20px;
+    float: left;
+    clear: left;
+    margin: 30px 0 0 20px;
 }
 div.tool {
     float: left;

http://git-wip-us.apache.org/repos/asf/allura/blob/c6a8804a/Brocfile.js
----------------------------------------------------------------------
diff --git a/Brocfile.js b/Brocfile.js
index 90cdc37..9ac6eab 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -65,7 +65,10 @@ navbar = babelTranspiler(navbar, {
 });
 var navbar = sourceMapConcat(navbar, {
     // headerFiles & footerFiles used to specify some that must come before or after
others
-    headerFiles: [react_file],
+    headerFiles: [react_file,
+                  react_dom_file,
+                  'public/nf/js/create-react-class.min.js',
+                  'public/nf/js/prop-types.min.js'],
     inputFiles: ['**/*.js'],
     footerFiles: ['public/nf/js/navbar.js',], // this used to be navbar.es6.js but the babel
transpiler dropped the .es6
     outputFile: '/navbar.js',


Mime
View raw message