From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 16 Apr 2015 13:42:19 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.3~37^2~5^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ce6de45ab6e6935617dc0c49646ef9d95dda25e8;hp=7320f5926edc6a76ba0a6c8137d6d3e032545d37;p=myslice.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/portal/static/css/fed4fire.css b/portal/static/css/fed4fire.css
index cf4881f0..89d4210b 100644
--- a/portal/static/css/fed4fire.css
+++ b/portal/static/css/fed4fire.css
@@ -681,14 +681,15 @@ div.dashboard a:hover {
     text-decoration:underline;
 }
 div.dashboard div.projects-tree {
-    margin-left:15px;
+    margin-left:49px;
 }
 div.dashboard ul {
     list-style-type:disc;
     list-style-position:inside;
     text-align:left;
-    margin:0 0 15px 4px;
+    margin:0 0 15px 0;
     padding:0;
+    
 }
 div.dashboard ul ul {
     margin:5px 0 15px 25px;
@@ -704,7 +705,7 @@ div.dashboard ul ul li {
 div.dashboard ul ul a {
 }
 div.dashboard h3 {
-    border-bottom:0.5px solid #E0E0E0;
+    border-bottom:1px solid #E0E0E0;
     margin-right:15px;
     margin-bottom:25px;
 }
@@ -720,7 +721,7 @@ div.experiment-tools {
     
 }
 div.experiment-tools h4 {
-    border-bottom:0.5px solid #E0E0E0;
+    border-bottom:1px solid #E0E0E0;
     margin:25px 15px 25px 0;
     padding-bottom:5px;
 }
diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html
index 77d6efae..b867ab2a 100644
--- a/portal/templates/fed4fire/fed4fire_home-view.html
+++ b/portal/templates/fed4fire/fed4fire_home-view.html
@@ -40,9 +40,11 @@
                 <div id="home-project-tree"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
             </div>
             <div>
-                <span class="glyphicon glyphicon-plus"></span> <a href="/portal/slice_request/">Create slice</a>
+                
                 <br />
                 <span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
+                <br />
+                <span class="glyphicon glyphicon-plus"></span> <a href="/portal/slice_request/">Create slice</a>
             </div>
             
             <div>