Commit bc0ef60d authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev-forest' of...

Merge branch 'dev-forest' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-forest
parents e516a5bb 911f5778
...@@ -57,6 +57,18 @@ li#rename #rename-a { ...@@ -57,6 +57,18 @@ li#rename #rename-a {
text-decoration: none; text-decoration: none;
} }
#search-popup-tooltip {
position: absolute;
left: 300px;
top: -300px;
background-color: white;
z-index: 1000;
}
#search-popup-tooltip:hover {
border: none;
text-decoration: none;
}
#create-node-tooltip { #create-node-tooltip {
position: absolute; position: absolute;
left: 96px; left: 96px;
...@@ -167,4 +179,19 @@ li:hover a#rename-leaf { ...@@ -167,4 +179,19 @@ li:hover a#rename-leaf {
padding-right: 6px; padding-right: 6px;
} }
.flex {
display: flex;
}
.flex-end {
display: flex;
justify-content: flex-end;
}
.flex-center {
display: flex;
flew-wrap: wrap;
justify-content: center;
}
/*# sourceMappingURL=Login.css.map */ /*# sourceMappingURL=Login.css.map */
...@@ -171,5 +171,15 @@ li ...@@ -171,5 +171,15 @@ li
.reload-btn .reload-btn
padding-right: 6px padding-right: 6px
.flex
display: flex
.flex-end
display: flex
justify-content: flex-end
.flex-center
display: flex
flew-wrap: wrap
justify-content: center
...@@ -74,7 +74,7 @@ cat2score Topic = 3 ...@@ -74,7 +74,7 @@ cat2score Topic = 3
cat2score Favorite = 4 cat2score Favorite = 4
-- caroussel :: Category -> R.Element -- caroussel :: Category -> R.Element
caroussel session nodeId setLocalCategories r cat = H.div {} divs caroussel session nodeId setLocalCategories r cat = H.div {className:"flex"} divs
where where
divs = map (\c -> if cat == c divs = map (\c -> if cat == c
then then
......
...@@ -238,7 +238,8 @@ nodePopupView d p mPop@(Just NodePopup /\ setPopupOpen) = R.createElement el p [ ...@@ -238,7 +238,8 @@ nodePopupView d p mPop@(Just NodePopup /\ setPopupOpen) = R.createElement el p [
H.div {className: "row" } H.div {className: "row" }
[ [
H.div {className: "col-md-8"} [ renameBox d {id, name, nodeType} renameBoxOpen ] H.div {className: "col-md-8"} [ renameBox d {id, name, nodeType} renameBoxOpen ]
, if edit then editIcon renameBoxOpen else H.div {} [] , H.div {className: "flex-end"} [
if edit then editIcon renameBoxOpen else H.div {} []
, H.div {className: "col-md-1"} , H.div {className: "col-md-1"}
[ H.a { "type" : "button" [ H.a { "type" : "button"
, className: glyphicon "remove-circle" , className: glyphicon "remove-circle"
...@@ -247,6 +248,7 @@ nodePopupView d p mPop@(Just NodePopup /\ setPopupOpen) = R.createElement el p [ ...@@ -247,6 +248,7 @@ nodePopupView d p mPop@(Just NodePopup /\ setPopupOpen) = R.createElement el p [
] ]
] ]
] ]
]
where where
editIcon (false /\ setRenameBoxOpen) = editIcon (false /\ setRenameBoxOpen) =
H.div {className: "col-md-1"} H.div {className: "col-md-1"}
...@@ -269,9 +271,9 @@ nodePopupView d p mPop@(Just NodePopup /\ setPopupOpen) = R.createElement el p [ ...@@ -269,9 +271,9 @@ nodePopupView d p mPop@(Just NodePopup /\ setPopupOpen) = R.createElement el p [
} }
} }
$ $
[H.div {className: "col-md-1"} []] -- [H.div {className: "col-md-1"} []]
<> -- <>
(map (buttonClick nodePopupState d) buttons) [H.div {className: "flex-center"} (map (buttonClick nodePopupState d) buttons)]
searchIsTexIframe id session search@(search' /\ _) = searchIsTexIframe id session search@(search' /\ _) =
if isIsTex search'.datafield then if isIsTex search'.datafield then
......
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