[css] use bootstrap 5.3.3 icons

parent 25b6b225
Pipeline #7113 failed with stages
in 11 minutes and 39 seconds
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
<head> <head>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>CNRS GarganText</title> <title>CNRS GarganText</title>
<link rel="stylesheet" href="icons/forkawesome.css"> <!-- <link rel="stylesheet" href="icons/forkawesome.css"> -->
<!-- <link href="styles/bootstrap.min.css" rel="stylesheet"> --> <!-- <link href="styles/bootstrap.min.css" rel="stylesheet"> -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
<link id="bootstrap-css" href="styles/bootstrap-5.3.3.min.css" rel="stylesheet" /> <link id="bootstrap-css" href="styles/bootstrap-5.3.3.min.css" rel="stylesheet" />
<link id="bootstrap-css" href="styles/bootstrap-default.css" rel="stylesheet" /> <link id="bootstrap-css" href="styles/bootstrap-default.css" rel="stylesheet" />
<link rel="stylesheet" type="text/css" href="styles/highlightjs-solarized-light.css" /> <link rel="stylesheet" type="text/css" href="styles/highlightjs-solarized-light.css" />
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -210,7 +210,7 @@ component = R.memo' $ R.hooksComponent componentName cpt ...@@ -210,7 +210,7 @@ component = R.memo' $ R.hooksComponent componentName cpt
{ className: componentName <> "__header__title" } { className: componentName <> "__header__title" }
[ H.text title' ] [ H.text title' ]
, iconButton , iconButton
{ name: "times" { name: "x"
, callback: onCloseButtonClick , callback: onCloseButtonClick
, elevation: Level2 , elevation: Level2
, className: componentName <> "__header__close" , className: componentName <> "__header__close"
......
...@@ -31,7 +31,7 @@ componentName :: String ...@@ -31,7 +31,7 @@ componentName :: String
componentName = "b-icon" componentName = "b-icon"
bootstrapName :: String bootstrapName :: String
bootstrapName = "fa" bootstrapName = "bi"
component :: R.Component Props component :: R.Component Props
component = R.hooksComponent componentName cpt component = R.hooksComponent componentName cpt
......
...@@ -48,7 +48,7 @@ componentName :: String ...@@ -48,7 +48,7 @@ componentName :: String
componentName = "b-icon-button" componentName = "b-icon-button"
bootstrapName :: String bootstrapName :: String
bootstrapName = "fa" bootstrapName = "bi"
component :: R.Component Props component :: R.Component Props
component = R.hooksComponent componentName cpt component = R.hooksComponent componentName cpt
......
...@@ -289,8 +289,8 @@ icon :: Category -> Boolean -> String ...@@ -289,8 +289,8 @@ icon :: Category -> Boolean -> String
icon cat b = btn b $ "fa fa-" <> (color $ size b $ icon' cat b) icon cat b = btn b $ "fa fa-" <> (color $ size b $ icon' cat b)
where where
icon' :: Category -> Boolean -> String icon' :: Category -> Boolean -> String
icon' Trash false = "times" icon' Trash false = "trash"
icon' Trash true = "times-circle" icon' Trash true = "trash"
icon' UnRead false = "question" icon' UnRead false = "question"
icon' UnRead true = "question-circle" icon' UnRead true = "question-circle"
......
...@@ -389,14 +389,13 @@ viewTypeSelectorCpt = here.component "viewTypeSelector" cpt ...@@ -389,14 +389,13 @@ viewTypeSelectorCpt = here.component "viewTypeSelector" cpt
, on: { click: \_ -> T.write viewType state } , on: { click: \_ -> T.write viewType state }
, type: "button" , type: "button"
} }
[ H.i { className: "fa " <> (icon viewType) } [] [ B.icon { name: icon viewType } ]
]
where where
active = if viewType == state' then " active" else "" active = if viewType == state' then " active" else ""
icon Preview = "fa-eye" icon Preview = "eye"
icon Both = "fa-columns" icon Both = "columns"
icon Code = "fa-pencil" icon Code = "pencil"
type Controls = type Controls =
( codeElRef :: R.Ref (Nullable Element) ( codeElRef :: R.Ref (Nullable Element)
......
...@@ -307,7 +307,7 @@ renameableTextCpt = here.component "renameableTextCpt" cpt ...@@ -307,7 +307,7 @@ renameableTextCpt = here.component "renameableTextCpt" cpt
{ className: "btn input-group-append" { className: "btn input-group-append"
, on: { click: submit state' } , on: { click: submit state' }
} }
[ H.span { className: "fa fa-floppy-o" } [] [ B.icon { name: "floppy" }
] ]
] ]
else else
...@@ -322,7 +322,7 @@ renameableTextCpt = here.component "renameableTextCpt" cpt ...@@ -322,7 +322,7 @@ renameableTextCpt = here.component "renameableTextCpt" cpt
{ className: "btn input-group-append" { className: "btn input-group-append"
, on: { click: \_ -> T.write_ true isEditing } , on: { click: \_ -> T.write_ true isEditing }
} }
[ H.span { className: "fa fa-pencil" } [] [ B.icon { name: "pencil" }
] ]
] ]
where where
...@@ -521,10 +521,10 @@ viewTypeSelectorCpt = here.component "viewTypeSelector" cpt ...@@ -521,10 +521,10 @@ viewTypeSelectorCpt = here.component "viewTypeSelector" cpt
, on: { click: \_ -> T.write viewType state } , on: { click: \_ -> T.write viewType state }
, type: "button" , type: "button"
} }
[ H.i { className: "fa " <> (icon viewType) } [] [ B.icon { name: icon viewType }
] ]
where where
active = if viewType == state' then " active" else "" active = if viewType == state' then " active" else ""
icon Folders = "fa-folder" icon Folders = "folder"
icon Code = "fa-code" icon Code = "code"
...@@ -79,7 +79,7 @@ layoutCpt = here.component "layout" cpt ...@@ -79,7 +79,7 @@ layoutCpt = here.component "layout" cpt
{ className: "node-layout__title__content text-primary" } { className: "node-layout__title__content text-primary" }
[ B.icon [ B.icon
{ className: "node-layout__title__icon" { className: "node-layout__title__icon"
, name: GT.getIcon node_type true , name: GT.getIcon node_type { open: true }
} }
, H.span , H.span
{ className: "node-layout__title__text mx-1" } { className: "node-layout__title__text mx-1" }
...@@ -121,11 +121,8 @@ layoutCpt = here.component "layout" cpt ...@@ -121,11 +121,8 @@ layoutCpt = here.component "layout" cpt
, size: SmallSize , size: SmallSize
, variant: ButtonVariant Secondary , variant: ButtonVariant Secondary
} }
[ B.icon [ B.icon { name: "code" }
{ name: "code" } , H.span { className: "ms-1" } [ H.text "Code section" ]
, B.wad_
[ "d-inline-block", "virtual-space", "w-1" ]
, H.text "Code section"
] ]
] ]
] ]
......
...@@ -202,9 +202,9 @@ docViewCpt = R2.hereComponent here "docView" hCpt ...@@ -202,9 +202,9 @@ docViewCpt = R2.hereComponent here "docView" hCpt
{ className: "btn btn-light text-primary border-primary" { className: "btn btn-light text-primary border-primary"
, on: { click: toggleModal } , on: { click: toggleModal }
} }
[ H.i { className: "fa fa-plus mr-1" } [] [ B.icon { name: "plus", className: "mr-1" }
, H.text "Add a document" , H.text "Add a document"
, H.i { className: "fa fa-newspaper-o ml-1" } [] , B.icon { name: "newspaper", className: "ml-1" }
] ]
] ]
, H.div { className: "form-group" } , H.div { className: "form-group" }
...@@ -343,14 +343,14 @@ searchBarCpt = here.component "searchBar" cpt ...@@ -343,14 +343,14 @@ searchBarCpt = here.component "searchBar" cpt
, on: { click: \_ -> T.write_ queryText' query } , on: { click: \_ -> T.write_ queryText' query }
, type: "submit" , type: "submit"
} }
[ H.span { className: "fa fa-search" } [] ] [ B.icon { name: "search" } ]
clearButton query = clearButton query =
H.button H.button
{ className: "input-group-text btn btn-light" { className: "input-group-text btn btn-light"
, on: { click: \_ -> T.write_ "" query } , on: { click: \_ -> T.write_ "" query }
} }
[ H.span { className: "text-danger fa fa-times" } [] ] [ B.icon { name: "x", className: "text-danger" } ]
mock :: Boolean mock :: Boolean
mock = false mock = false
...@@ -742,7 +742,7 @@ tableRowCpt = here.component "tableRow" cpt ...@@ -742,7 +742,7 @@ tableRowCpt = here.component "tableRow" cpt
, type: "Button" , type: "Button"
} }
[ H.text r.title [ H.text r.title
, H.i { className: "fa fa-external-link mx-1 small" } [] , B.icon { name: "box-arrow-up-right", className: "mx-1 small" }
] ]
] ]
, H.div { className: tClassName } [ H.text $ showSource r.source ] , H.div { className: tClassName } [ H.text $ showSource r.source ]
......
...@@ -203,7 +203,7 @@ folderCpt = here.component "folderCpt" cpt ...@@ -203,7 +203,7 @@ folderCpt = here.component "folderCpt" cpt
, H.div , H.div
{ className: "folder-view-item__settings" } { className: "folder-view-item__settings" }
[ B.iconButton [ B.iconButton
{ name: "flower-7" { name: "gear-fill"
, callback: \_ -> T.write_ true isBoxVisible , callback: \_ -> T.write_ true isBoxVisible
, title: , title:
"Each node of the Tree can perform some actions.\n" "Each node of the Tree can perform some actions.\n"
...@@ -240,8 +240,8 @@ folderCpt = here.component "folderCpt" cpt ...@@ -240,8 +240,8 @@ folderCpt = here.component "folderCpt" cpt
| otherwise = appPath $ getFolderPath nType sId lId | otherwise = appPath $ getFolderPath nType sId lId
icon :: FolderStyle -> GT.NodeType -> String icon :: FolderStyle -> GT.NodeType -> String
icon FolderUp _ = "folder-open" icon FolderUp _ = "folder2-open"
icon _ nt = GT.getIcon nt true icon _ nt = GT.getIcon nt { open: true }
getFolderPath :: GT.NodeType -> GT.SessionId -> Int -> AppRoute getFolderPath :: GT.NodeType -> GT.SessionId -> Int -> AppRoute
getFolderPath nodeType sid nodeId = fromMaybe Home $ nodeTypeAppRoute nodeType sid nodeId getFolderPath nodeType sid nodeId = fromMaybe Home $ nodeTypeAppRoute nodeType sid nodeId
...@@ -260,7 +260,7 @@ backButtonCpt = here.component "backButton" cpt ...@@ -260,7 +260,7 @@ backButtonCpt = here.component "backButton" cpt
{ className: "btn btn-primary" { className: "btn btn-primary"
, on: { click: \_ -> goToPreviousPage unit } , on: { click: \_ -> goToPreviousPage unit }
} }
[ H.i { className: "fa fa-arrow-left", title: "Previous view" } [] [ H.span { title: "Previous view" } [ B.icon { name: "arrow-left" } ]
] ]
backButtonSmart :: R2.Component (nodeId :: Int, session :: Session) backButtonSmart :: R2.Component (nodeId :: Int, session :: Session)
...@@ -295,7 +295,7 @@ backButtonSmartMainCpt = here.component "backButtonSmartMain" cpt ...@@ -295,7 +295,7 @@ backButtonSmartMainCpt = here.component "backButtonSmartMain" cpt
{ className: "btn btn-primary" { className: "btn btn-primary"
, on: { click: action rootId node.parent_id handlers } , on: { click: action rootId node.parent_id handlers }
} }
[ H.i { className: "fa fa-arrow-left", title: "Previous view" } [] [ H.span { title: "Previous view" } [ B.icon { name: "arrow-left" } ]
] ]
where where
action rootId pId handlers action rootId pId handlers
......
...@@ -50,7 +50,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt ...@@ -50,7 +50,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt
[ "d-flex", "align-items-center" ] [ "d-flex", "align-items-center" ]
[ H.div [ H.div
{ className: "w-3/12" } { className: "w-3/12" }
[ H.span { className: GT.fldr nodeType true } [] -- TODO fix names [ H.span { className: GT.fldr nodeType { open: true } } [] -- TODO fix names
, B.span' { className: "ml-1 h5" } $ GT.prettyNodeType nodeType , B.span' { className: "ml-1 h5" } $ GT.prettyNodeType nodeType
] ]
, B.wad , B.wad
...@@ -65,7 +65,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt ...@@ -65,7 +65,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt
{ callback: closeBox props { callback: closeBox props
, title: "Close" , title: "Close"
, elevation: Level1 , elevation: Level1
, name: "times" , name: "x"
} }
] ]
] ]
......
...@@ -270,7 +270,7 @@ breadcrumbItemCpt = here.component "breadcrumbItemCpt" cpt ...@@ -270,7 +270,7 @@ breadcrumbItemCpt = here.component "breadcrumbItemCpt" cpt
[ H.span { className: "" } [ H.span { className: "" }
[ B.icon [ B.icon
{ className: "" { className: ""
, name: GT.getIcon nodeType true , name: GT.getIcon nodeType { open: true }
} }
] ]
, if nodeType == GT.NodeUser then , if nodeType == GT.NodeUser then
...@@ -297,7 +297,7 @@ breadcrumbItemCpt = here.component "breadcrumbItemCpt" cpt ...@@ -297,7 +297,7 @@ breadcrumbItemCpt = here.component "breadcrumbItemCpt" cpt
-- B.icon { name: "folder-open-o" } -- B.icon { name: "folder-open-o" }
B.icon B.icon
{ className: "" { className: ""
, name: GT.getIcon nodeType true , name: GT.getIcon nodeType { open: true }
} }
] ]
, H.text text , H.text text
......
...@@ -363,7 +363,7 @@ nodeSpanCpt = here.component "nodeSpan" cpt ...@@ -363,7 +363,7 @@ nodeSpanCpt = here.component "nodeSpan" cpt
, elevation: Level1 , elevation: Level1
} }
, B.iconButton , B.iconButton
{ name: "flower-7" { name: "gear-fill"
, className: "mainleaf__settings-icon" , className: "mainleaf__settings-icon"
, callback: \_ -> T.write_ true isBoxVisible , callback: \_ -> T.write_ true isBoxVisible
, title: , title:
...@@ -447,7 +447,7 @@ nodeIconCpt = here.component "nodeIcon" cpt ...@@ -447,7 +447,7 @@ nodeIconCpt = here.component "nodeIcon" cpt
{ className: "mainleaf__node-icon" } { className: "mainleaf__node-icon" }
$ $
[ B.iconButton [ B.iconButton
{ name: GT.getIcon nodeType true { name: GT.getIcon nodeType { open: true }
, callback , callback
, status: isLeaf ? Idled $ Enabled , status: isLeaf ? Idled $ Enabled
, variant: isSelected ? Primary $ Secondary , variant: isSelected ? Primary $ Secondary
...@@ -503,7 +503,7 @@ folderIconCpt = here.component "folderIcon" cpt ...@@ -503,7 +503,7 @@ folderIconCpt = here.component "folderIcon" cpt
pure $ pure $
B.iconButton B.iconButton
{ className: "mainleaf__folder-icon" { className: "mainleaf__folder-icon"
, name: isOpened ? "angle-down" $ handedPartClassName handed' , name: isOpened ? "chevron-down" $ handedPartClassName handed'
, overlay: false , overlay: false
, callback , callback
} }
...@@ -585,7 +585,7 @@ nodeTooltipCpt = here.component "nodeTooltip" cpt ...@@ -585,7 +585,7 @@ nodeTooltipCpt = here.component "nodeTooltip" cpt
[ H.b [ H.b
{} {}
[ B.icon [ B.icon
{ name: GT.getIcon nodeType true } { name: GT.getIcon nodeType { open: true } }
, B.span_ $ , B.span_ $
GT.prettyNodeType nodeType GT.prettyNodeType nodeType
] ]
......
...@@ -162,7 +162,7 @@ print withIconFlag nt = ...@@ -162,7 +162,7 @@ print withIconFlag nt =
in in
if withIconFlag then if withIconFlag then
charCodeIcon nt true charCodeIcon nt { open: true }
--- as we are printing within an HTML text node, --- as we are printing within an HTML text node,
-- margins will directly rely on content text spacing -- margins will directly rely on content text spacing
<> nbsp 4 <> nbsp 4
......
...@@ -27,7 +27,7 @@ actionDocCpt = here.component "actionDoc" cpt ...@@ -27,7 +27,7 @@ actionDocCpt = here.component "actionDoc" cpt
Tools.panelNoFooter { mError: Nothing } Tools.panelNoFooter { mError: Nothing }
( [ H.div { style: { margin: "10px" } } ( [ H.div { style: { margin: "10px" } }
[ H.h3 {} [ H.text "Documentation about " ] [ H.h3 {} [ H.text "Documentation about " ]
, H.h3 { className: GT.fldr nodeType true } , H.h3 { className: GT.fldr nodeType { open: true } }
[ H.span { className: "font-family-theme mx-1" } [ H.span { className: "font-family-theme mx-1" }
[ H.text $ show nodeType ] [ H.text $ show nodeType ]
] ]
......
...@@ -4,6 +4,7 @@ import Data.Array (filter, null, (:)) ...@@ -4,6 +4,7 @@ import Data.Array (filter, null, (:))
import Data.Either (Either(..)) import Data.Either (Either(..))
import Data.Maybe (Maybe(..)) import Data.Maybe (Maybe(..))
import Effect.Aff (runAff_) import Effect.Aff (runAff_)
import Gargantext.Components.Bootstrap as B
import Gargantext.Components.Forest.Tree.Node.Tools as Tools import Gargantext.Components.Forest.Tree.Node.Tools as Tools
import Gargantext.Components.GraphQL.Endpoints (deleteTeamMembership, getTeam) import Gargantext.Components.GraphQL.Endpoints (deleteTeamMembership, getTeam)
import Gargantext.Components.GraphQL.Team (Team, TeamMember) import Gargantext.Components.GraphQL.Team (Team, TeamMember)
...@@ -96,12 +97,12 @@ teamLayoutRowsCpt = here.component "teamLayoutRows" cpt ...@@ -96,12 +97,12 @@ teamLayoutRowsCpt = here.component "teamLayoutRows" cpt
H.div { className: "from-group row" } H.div { className: "from-group row" }
[ H.div { className: "col-8" } [ H.text username ] [ H.div { className: "col-8" } [ H.text username ]
, H.a , H.a
{ className: "text-danger col-2 fa fa-times" { className: "text-danger col-2"
, title: "Remove user from team" , title: "Remove user from team"
, type: "button" , type: "button"
, on: { click: submit shared_folder_id } , on: { click: submit shared_folder_id }
} }
[] [ B.icon { name: "x" } ]
] ]
makeLeader username = makeLeader username =
......
...@@ -13,6 +13,7 @@ import Effect (Effect) ...@@ -13,6 +13,7 @@ import Effect (Effect)
import Effect.Aff (launchAff_) import Effect.Aff (launchAff_)
import Effect.Class (liftEffect) import Effect.Class (liftEffect)
import Gargantext.AsyncTasks as GAT import Gargantext.AsyncTasks as GAT
import Gargantext.Components.Bootstrap as B
import Gargantext.Components.Forest.Tree.Node.Action.Search.Frame (searchIframes) import Gargantext.Components.Forest.Tree.Node.Action.Search.Frame (searchIframes)
import Gargantext.Components.Forest.Tree.Node.Action.Search.Types (DataField(..), Database(..), IMT_org(..), Org(..), SearchQuery(..), allOrgs, dataFields, defaultSearchQuery, doc, performSearch, datafield2database, Search, dbFromInputValue, dbToInputValue) import Gargantext.Components.Forest.Tree.Node.Action.Search.Types (DataField(..), Database(..), IMT_org(..), Org(..), SearchQuery(..), allOrgs, dataFields, defaultSearchQuery, doc, performSearch, datafield2database, Search, dbFromInputValue, dbToInputValue)
import Gargantext.Components.GraphQL.Endpoints (getIMTSchools, getUser) import Gargantext.Components.GraphQL.Endpoints (getIMTSchools, getUser)
...@@ -128,11 +129,10 @@ componentYearsCpt = here.component "componentYears" cpt ...@@ -128,11 +129,10 @@ componentYearsCpt = here.component "componentYears" cpt
yearCpt (Tuple idx year) = yearCpt (Tuple idx year) =
H.div {} H.div {}
[ H.span {} [ H.text year ] [ H.span {} [ H.text year ]
, H.span , B.iconButton
{ className: "btn btn-danger fa fa-times" { name: "times"
, on: { click: clickRemove idx search } , callback: const $ clickRemove idx search
} }
[]
] ]
type ComponentIMTProps = type ComponentIMTProps =
......
...@@ -80,7 +80,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt ...@@ -80,7 +80,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt
[ B.wad [ B.wad
[ "w-2/12" ] [ "w-2/12" ]
[ H.span [ H.span
{ className: GT.fldr nodeType true } { className: GT.fldr nodeType { open: true } }
[] -- TODO fix names [] -- TODO fix names
-- , -- ,
-- B.span' { className: "small" } $ prettyNodeType nodeType -- B.span' { className: "small" } $ prettyNodeType nodeType
...@@ -109,7 +109,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt ...@@ -109,7 +109,7 @@ nodePopupViewCpt = here.component "nodePopupView" cpt
, B.iconButton , B.iconButton
{ callback: const $ p.closeCallback unit { callback: const $ p.closeCallback unit
, title: "Close" , title: "Close"
, name: "times" , name: "x"
, elevation: Level2 , elevation: Level2
} }
] ]
...@@ -185,20 +185,17 @@ nodePopupViewCpt = here.component "nodePopupView" cpt ...@@ -185,20 +185,17 @@ nodePopupViewCpt = here.component "nodePopupView" cpt
{ className: "panel-actions" } { className: "panel-actions" }
[ H.div [ H.div
{ className: "panel-actions__ok-to-use" } { className: "panel-actions__ok-to-use" }
[ B.icon [ B.icon { name: "circle-fill" }
{ name: "circle" }
, B.span_ "usable" , B.span_ "usable"
] ]
, H.div , H.div
{ className: "panel-actions__almost-useable" } { className: "panel-actions__almost-useable" }
[ B.icon [ B.icon { name: "circle-fill" }
{ name: "circle" }
, B.span_ "almost useable" , B.span_ "almost useable"
] ]
, H.div , H.div
{ className: "panel-actions__development-in-progress" } { className: "panel-actions__development-in-progress" }
[ B.icon [ B.icon { name: "circle-fill" }
{ name: "circle" }
, B.span_ "development in progress" , B.span_ "development in progress"
] ]
] ]
...@@ -273,7 +270,7 @@ buttonClickCpt = here.component "buttonClick" cpt ...@@ -273,7 +270,7 @@ buttonClickCpt = here.component "buttonClick" cpt
} }
, B.icon , B.icon
{ className: "popup-container__cta__icon" { className: "popup-container__cta__icon"
, name: "circle" , name: "circle-fill"
} }
] ]
......
...@@ -83,25 +83,25 @@ instance Show NodeAction where ...@@ -83,25 +83,25 @@ instance Show NodeAction where
glyphiconNodeAction :: NodeAction -> String glyphiconNodeAction :: NodeAction -> String
glyphiconNodeAction (Add _) = "plus" glyphiconNodeAction (Add _) = "plus"
glyphiconNodeAction AddingContact = "user-plus" glyphiconNodeAction AddingContact = "person-plus"
glyphiconNodeAction CloseNodePopover = "close" glyphiconNodeAction CloseNodePopover = "x"
glyphiconNodeAction Config = "wrench" glyphiconNodeAction Config = "wrench"
glyphiconNodeAction Delete = "trash" glyphiconNodeAction Delete = "trash"
glyphiconNodeAction (Documentation _) = "question-circle" glyphiconNodeAction (Documentation _) = "question-circle"
glyphiconNodeAction Download = "download" glyphiconNodeAction Download = "download"
glyphiconNodeAction (Link _) = "arrows-h" glyphiconNodeAction (Link _) = "arrow-left-right"
glyphiconNodeAction ManageTeam = "users" glyphiconNodeAction ManageTeam = "people"
glyphiconNodeAction (Merge _) = "random" glyphiconNodeAction (Merge _) = "sign-merge-left"
glyphiconNodeAction (Move _) = "share-square-o" glyphiconNodeAction (Move _) = "arrow-90deg-right"
glyphiconNodeAction (Publish _) = fldr FolderPublic true glyphiconNodeAction (Publish _) = fldr FolderPublic { open: true }
glyphiconNodeAction Reconstruct = "cogs" glyphiconNodeAction Reconstruct = "gear-wide-connected"
glyphiconNodeAction Refresh = "refresh" glyphiconNodeAction Refresh = "arrow-clockwise"
glyphiconNodeAction ReloadWithSettings = "reload-with-settings" glyphiconNodeAction ReloadWithSettings = "arrow-clockwise"
glyphiconNodeAction SearchBox = "search" glyphiconNodeAction SearchBox = "search"
glyphiconNodeAction ShareURL = "share-alt" glyphiconNodeAction ShareURL = "share"
glyphiconNodeAction Share = "user-plus" glyphiconNodeAction Share = "person-plus"
glyphiconNodeAction Upload = "upload" glyphiconNodeAction Upload = "upload"
glyphiconNodeAction WriteNodesDocuments = "bars" glyphiconNodeAction WriteNodesDocuments = "list"
glyphiconNodeAction _ = "" glyphiconNodeAction _ = ""
------------------------------------------------------------------------ ------------------------------------------------------------------------
......
...@@ -179,7 +179,7 @@ textInputBoxCpt = here.component "textInputBox" cpt ...@@ -179,7 +179,7 @@ textInputBoxCpt = here.component "textInputBox" cpt
{ callback: const $ T.write_ false isOpen { callback: const $ T.write_ false isOpen
, variant: Danger , variant: Danger
, title: "Cancel" , title: "Cancel"
, name: "times" , name: "x"
} }
submit ref _ = do submit ref _ = do
......
...@@ -158,7 +158,7 @@ subTreeTreeViewCpt = here.ntComponent "subTreeTreeView" cpt ...@@ -158,7 +158,7 @@ subTreeTreeViewCpt = here.ntComponent "subTreeTreeView" cpt
{ className: "subtree__node__icons" { className: "subtree__node__icons"
, on: { click: expandCbk } , on: { click: expandCbk }
} }
[ H.span { className: GT.fldr nodeType true } [] [ H.span { className: GT.fldr nodeType { open: true } } []
, R2.when hasChild $ , R2.when hasChild $
if isExpanded then if isExpanded then
......
...@@ -94,7 +94,7 @@ docFocusCpt = R2.hereComponent here "main" hCpt ...@@ -94,7 +94,7 @@ docFocusCpt = R2.hereComponent here "main" hCpt
H.div H.div
{ className: "graph-doc-focus__header" } { className: "graph-doc-focus__header" }
[ B.iconButton [ B.iconButton
{ name: "times" { name: "x"
, elevation: Level2 , elevation: Level2
, callback: closeCallback , callback: closeCallback
} }
......
...@@ -96,7 +96,7 @@ sidebarCpt = here.component "sidebar" cpt ...@@ -96,7 +96,7 @@ sidebarCpt = here.component "sidebar" cpt
[ [
-- Close CTA -- Close CTA
B.iconButton B.iconButton
{ name: "times" { name: "x"
, elevation: Level2 , elevation: Level2
, callback: closeCallback , callback: closeCallback
, className: "graph-sidebar__close" , className: "graph-sidebar__close"
......
...@@ -253,7 +253,7 @@ controlsCpt = R.memo' $ here.component "controls" cpt ...@@ -253,7 +253,7 @@ controlsCpt = R.memo' $ here.component "controls" cpt
, aria: { expanded: false, controls: "graph-toolbar__advanced" } , aria: { expanded: false, controls: "graph-toolbar__advanced" }
} }
[ H.text "Advanced" [ H.text "Advanced"
, B.icon { name: "angle-down", className: "mx-1" } , B.icon { name: "chevron-down", className: "mx-1" }
] ]
] ]
, H.div , H.div
......
...@@ -41,7 +41,7 @@ component = here.component "topBar" cpt ...@@ -41,7 +41,7 @@ component = here.component "topBar" cpt
{ className: "node-topbar graph-topbar bg-primary h-100" } { className: "node-topbar graph-topbar bg-primary h-100" }
[ H.div [ H.div
{ className: "node-topbar__title graph-topbar__title align-self-center px-1 text-light" } { className: "node-topbar__title graph-topbar__title align-self-center px-1 text-light" }
[ B.icon { name: "hubzilla" } [ B.icon { name: "diagram-3" }
, H.text $ nbsp 1 , H.text $ nbsp 1
, H.text "Graph" , H.text "Graph"
] ]
......
...@@ -105,7 +105,7 @@ listTreeCpt = here.component "listTree" cpt ...@@ -105,7 +105,7 @@ listTreeCpt = here.component "listTree" cpt
cpt { name, nodeType, root, selection, session } _ = do cpt { name, nodeType, root, selection, session } _ = do
pure $ H.div { className: "tree" } pure $ H.div { className: "tree" }
[ H.div { className: "root" } [ H.div { className: "root" }
[ H.i { className: fldr nodeType true } [] [ H.i { className: fldr nodeType { open: true } } []
, H.text $ "[" <> show root <> "] " <> name , H.text $ "[" <> show root <> "] " <> name
] ]
, listTreeChildren , listTreeChildren
...@@ -202,7 +202,7 @@ renderListElementCpt = here.component "renderListElement" cpt ...@@ -202,7 +202,7 @@ renderListElementCpt = here.component "renderListElement" cpt
, on: { click: click ids } , on: { click: click ids }
, type: "checkbox" , type: "checkbox"
} }
, H.i { className: fldr NodeList true } [] , H.i { className: fldr NodeList { open: true } } []
, H.text $ "[" <> show id <> "] " <> name , H.text $ "[" <> show id <> "] " <> name
] ]
where where
......
...@@ -87,7 +87,7 @@ searchButtonCpt = here.component "searchButton" cpt ...@@ -87,7 +87,7 @@ searchButtonCpt = here.component "searchButton" cpt
, className: "input-group-text" , className: "input-group-text"
} }
[ B.icon [ B.icon
{ name: "times" { name: "x"
, className: "text-danger" , className: "text-danger"
} }
] ]
......
...@@ -10,6 +10,7 @@ import Effect (Effect) ...@@ -10,6 +10,7 @@ import Effect (Effect)
import Effect.Aff (launchAff_) import Effect.Aff (launchAff_)
import Effect.Class (liftEffect) import Effect.Class (liftEffect)
import Gargantext.Components.App.Store as AppStore import Gargantext.Components.App.Store as AppStore
import Gargantext.Components.Bootstrap as B
import Gargantext.Components.GraphQL (getClient) import Gargantext.Components.GraphQL (getClient)
import Gargantext.Components.GraphQL.Endpoints (getUserInfo, getUser, updateUserPubmedAPIKey, updateUserEPOAPIUser, updateUserEPOAPIToken) import Gargantext.Components.GraphQL.Endpoints (getUserInfo, getUser, updateUserPubmedAPIKey, updateUserEPOAPIUser, updateUserEPOAPIToken)
import Gargantext.Components.GraphQL.User (UserInfo, _ui_cwCity, _ui_cwCountry, _ui_cwFirstName, _ui_cwLabTeamDeptsFirst, _ui_cwLastName, _ui_cwOffice, _ui_cwOrganizationFirst, _ui_cwRole, _ui_cwTouchMail, _ui_cwTouchPhone, _ui_cwDescription) import Gargantext.Components.GraphQL.User (UserInfo, _ui_cwCity, _ui_cwCountry, _ui_cwFirstName, _ui_cwLabTeamDeptsFirst, _ui_cwLastName, _ui_cwOffice, _ui_cwOrganizationFirst, _ui_cwRole, _ui_cwTouchMail, _ui_cwTouchPhone, _ui_cwDescription)
...@@ -440,7 +441,7 @@ itemNotEditingCpt = here.component "itemEditing" cpt ...@@ -440,7 +441,7 @@ itemNotEditingCpt = here.component "itemEditing" cpt
, disabled: true , disabled: true
} }
, H.div { className: "btn input-group-append", on: { click } } , H.div { className: "btn input-group-append", on: { click } }
[ H.div { className: "input-group-text fa fa-pencil" } [] ] [ B.icon { name: "pencil", className: "input-group-text" } ]
] ]
where where
click _ = T.write_ true isEditing click _ = T.write_ true isEditing
......
...@@ -145,7 +145,7 @@ sidePanelCpt = here.component "sidePanel" cpt ...@@ -145,7 +145,7 @@ sidePanelCpt = here.component "sidePanel" cpt
[ [
-- Close CTA -- Close CTA
B.iconButton B.iconButton
{ name: "times" { name: "x"
, callback: closeSidePanel , callback: closeSidePanel
, className: "graph-sidebar__close" , className: "graph-sidebar__close"
} }
......
...@@ -483,7 +483,7 @@ textsSidePanelCpt = here.component "textsSidePanel" cpt ...@@ -483,7 +483,7 @@ textsSidePanelCpt = here.component "textsSidePanel" cpt
[ H.div [ H.div
{ className: "texts-sidepanel__header" } { className: "texts-sidepanel__header" }
[ B.iconButton [ B.iconButton
{ name: "times" { name: "x"
, elevation: Level2 , elevation: Level2
, callback: closeSidePanel , callback: closeSidePanel
} }
......
...@@ -94,7 +94,7 @@ docFocusCpt = R2.hereComponent here "main" hCpt ...@@ -94,7 +94,7 @@ docFocusCpt = R2.hereComponent here "main" hCpt
H.div H.div
{ className: "phylo-doc-focus__header" } { className: "phylo-doc-focus__header" }
[ B.iconButton [ B.iconButton
{ name: "times" { name: "x"
, elevation: Level2 , elevation: Level2
, callback: closeCallback , callback: closeCallback
} }
......
...@@ -60,7 +60,7 @@ component = R.hooksComponent componentName cpt ...@@ -60,7 +60,7 @@ component = R.hooksComponent componentName cpt
[ [
-- Close CTA -- Close CTA
B.iconButton B.iconButton
{ name: "times" { name: "x"
, elevation: Level2 , elevation: Level2
, callback: closeCallback , callback: closeCallback
, className: "phylo-sidebar__close" , className: "phylo-sidebar__close"
......
...@@ -210,7 +210,7 @@ editingCpt = here.component "editing" cpt ...@@ -210,7 +210,7 @@ editingCpt = here.component "editing" cpt
-- } -- }
-- [ -- [
-- B.icon -- B.icon
-- { name: "times" -- { name: "x"
-- , className: "text-danger" -- , className: "text-danger"
-- } -- }
-- ] -- ]
......
...@@ -357,8 +357,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -357,8 +357,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
} }
[ H.div [ H.div
{ className: "form-group__label" } { className: "form-group__label" }
[ B.icon [ B.icon { name: "book" }
{ name: "book" }
] ]
, H.div , H.div
{ className: intercalate " " { className: intercalate " "
...@@ -383,7 +382,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -383,7 +382,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
Enabled Enabled
} }
[ B.icon [ B.icon
{ name: "floppy-o" { name: "floppy"
, className: "text-darker" , className: "text-darker"
} }
] ]
...@@ -400,8 +399,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -400,8 +399,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
} }
[ H.div [ H.div
{ className: "form-group__label" } { className: "form-group__label" }
[ B.icon [ B.icon { name: "border-width" }
{ name: "header" }
] ]
, H.div , H.div
{ className: intercalate " " { className: intercalate " "
...@@ -426,7 +424,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -426,7 +424,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
Enabled Enabled
} }
[ B.icon [ B.icon
{ name: "floppy-o" { name: "floppy"
, className: "text-darker" , className: "text-darker"
} }
] ]
...@@ -443,8 +441,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -443,8 +441,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
} }
[ H.div [ H.div
{ className: "form-group__label" } { className: "form-group__label" }
[ B.icon [ B.icon { name: "info" }
{ name: "info" }
] ]
, H.div , H.div
{ className: intercalate " " { className: intercalate " "
...@@ -469,7 +466,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -469,7 +466,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
Enabled Enabled
} }
[ B.icon [ B.icon
{ name: "floppy-o" { name: "floppy"
, className: "text-darker" , className: "text-darker"
} }
] ]
...@@ -489,8 +486,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -489,8 +486,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
} }
[ H.div [ H.div
{ className: "form-group__label" } { className: "form-group__label" }
[ B.icon [ B.icon { name: "zoom-in" }
{ name: "search-plus" }
] ]
, H.div , H.div
{ className: intercalate " " { className: intercalate " "
...@@ -515,7 +511,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -515,7 +511,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
Enabled Enabled
} }
[ B.icon [ B.icon
{ name: "floppy-o" { name: "floppy"
, className: "text-darker" , className: "text-darker"
} }
] ]
...@@ -532,9 +528,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -532,9 +528,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
} }
[ H.div [ H.div
{ className: "form-group__label" } { className: "form-group__label" }
[ B.icon [ B.icon { name: "person" } ]
{ name: "user" }
]
, H.div , H.div
{ className: intercalate " " { className: intercalate " "
[ "form-group__field" [ "form-group__field"
...@@ -558,7 +552,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -558,7 +552,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
Enabled Enabled
} }
[ B.icon [ B.icon
{ name: "floppy-o" { name: "floppy"
, className: "text-darker" , className: "text-darker"
} }
] ]
...@@ -575,8 +569,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt ...@@ -575,8 +569,7 @@ tableHeaderEditionBlockCpt = here.component "tableHeaderEditionBlock" cpt
} }
[ H.div [ H.div
{ className: "form-group__label" } { className: "form-group__label" }
[ B.icon [ B.icon { name: "calendar" }
{ name: "calendar" }
] ]
, H.div , H.div
{ className: intercalate " " { className: intercalate " "
...@@ -658,7 +651,7 @@ tableHeaderLayoutCpt = here.component "tableHeaderLayout" cpt ...@@ -658,7 +651,7 @@ tableHeaderLayoutCpt = here.component "tableHeaderLayout" cpt
, H.text $ " " <> desc , H.text $ " " <> desc
] ]
, H.p {} , H.p {}
[ H.span { className: "fa fa-search-plus" } [] [ H.span { className: "bi bi-zoom-in" } []
, H.text $ " " <> query , H.text $ " " <> query
] ]
, H.p , H.p
...@@ -671,7 +664,7 @@ tableHeaderLayoutCpt = here.component "tableHeaderLayout" cpt ...@@ -671,7 +664,7 @@ tableHeaderLayoutCpt = here.component "tableHeaderLayout" cpt
] ]
, H.div { className: "col-md-4 content" } , H.div { className: "col-md-4 content" }
[ H.p {} [ H.p {}
[ H.span { className: "fa fa-user" } [] [ B.icon { name: "person" }
, H.text $ " " <> user , H.text $ " " <> user
] ]
, H.p {} , H.p {}
......
...@@ -8,6 +8,7 @@ import Gargantext.Prelude ...@@ -8,6 +8,7 @@ import Gargantext.Prelude
import Data.Maybe (Maybe(..)) import Data.Maybe (Maybe(..))
import Effect (Effect) import Effect (Effect)
import Gargantext.Components.App.Store (Boxes) import Gargantext.Components.App.Store (Boxes)
import Gargantext.Components.Bootstrap as B
import Gargantext.Routes (Tile) import Gargantext.Routes (Tile)
import Gargantext.Utils.Reactix as R2 import Gargantext.Utils.Reactix as R2
import Reactix as R import Reactix as R
...@@ -37,11 +38,10 @@ tileBlockCpt = here.component "tileBlock" cpt ...@@ -37,11 +38,10 @@ tileBlockCpt = here.component "tileBlock" cpt
[ H.div [ H.div
{ className: "tile-block" } { className: "tile-block" }
[ H.div { className: "tile-block__header" } [ H.div { className: "tile-block__header" }
[ H.i [ B.iconButton
{ className: "btn fa fa-times" { name: "x"
, on: { click: closeCallback } , callback: closeCallback
} }
[]
] ]
, H.div { className: "tile-block__body" } , H.div { className: "tile-block__body" }
children children
......
...@@ -10,6 +10,7 @@ import Data.Nullable (null) ...@@ -10,6 +10,7 @@ import Data.Nullable (null)
import Data.UUID as UUID import Data.UUID as UUID
import Effect (Effect) import Effect (Effect)
import Gargantext.Components.App.Store (Boxes) import Gargantext.Components.App.Store (Boxes)
import Gargantext.Components.Bootstrap as B
import Gargantext.Hooks.LinkHandler (useLinkHandler) import Gargantext.Hooks.LinkHandler (useLinkHandler)
import Gargantext.Routes (AppRoute, Tile) import Gargantext.Routes (AppRoute, Tile)
import Gargantext.Utils.Popover as Popover import Gargantext.Utils.Popover as Popover
...@@ -67,7 +68,7 @@ tileMenuCpt = here.component "tileMenu" cpt ...@@ -67,7 +68,7 @@ tileMenuCpt = here.component "tileMenu" cpt
} }
[ R.fragment children [ R.fragment children
, H.div { className: "tile-menu__popover" } , H.div { className: "tile-menu__popover" }
[ H.ul {} [ H.ul { style: { "padding-left": "0px" } }
[ [
-- Current Tile -- Current Tile
case props.currentTile of case props.currentTile of
...@@ -82,8 +83,8 @@ tileMenuCpt = here.component "tileMenu" cpt ...@@ -82,8 +83,8 @@ tileMenuCpt = here.component "tileMenu" cpt
Popover.setOpen popoverRef false Popover.setOpen popoverRef false
} }
} }
[ H.i { className: "fa fa-share" } [] [ B.icon { name: "share" }
, H.text "open on current tile" , H.span { className: "ms-1" } [ H.text "open on current tile" ]
] ]
] ]
, ,
...@@ -100,8 +101,8 @@ tileMenuCpt = here.component "tileMenu" cpt ...@@ -100,8 +101,8 @@ tileMenuCpt = here.component "tileMenu" cpt
Popover.setOpen popoverRef false Popover.setOpen popoverRef false
} }
} }
[ H.i { className: "fa fa-caret-square-o-right" } [] [ B.icon { name: "caret-right-square" }
, H.text "open from a new tile" , H.span { className: "ms-1" } [ H.text "open from a new tile" ]
] ]
] ]
, ,
...@@ -118,8 +119,8 @@ tileMenuCpt = here.component "tileMenu" cpt ...@@ -118,8 +119,8 @@ tileMenuCpt = here.component "tileMenu" cpt
Popover.setOpen popoverRef false Popover.setOpen popoverRef false
} }
} }
[ H.i { className: "fa fa-caret-square-o-down" } [] [ B.icon { name: "caret-down-square" }
, H.text "open from a new tile" , H.span { className: "ms-1" } [ H.text "open from a new tile" ]
] ]
] ]
] ]
......
...@@ -71,9 +71,8 @@ componentCpt = here.component "main" cpt ...@@ -71,9 +71,8 @@ componentCpt = here.component "main" cpt
} }
[ H.a [ H.a
{ className: "nav-link navbar-text" } { className: "nav-link navbar-text" }
[ H.span [ B.icon
{ className: "fa fa-question-circle-o" } { name: "question-circle" }
[]
] ]
] ]
, H.li { className: "nav-item" } , H.li { className: "nav-item" }
...@@ -89,7 +88,7 @@ componentCpt = here.component "main" cpt ...@@ -89,7 +88,7 @@ componentCpt = here.component "main" cpt
else "Show Tree" else "Show Tree"
} }
[ B.icon [ B.icon
{ name: "sidebar" { name: "layout-sidebar"
, className: "" , className: ""
} }
-- , -- ,
...@@ -171,7 +170,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt ...@@ -171,7 +170,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt
menuElement = LiNav menuElement = LiNav
{ title: "GarganText" { title: "GarganText"
, href: "#" , href: "#"
, icon: "fa fa-navicon" , icon: "list"
, text: "GarganText" , text: "GarganText"
} }
...@@ -179,25 +178,25 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt ...@@ -179,25 +178,25 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt
[ [ LiNav [ [ LiNav
{ title: "User documentation" { title: "User documentation"
, href: "https://write.frame.gargantext.org/s/649a6d7e1db3b365d6d0b1430d9700cc0bb4fdb1348dd1040a94c95f98979abe" , href: "https://write.frame.gargantext.org/s/649a6d7e1db3b365d6d0b1430d9700cc0bb4fdb1348dd1040a94c95f98979abe"
, icon: "fa fa-lightbulb-o" , icon: "lightbulb"
, text: "User documentation" , text: "User documentation"
} }
, LiNav , LiNav
{ title: "GargTools" { title: "GargTools"
, href: "https://gargtools.iscpif.fr" , href: "https://gargtools.iscpif.fr"
, icon: "fa fa-gears" , icon: "gear"
, text: "Format your data with GargTools!" , text: "Format your data with GargTools!"
} }
, LiNav , LiNav
{ title: "Chat" { title: "Chat"
, href: "https://matrix.to/#/#GarganText:matrix.org" , href: "https://matrix.to/#/#GarganText:matrix.org"
, icon: "fa fa-weixin" , icon: "chat"
, text: "Chat" , text: "Chat"
} }
, LiNav , LiNav
{ title: "Forums" { title: "Forums"
, href: "https://discourse.iscpif.fr/c/gargantext" , href: "https://discourse.iscpif.fr/c/gargantext"
, icon: "fa fa-bullhorn" , icon: "megaphone"
, text: "Forum" , text: "Forum"
} }
-- , LiNav { title : "Report bug here" -- , LiNav { title : "Report bug here"
...@@ -210,7 +209,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt ...@@ -210,7 +209,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt
[ LiNav [ LiNav
{ title: "Learn with us!" { title: "Learn with us!"
, href: "https://iscpif.fr/gargantext/formation/" , href: "https://iscpif.fr/gargantext/formation/"
, icon: "fa fa-graduation-cap" , icon: "mortarboard"
, text: "Register for a training session" , text: "Register for a training session"
} }
] ]
...@@ -218,7 +217,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt ...@@ -218,7 +217,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt
[ LiNav [ LiNav
{ title: "Changelog" { title: "Changelog"
, href: "https://gitlab.iscpif.fr/gargantext/main/blob/master/CHANGELOG.md" , href: "https://gitlab.iscpif.fr/gargantext/main/blob/master/CHANGELOG.md"
, icon: "fa fa-clock-o" , icon: "clock"
, text: "Versions change" , text: "Versions change"
} }
{-, LiNav { title : "Code documentation" {-, LiNav { title : "Code documentation"
...@@ -229,13 +228,13 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt ...@@ -229,13 +228,13 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt
, LiNav , LiNav
{ title: "API documentation" { title: "API documentation"
, href: "https://cnrs.gargantext.org/swagger-ui" , href: "https://cnrs.gargantext.org/swagger-ui"
, icon: "fa fa-code-fork" , icon: "git"
, text: "API documentation" , text: "API documentation"
} }
, LiNav , LiNav
{ title: "Source code" { title: "Source code"
, href: "https://gitlab.iscpif.fr/gargantext/main" , href: "https://gitlab.iscpif.fr/gargantext/main"
, icon: "fa fa-code" , icon: "code"
, text: "Source Code" , text: "Source Code"
} }
] ]
...@@ -244,7 +243,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt ...@@ -244,7 +243,7 @@ divDropdownLeftCpt = here.component "divDropdownLeft" cpt
[ LiNav [ LiNav
{ title: "Learn more about us" { title: "Learn more about us"
, href: "https://gargantext.org" , href: "https://gargantext.org"
, icon: "fa fa-question" , icon: "question"
, text: "About" , text: "About"
} }
] ]
...@@ -269,7 +268,7 @@ menuButtonCpt = here.component "menuButton" cpt ...@@ -269,7 +268,7 @@ menuButtonCpt = here.component "menuButton" cpt
, on: { click: \_ -> T.modify_ not show } , on: { click: \_ -> T.modify_ not show }
, role: "button" , role: "button"
} }
[ H.span { aria: { hidden: true }, className: icon <> " px-1" } [] [ H.span { aria: { hidden: true } } [ B.icon { name: icon, className: "px-1" } ]
, H.text text , H.text text
] ]
...@@ -331,7 +330,7 @@ liNav ...@@ -331,7 +330,7 @@ liNav
, title: title' , title: title'
, href: href' , href: href'
} }
[ H.span { className: icon' } [] [ B.icon { name: icon' }
, H.text $ " " <> text' , H.text $ " " <> text'
] ]
] ]
...@@ -354,8 +353,8 @@ handedChooserCpt = here.component "handedChooser" cpt ...@@ -354,8 +353,8 @@ handedChooserCpt = here.component "handedChooser" cpt
-- | Computed -- | Computed
-- | -- |
let let
handedClass LeftHanded = "fa fa-hand-o-left" handedClass LeftHanded = "sign-turn-left"
handedClass RightHanded = "fa fa-hand-o-right" handedClass RightHanded = "sign-turn-right"
-- | Behaviors -- | Behaviors
-- | -- |
...@@ -368,11 +367,7 @@ handedChooserCpt = here.component "handedChooser" cpt ...@@ -368,11 +367,7 @@ handedChooserCpt = here.component "handedChooser" cpt
-- | Render -- | Render
-- | -- |
pure $ pure $
H.a H.a { className: "nav-link navbar-text" }
{ className: "nav-link navbar-text" } [ H.span { on: { click: onClick } }
[ H.span [ B.icon { name: handedClass handed' } ]
{ className: handedClass handed'
, on: { click: onClick }
}
[]
] ]
...@@ -101,7 +101,7 @@ treeSearchCpt = here.component "treeSearch" cpt ...@@ -101,7 +101,7 @@ treeSearchCpt = here.component "treeSearch" cpt
, on: { click: submit inputRef query } , on: { click: submit inputRef query }
, type: "submit" , type: "submit"
} }
[ H.span { className: "fa fa-search" } [] ] [ B.icon { name: "search" } ]
] ]
] ]
, treeSearchState { visible, query, sessions: sessions' } , treeSearchState { visible, query, sessions: sessions' }
...@@ -214,7 +214,7 @@ treeSearchRenderCpt = here.component "treeSearchRenderCpt" cpt ...@@ -214,7 +214,7 @@ treeSearchRenderCpt = here.component "treeSearchRenderCpt" cpt
goToRoute $ getRouteFromSearchResult sd session goToRoute $ getRouteFromSearchResult sd session
, variant: ButtonVariant Light , variant: ButtonVariant Light
} }
[ B.icon { name: getIcon sd.type true } [ B.icon { name: getIcon sd.type { open: true } }
, B.wad_ [ "d-inline-block", "w-1" ] , B.wad_ [ "d-inline-block", "w-1" ]
, H.text sd.name , H.text sd.name
] ]
......
...@@ -361,66 +361,57 @@ translateEN = case _ of ...@@ -361,66 +361,57 @@ translateEN = case _ of
------------------------------------------------------ ------------------------------------------------------
-- @NOTE: #379 deprecate the idea of circle/non-circle icons -- @NOTE: #379 deprecate the idea of circle/non-circle icons
getIcon :: NodeType -> Boolean -> String
getIcon NodeUser false = "user-circle" type IconProps = (open :: Boolean)
getIcon NodeUser true = "user"
getIcon :: NodeType -> Record IconProps -> String
getIcon NodeUser _ = "person"
------------------------------------------------------ ------------------------------------------------------
getIcon Folder false = "folder" getIcon Folder _ = "folder"
getIcon Folder true = "folder-open-o"
------------------------------------------------------ ------------------------------------------------------
getIcon FolderPrivate true = "lock" getIcon FolderPrivate _ = "lock"
getIcon FolderPrivate false = "lock-circle"
getIcon FolderShared _ = "share"
getIcon FolderShared true = "share-alt" getIcon Team _ = "people"
getIcon FolderShared false = "share-circle"
getIcon Team true = "users"
getIcon Team false = "users-closed"
getIcon FolderPublic true = "globe" getIcon FolderPublic _ = "globe"
getIcon FolderPublic false = "globe"
------------------------------------------------------ ------------------------------------------------------
getIcon Corpus true = "book" getIcon Corpus _ = "book"
getIcon Corpus false = "book-circle"
getIcon Phylo _ = "code-fork" getIcon Phylo _ = "git"
getIcon Graph _ = "hubzilla" getIcon Graph _ = "diagram-3"
getIcon NodeTexts _ = "newspaper-o" getIcon NodeTexts _ = "newspaper"
getIcon Dashboard _ = "signal" getIcon Dashboard _ = "speedometer"
getIcon NodeList _ = "list" getIcon NodeList _ = "list"
getIcon NodeFile _ = "file" -- TODO depending on mime type we can use fa-file-image etc getIcon NodeFile _ = "file" -- TODO depending on mime type we can use fa-file-image etc
getIcon Annuaire true = "address-card-o" getIcon Annuaire _ = "person-vcard"
getIcon Annuaire false = "address-card"
getIcon NodeContact true = "address-card-o" getIcon NodeContact _ = "person-vcard"
getIcon NodeContact false = "address-card"
getIcon Notes true = "file-text-o" getIcon Notes _ = "file-text"
getIcon Notes false = "file-text"
getIcon Calc true = "calculator" getIcon Calc _ = "file-spreadsheet"
getIcon Calc false = "calculator"
getIcon NodeFrameNotebook true = "file-code-o" getIcon NodeFrameNotebook _ = "file-code"
getIcon NodeFrameNotebook false = "code"
getIcon NodeFrameVisio true = "video-camera" getIcon NodeFrameVisio _ = "webcam"
getIcon NodeFrameVisio false = "video-camera"
getIcon (NodePublic nt) b = getIcon nt b getIcon (NodePublic nt) p = getIcon nt p
getIcon _ true = "folder-open" getIcon _ { open: false } = "folder2-open"
getIcon _ false = "folder-o" getIcon _ { open: true } = "folder"
------------------------------------------------------ ------------------------------------------------------
fldr :: NodeType -> Boolean -> String fldr :: NodeType -> Record IconProps -> String
fldr nt flag = classNamePrefix <> getIcon nt flag fldr nt p = classNamePrefix <> getIcon nt p
charCodeIcon :: NodeType -> Boolean -> String charCodeIcon :: NodeType -> Record IconProps -> String
charCodeIcon nt flag = glyphiconToCharCode $ getIcon nt flag charCodeIcon nt p = glyphiconToCharCode $ getIcon nt p
publicize :: NodeType -> NodeType publicize :: NodeType -> NodeType
publicize (NodePublic nt) = NodePublic nt publicize (NodePublic nt) = NodePublic nt
...@@ -783,7 +774,7 @@ getTabIcon "Authors" = "list" ...@@ -783,7 +774,7 @@ getTabIcon "Authors" = "list"
getTabIcon "Institutes" = "list" getTabIcon "Institutes" = "list"
getTabIcon "Sources" = "list" getTabIcon "Sources" = "list"
getTabIcon "Terms" = "list" getTabIcon "Terms" = "list"
getTabIcon "Documents" = "newspaper-o" getTabIcon "Documents" = "newspaper"
getTabIcon "Trash" = "trash" getTabIcon "Trash" = "trash"
getTabIcon _ = "" getTabIcon _ = ""
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// making ".thead" small, but not its affiliated ".tbody" // making ".thead" small, but not its affiliated ".tbody"
thead th thead th
padding: $table-cell-padding-sm padding: $table-cell-padding-x-sm
&__active-places &__active-places
......
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
.modal-dialog .b-icon, .modal-dialog .b-icon,
.modal-dialog .fa .modal-dialog .fa
{ {
&:not(.fa-check-circle):not(.fa-exclamation-circle):not(.fa-circle):not(.fa-times) { &:not(.bi-check-circle):not(.bi-exclamation-circle):not(.bi-circle-fill):not(.bi-times) {
&:before { &:before {
color: $primary; color: $primary;
} }
...@@ -557,4 +557,4 @@ ...@@ -557,4 +557,4 @@
.form-control { .form-control {
border-radius: 50px; border-radius: 50px;
} }
} }
\ No newline at end of file
...@@ -35,10 +35,15 @@ ...@@ -35,10 +35,15 @@
// * `/text` // * `/text`
// * `/visibility` // * `/visibility`
// //
@import "../../../node_modules/bootstrap/scss/maps";
@import "../../../node_modules/bootstrap/scss/utilities";
@import "../../../node_modules/bootstrap/scss/root"; @import "../../../node_modules/bootstrap/scss/root";
@import "../../../node_modules/bootstrap/scss/reboot";
@import "../../../node_modules/bootstrap/scss/type"; @import "../../../node_modules/bootstrap/scss/type";
@import "../../../node_modules/bootstrap/scss/images"; @import "../../../node_modules/bootstrap/scss/images";
@import "../../../node_modules/bootstrap/scss/code"; @import "../../../node_modules/bootstrap/scss/containers";
@import "../../../node_modules/bootstrap/scss/grid"; @import "../../../node_modules/bootstrap/scss/grid";
@import "../../../node_modules/bootstrap/scss/tables"; @import "../../../node_modules/bootstrap/scss/tables";
@import "../../../node_modules/bootstrap/scss/forms"; @import "../../../node_modules/bootstrap/scss/forms";
...@@ -46,18 +51,15 @@ ...@@ -46,18 +51,15 @@
@import "../../../node_modules/bootstrap/scss/transitions"; @import "../../../node_modules/bootstrap/scss/transitions";
@import "../../../node_modules/bootstrap/scss/dropdown"; @import "../../../node_modules/bootstrap/scss/dropdown";
@import "../../../node_modules/bootstrap/scss/button-group"; @import "../../../node_modules/bootstrap/scss/button-group";
@import "../../../node_modules/bootstrap/scss/input-group";
@import "../../../node_modules/bootstrap/scss/custom-forms";
@import "../../../node_modules/bootstrap/scss/nav"; @import "../../../node_modules/bootstrap/scss/nav";
@import "../../../node_modules/bootstrap/scss/navbar"; @import "../../../node_modules/bootstrap/scss/navbar";
@import "../../../node_modules/bootstrap/scss/card"; @import "../../../node_modules/bootstrap/scss/card";
@import "../../../node_modules/bootstrap/scss/accordion";
@import "../../../node_modules/bootstrap/scss/breadcrumb"; @import "../../../node_modules/bootstrap/scss/breadcrumb";
@import "../../../node_modules/bootstrap/scss/pagination"; @import "../../../node_modules/bootstrap/scss/pagination";
@import "../../../node_modules/bootstrap/scss/badge"; @import "../../../node_modules/bootstrap/scss/badge";
@import "../../../node_modules/bootstrap/scss/jumbotron";
@import "../../../node_modules/bootstrap/scss/alert"; @import "../../../node_modules/bootstrap/scss/alert";
@import "../../../node_modules/bootstrap/scss/progress"; @import "../../../node_modules/bootstrap/scss/progress";
@import "../../../node_modules/bootstrap/scss/media";
@import "../../../node_modules/bootstrap/scss/list-group"; @import "../../../node_modules/bootstrap/scss/list-group";
@import "../../../node_modules/bootstrap/scss/close"; @import "../../../node_modules/bootstrap/scss/close";
@import "../../../node_modules/bootstrap/scss/toasts"; @import "../../../node_modules/bootstrap/scss/toasts";
...@@ -66,13 +68,12 @@ ...@@ -66,13 +68,12 @@
@import "../../../node_modules/bootstrap/scss/popover"; @import "../../../node_modules/bootstrap/scss/popover";
@import "../../../node_modules/bootstrap/scss/carousel"; @import "../../../node_modules/bootstrap/scss/carousel";
@import "../../../node_modules/bootstrap/scss/spinners"; @import "../../../node_modules/bootstrap/scss/spinners";
@import "../../../node_modules/bootstrap/scss/print"; @import "../../../node_modules/bootstrap/scss/offcanvas";
@import "../../../node_modules/bootstrap/scss/placeholders";
@import "../../../node_modules/bootstrap/scss/helpers";
@import "../../../node_modules/bootstrap/scss/utilities/embed"; @import "../../../node_modules/bootstrap/scss/utilities/api";
@import "../../../node_modules/bootstrap/scss/utilities/interactions";
@import "../../../node_modules/bootstrap/scss/utilities/screenreaders";
@import "../../../node_modules/bootstrap/scss/utilities/shadows";
@import "../../../node_modules/bootstrap/scss/utilities/stretched-link";
/// (part 2.2: overriding Bootstrap styles + import project styles) /// (part 2.2: overriding Bootstrap styles + import project styles)
......
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