diff --git a/src/main/glam/client/ui/admin/project/overview.cljs b/src/main/glam/client/ui/admin/project/overview.cljs index dcc09b2..9e9aabd 100644 --- a/src/main/glam/client/ui/admin/project/overview.cljs +++ b/src/main/glam/client/ui/admin/project/overview.cljs @@ -105,9 +105,8 @@ (mui/container {:maxWidth "md" :style {:position "relative"}} (mui/page-title "Project Management") (mui/arrow-breadcrumbs {} - (mui/link {:color "inherit" :href (r/route-for :admin-home) :key "admin"} "Admin Settings") - (mui/link {:color "textPrimary" :underline "none" :key "project"} "Project Management")) - + (mui/link {:variant "subtitle1" :color "inherit" :href (r/route-for :admin-home) :key "admin"} "Admin Settings") + (mui/link {:variant "subtitle1" :color "textPrimary" :underline "none" :key "project"} "Project Management")) ;; add project button (mui/dialog {:open modal-open? :onClose #(uism/trigger! this ::add-project :event/cancel)} (mui/dialog-title {} "Create Project") diff --git a/src/main/glam/client/ui/admin/project/settings.cljs b/src/main/glam/client/ui/admin/project/settings.cljs index ce60a37..08f5af5 100644 --- a/src/main/glam/client/ui/admin/project/settings.cljs +++ b/src/main/glam/client/ui/admin/project/settings.cljs @@ -640,9 +640,9 @@ (mui/container {:maxWidth "lg" :style {:position "relative"}} (mui/page-title name) (mui/arrow-breadcrumbs {} - (mui/link {:color "inherit" :href (r/route-for :admin-home) :key "admin"} "Admin Settings") - (mui/link {:color "inherit" :href (r/route-for :project-overview) :key "project"} "Project Management") - (mui/link {:color "textPrimary" :underline "none" :key id} name)) + (mui/link {:variant "subtitle1" :color "inherit" :href (r/route-for :admin-home) :key "admin"} "Admin Settings") + (mui/link {:variant "subtitle1" :color "inherit" :href (r/route-for :project-overview) :key "project"} "Project Management") + (mui/link {:variant "subtitle1" :color "textPrimary" :underline "none" :key id} name)) ;; add text layer modal (mui/dialog {:open modal-open? diff --git a/src/main/glam/client/ui/admin/user_management.cljs b/src/main/glam/client/ui/admin/user_management.cljs index af3e666..ac36240 100644 --- a/src/main/glam/client/ui/admin/user_management.cljs +++ b/src/main/glam/client/ui/admin/user_management.cljs @@ -252,8 +252,8 @@ (mui/container {:maxWidth "md"} (mui/page-title "User Management") (mui/arrow-breadcrumbs {} - (mui/link {:color "inherit" :href (r/route-for :admin-home) :key "admin"} "Admin Settings") - (mui/link {:color "textPrimary" :underline "none" :key "user"} "User Management")) + (mui/link {:variant "subtitle1" :color "inherit" :href (r/route-for :admin-home) :key "admin"} "Admin Settings") + (mui/link {:variant "subtitle1" :color "textPrimary" :underline "none" :key "user"} "User Management")) ;; add user button (mui/dialog {:open modal-open? :onClose #(uism/trigger! this ::add-user :event/cancel)} diff --git a/src/main/glam/client/ui/document/document.cljs b/src/main/glam/client/ui/document/document.cljs index e4559ca..f574f29 100644 --- a/src/main/glam/client/ui/document/document.cljs +++ b/src/main/glam/client/ui/document/document.cljs @@ -139,9 +139,9 @@ (mui/container {:maxWidth "xl"} (mui/page-title name) (mui/arrow-breadcrumbs {} - (mui/link {:color "inherit" :href (r/route-for :projects) :key "projects"} "Projects") - (mui/link {:color "inherit" :href (r/route-for :project {:id (:project/id project)}) :key "project"} (:project/name project)) - (mui/link {:color "textPrimary" :underline "none" :key "document"} name)) + (mui/link {:variant "subtitle1" :underline "none" :color "inherit" :href (r/route-for :projects) :key "projects"} "Projects") + (mui/link {:variant "subtitle1" :underline "none" :color "inherit" :href (r/route-for :project {:id (:project/id project)}) :key "project"} (:project/name project)) + (mui/link {:variant "subtitle1" :color "textPrimary" :underline "none" :key "document"} name)) (mui/paper {} (if busy? diff --git a/src/main/glam/client/ui/material_ui.cljs b/src/main/glam/client/ui/material_ui.cljs index 231b8a2..0c4161d 100644 --- a/src/main/glam/client/ui/material_ui.cljs +++ b/src/main/glam/client/ui/material_ui.cljs @@ -154,8 +154,8 @@ ["@mui/material/Typography" :default Typography] ["@mui/material/Zoom" :default Zoom] ;; END AUTO GEN - ["@mui/x-tree-view" :default TreeView] - ["@mui/x-tree-view/TreeItem" :default TreeItem] + ["@mui/x-tree-view/TreeView" :refer [TreeView]] + ["@mui/x-tree-view/TreeItem" :refer [TreeItem]] [glam.client.ui.material-ui-icon :as muic] [taoensso.timbre :as log])) diff --git a/src/main/glam/client/ui/material_ui_icon.cljs b/src/main/glam/client/ui/material_ui_icon.cljs index 99677c7..185a895 100644 --- a/src/main/glam/client/ui/material_ui_icon.cljs +++ b/src/main/glam/client/ui/material_ui_icon.cljs @@ -1,13 +1,6 @@ (ns glam.client.ui.material-ui-icon - "Autogenerated. Go to https://mui.com/material-ui/material-icons/ and select the parent div in devtools - - Then: - - let pascalNames = Array.from($0.childNodes).map(x => x.innerText) - console.log(pascalNames.map(x => ` [\"@mui/icons-material/${x}\" :default ${x}]`).join(\"\\n\")) - let pascal2kebab = (s) => s.split('').map((c, i) => c === c.toUpperCase() && i > 0 ? '-' + c.toLowerCase() : c.toLowerCase()).join('') - console.log(pascalNames.map(n => `(def ${pascal2kebab(n)} (interop/react-factory ${n}))`).join('\\n')) - " + "To add a new icon, go to https://mui.com/material-ui/material-icons/ + Then add the corresponding entries in this file" (:refer-clojure :exclude [comment compare filter list loop map print remove repeat shuffle sort update]) (:require [com.fulcrologic.fulcro.algorithms.react-interop :as interop] ["@mui/icons-material/Abc" :default Abc] diff --git a/src/main/glam/client/ui/project/project.cljs b/src/main/glam/client/ui/project/project.cljs index 647956f..39abc09 100644 --- a/src/main/glam/client/ui/project/project.cljs +++ b/src/main/glam/client/ui/project/project.cljs @@ -108,8 +108,8 @@ (mui/page-title name) (mui/arrow-breadcrumbs {} - (mui/link {:color "inherit" :href (r/route-for :projects) :key "projects"} "Projects") - (mui/link {:color "textPrimary" :underline "none" :key "user"} name)) + (mui/link {:variant "subtitle1" :color "inherit" :href (r/route-for :projects) :key "projects"} "Projects") + (mui/link {:variant "subtitle1" :color "textPrimary" :underline "none" :key "user"} name)) (mui/button {:variant "outlined" diff --git a/src/main/glam/client/ui/root.cljs b/src/main/glam/client/ui/root.cljs index 0cceaae..4ed20dd 100644 --- a/src/main/glam/client/ui/root.cljs +++ b/src/main/glam/client/ui/root.cljs @@ -59,7 +59,7 @@ :disabled (not session?) :onClick #(c/transact! this [(set-open {:open? true})])} (muic/menu {:fontSize "large"})) - ((mui/styled-typography {:flex-grow 1}) {:variant "h5"} "Glam") + ((mui/styled-typography {:flex-grow "1"}) {:variant "h5"} "Glam") (logout-button this session?))) (when session? (ui-drawer