Commit 7be031c3 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge branch 'master' of...

Merge branch 'master' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into anoe-master
parents e686f86a ac7921b3
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
margin-bottom: -5px; margin-bottom: -5px;
} }
.spacing-class { margin-right : 10px;}
.exportbtn { .exportbtn {
/* border: 1px solid #333 ; */ /* border: 1px solid #333 ; */
margin-top:17px ; /* valigns with bootstrap h2 */ margin-top:17px ; /* valigns with bootstrap h2 */
...@@ -51,4 +53,3 @@ ...@@ -51,4 +53,3 @@
.minimsg * { .minimsg * {
line-height: 100%; line-height: 100%;
} }
...@@ -15,5 +15,6 @@ ...@@ -15,5 +15,6 @@
<script src="bundle.js"></script> <script src="bundle.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="../dist/js/bootstrap.min.js"></script> <script src="../dist/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/dist/lib/bootstrap/3.2.0/bootstrap.min.js"></script>
</body> </body>
</html> </html>
...@@ -76,7 +76,7 @@ loginSpec = simpleSpec performAction render ...@@ -76,7 +76,7 @@ loginSpec = simpleSpec performAction render
, i [ className "caret" ] , i [ className "caret" ]
[] []
] ]
]
, ul [className "dropdown-menu"] , ul [className "dropdown-menu"]
[ li [] [ li []
[ a [tabIndex (-1), target "blank", title "Documentation and tutorials", href "https://iscpif.fr/gargantext/your-first-map/"] [ a [tabIndex (-1), target "blank", title "Documentation and tutorials", href "https://iscpif.fr/gargantext/your-first-map/"]
...@@ -90,7 +90,9 @@ loginSpec = simpleSpec performAction render ...@@ -90,7 +90,9 @@ loginSpec = simpleSpec performAction render
] ]
] ]
] ]
]
] ]
, ul [className "nav navbar-nav pull-right"] , ul [className "nav navbar-nav pull-right"]
[ [
...@@ -142,17 +144,17 @@ loginSpec = simpleSpec performAction render ...@@ -142,17 +144,17 @@ loginSpec = simpleSpec performAction render
, p [] , p []
[ text "A web platform to explore text-mining" ] [ text "A web platform to explore text-mining" ]
, p [] , p []
[ a [ className "btn btn-primary btn-lg",onClick \_ -> dispatch $ Submit , title "Click and test by yourself" ] [ a [ className "btn btn-primary btn-lg spacing-class ",onClick \_ -> dispatch $ Submit , title "Click and test by yourself" ]
[ span [ className "glyphicon glyphicon-hand-right" ] [ span [ className "glyphicon glyphicon-hand-right" ]
[] []
, text " Login" , text " Login"
] ]
, a [ className "btn btn-warning btn-lg", href "https://iscpif.fr/services/applyforourservices/", target "blank", title "Fill the form to sign up" ] , a [ className "btn btn-warning btn-lg spacing-class", href "https://iscpif.fr/services/applyforourservices/", target "blank", title "Fill the form to sign up" ]
[ span [ aria {hidden : true}, className "glyphicon glyphicon-hand-right" ] [ span [ aria {hidden : true}, className "glyphicon glyphicon-hand-right" ]
[] []
, text "Sign Up" , text "Sign Up"
] ]
, a [ className "btn btn-success btn-lg", href "https://iscpif.fr/gargantext/your-first-map/", target "blank", title "Fill the form to sign up" ] , a [ className "btn btn-success btn-lg spacing-class", href "https://iscpif.fr/gargantext/your-first-map/", target "blank", title "Fill the form to sign up" ]
[ span [ aria {hidden : true}, className "glyphicon glyphicon-hand-right" ] [ span [ aria {hidden : true}, className "glyphicon glyphicon-hand-right" ]
[] []
, text "Documentation" , text "Documentation"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment