Skip to content

Commit

Permalink
css config in edn
Browse files Browse the repository at this point in the history
  • Loading branch information
@awb99
awb99 committed Jul 3, 2021
1 parent f5b6a48 commit d4fafcf
Show file tree
Hide file tree
Showing 7 changed files with 227 additions and 60 deletions.
4 changes: 2 additions & 2 deletions deps.edn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
;; app

:goldly
{:extra-deps {org.pinkgorilla/goldly {:mvn/version "RELEASE"
{:extra-deps {org.pinkgorilla/goldly {:mvn/version "0.2.114"
:exclusions [org.pinkgorilla/ui-code]}}
:exec-fn goldly-server.app/goldly-server-run!
:exec-args {:profile "watch"
:config {:google-analytics {:enabled false}
:goldly {}}}}

:npm-install
{:extra-deps {org.pinkgorilla/goldly {:mvn/version "RELEASE"
{:extra-deps {org.pinkgorilla/goldly {:mvn/version "0.2.114"
:exclusions [org.pinkgorilla/ui-code]}}
:exec-fn goldly-server.app/goldly-server-run!
:exec-args {:profile "npm-install"
Expand Down
189 changes: 179 additions & 10 deletions resources/ext/gorilla-ext.edn
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,186 @@
{:name "ui-code"
:clj-require []
:cljs-namespace [ui.code.goldly.core]
:cljs-bindings {}
:cljs-bindings {'code ui.code.highlight.viewer/code-viewer
'codemirror ui.code.goldly.codemirror-atom/codemirror-atom}

:cljs-ns-bindings {}

:theme {:available {;:code-linenumber {true ["goldly/code.css"]}
:codemirror {true ["codemirror/lib/codemirror.css"]
"duotone-dark" ["codemirror/theme/duotone-dark.css"]
"seti" ["codemirror/theme/seti.css"]
"nord" ["codemirror/theme/nord.css"]
"cobalt" ["codemirror/theme/cobalt.css"]
"midnight" ["codemirror/theme/midnight.css"]
"abcdef" ["codemirror/theme/abcdef.css"]
"neat" ["codemirror/theme/neat.css"]
"duotone-light" ["codemirror/theme/duotone-light.css"]
"ayu-dark" ["codemirror/theme/ayu-dark.css"]
"material-darker" ["codemirror/theme/material-darker.css"]
"material-palenight" ["codemirror/theme/material-palenight.css"]
"liquibyte" ["codemirror/theme/liquibyte.css"]
"yeti" ["codemirror/theme/yeti.css"]
"hopscotch" ["codemirror/theme/hopscotch.css"]
"rubyblue" ["codemirror/theme/rubyblue.css"]
"gruvbox-dark" ["codemirror/theme/gruvbox-dark.css"]
"3024-night" ["codemirror/theme/3024-night.css"]
"shadowfox" ["codemirror/theme/shadowfox.css"]
"ttcn" ["codemirror/theme/ttcn.css"]
"neo" ["codemirror/theme/neo.css"]
"solarized light" ["codemirror/theme/solarized light.css"]
"monokai" ["codemirror/theme/monokai.css"]
"3024-day" ["codemirror/theme/3024-day.css"]
"pastel-on-dark" ["codemirror/theme/pastel-on-dark.css"]
"twilight" ["codemirror/theme/twilight.css"]
"eclipse" ["codemirror/theme/eclipse.css"]
"tomorrow-night-eighties" ["codemirror/theme/tomorrow-night-eighties.css"]
"bespin" ["codemirror/theme/bespin.css"]
"mbo" ["codemirror/theme/mbo.css"]
"material-ocean" ["codemirror/theme/material-ocean.css"]
"moxer" ["codemirror/theme/moxer.css"]
"erlang-dark" ["codemirror/theme/erlang-dark.css"]
"oceanic-next" ["codemirror/theme/oceanic-next.css"]
"paraiso-dark" ["codemirror/theme/paraiso-dark.css"]
"mdn-like" ["codemirror/theme/mdn-like.css"]
"solarized dark" ["codemirror/theme/solarized dark.css"]
"elegant" ["codemirror/theme/elegant.css"]
"dracula" ["codemirror/theme/dracula.css"]
"lesser-dark" ["codemirror/theme/lesser-dark.css"]
"panda-syntax" ["codemirror/theme/panda-syntax.css"]
"icecoder" ["codemirror/theme/icecoder.css"]
"yonce" ["codemirror/theme/yonce.css"]
"base16-light" ["codemirror/theme/base16-light.css"]
"blackboard" ["codemirror/theme/blackboard.css"]
"darcula" ["codemirror/theme/darcula.css"]
"ayu-mirage" ["codemirror/theme/ayu-mirage.css"]
"the-matrix" ["codemirror/theme/the-matrix.css"]
"ambiance" ["codemirror/theme/ambiance.css"]
"base16-dark" ["codemirror/theme/base16-dark.css"]
"paraiso-light" ["codemirror/theme/paraiso-light.css"]
"xq-dark" ["codemirror/theme/xq-dark.css"]
"vibrant-ink" ["codemirror/theme/vibrant-ink.css"]
"xq-light" ["codemirror/theme/xq-light.css"]
"night" ["codemirror/theme/night.css"]
"tomorrow-night-bright" ["codemirror/theme/tomorrow-night-bright.css"]
"railscasts" ["codemirror/theme/railscasts.css"]
"zenburn" ["codemirror/theme/zenburn.css"]
"isotope" ["codemirror/theme/isotope.css"]
"default" ["codemirror/theme/default.css"]
"colorforth" ["codemirror/theme/colorforth.css"]
"lucario" ["codemirror/theme/lucario.css"]
"material" ["codemirror/theme/material.css"]
"idea" ["codemirror/theme/idea.css"]}

:highlight {"rainbow" ["highlight.js/styles/rainbow.css"]
"grayscale" ["highlight.js/styles/grayscale.css"]
"brown-paper" ["highlight.js/styles/brown-paper.css"]
"solarized-dark" ["highlight.js/styles/solarized-dark.css"]
"arta" ["highlight.js/styles/arta.css"]
"kimbie.light" ["highlight.js/styles/kimbie.light.css"]
"sunburst" ["highlight.js/styles/sunburst.css"]
"atom-one-dark-reasonable" ["highlight.js/styles/atom-one-dark-reasonable.css"]
"routeros" ["highlight.js/styles/routeros.css"]
"shades-of-purple" ["highlight.js/styles/shades-of-purple.css"]
"foundation" ["highlight.js/styles/foundation.css"]
"nord" ["highlight.js/styles/nord.css"]
"atelier-dune-light" ["highlight.js/styles/atelier-dune-light.css"]
"gradient-dark" ["highlight.js/styles/gradient-dark.css"]
"vs2015" ["highlight.js/styles/vs2015.css"]
"an-old-hope" ["highlight.js/styles/an-old-hope.css"]
"atelier-estuary-light" ["highlight.js/styles/atelier-estuary-light.css"]
"gruvbox-light" ["highlight.js/styles/gruvbox-light.css"]
"ascetic" ["highlight.js/styles/ascetic.css"]
"atelier-cave-dark" ["highlight.js/styles/atelier-cave-dark.css"]
"atelier-lakeside-dark" ["highlight.js/styles/atelier-lakeside-dark.css"]
"atom-one-dark" ["highlight.js/styles/atom-one-dark.css"]
"ir-black" ["highlight.js/styles/ir-black.css"]
"github" ["highlight.js/styles/github.css"]
"magula" ["highlight.js/styles/magula.css"]
"atelier-sulphurpool-light" ["highlight.js/styles/atelier-sulphurpool-light.css"]
"night-owl" ["highlight.js/styles/night-owl.css"]
"hybrid" ["highlight.js/styles/hybrid.css"]
"hopscotch" ["highlight.js/styles/hopscotch.css"]
"atelier-heath-dark" ["highlight.js/styles/atelier-heath-dark.css"]
"atelier-lakeside-light" ["highlight.js/styles/atelier-lakeside-light.css"]
"gruvbox-dark" ["highlight.js/styles/gruvbox-dark.css"]
"far" ["highlight.js/styles/far.css"]
"solarized-light" ["highlight.js/styles/solarized-light.css"]
"atelier-forest-light" ["highlight.js/styles/atelier-forest-light.css"]
"googlecode" ["highlight.js/styles/googlecode.css"]
"atelier-plateau-dark" ["highlight.js/styles/atelier-plateau-dark.css"]
"atom-one-light" ["highlight.js/styles/atom-one-light.css"]
"ocean" ["highlight.js/styles/ocean.css"]
"mono-blue" ["highlight.js/styles/mono-blue.css"]
"atelier-heath-light" ["highlight.js/styles/atelier-heath-light.css"]
"xcode" ["highlight.js/styles/xcode.css"]
"monokai" ["highlight.js/styles/monokai.css"]
"tomorrow" ["highlight.js/styles/tomorrow.css"]
"atelier-seaside-dark" ["highlight.js/styles/atelier-seaside-dark.css"]
"xt256" ["highlight.js/styles/xt256.css"]
"github-gist" ["highlight.js/styles/github-gist.css"]
"atelier-savanna-dark" ["highlight.js/styles/atelier-savanna-dark.css"]
"atelier-cave-light" ["highlight.js/styles/atelier-cave-light.css"]
"tomorrow-night-eighties" ["highlight.js/styles/tomorrow-night-eighties.css"]
"tomorrow-night-blue" ["highlight.js/styles/tomorrow-night-blue.css"]
"purebasic" ["highlight.js/styles/purebasic.css"]
"color-brewer" ["highlight.js/styles/color-brewer.css"]
"monokai-sublime" ["highlight.js/styles/monokai-sublime.css"]
"isbl-editor-light" ["highlight.js/styles/isbl-editor-light.css"]
"atelier-estuary-dark" ["highlight.js/styles/atelier-estuary-dark.css"]
"qtcreator_light" ["highlight.js/styles/qtcreator_light.css"]
"obsidian" ["highlight.js/styles/obsidian.css"]
"atelier-savanna-light" ["highlight.js/styles/atelier-savanna-light.css"]
"a11y-dark" ["highlight.js/styles/a11y-dark.css"]
"paraiso-dark" ["highlight.js/styles/paraiso-dark.css"]
"kimbie.dark" ["highlight.js/styles/kimbie.dark.css"]
"qtcreator_dark" ["highlight.js/styles/qtcreator_dark.css"]
"srcery" ["highlight.js/styles/srcery.css"]
"dracula" ["highlight.js/styles/dracula.css"]
"nnfx" ["highlight.js/styles/nnfx.css"]
"tomorrow-night" ["highlight.js/styles/tomorrow-night.css"]
"lightfair" ["highlight.js/styles/lightfair.css"]
"lioshi" ["highlight.js/styles/lioshi.css"]
"agate" ["highlight.js/styles/agate.css"]
"dark" ["highlight.js/styles/dark.css"]
"atelier-dune-dark" ["highlight.js/styles/atelier-dune-dark.css"]
"pojoaque" ["highlight.js/styles/pojoaque.css"]
"school-book" ["highlight.js/styles/school-book.css"]
"darcula" ["highlight.js/styles/darcula.css"]
"atelier-seaside-light" ["highlight.js/styles/atelier-seaside-light.css"]
"paraiso-light" ["highlight.js/styles/paraiso-light.css"]
"a11y-light" ["highlight.js/styles/a11y-light.css"]
"androidstudio" ["highlight.js/styles/androidstudio.css"]
"vs" ["highlight.js/styles/vs.css"]
"docco" ["highlight.js/styles/docco.css"]
"isbl-editor-dark" ["highlight.js/styles/isbl-editor-dark.css"]
"arduino-light" ["highlight.js/styles/arduino-light.css"]
"atelier-plateau-light" ["highlight.js/styles/atelier-plateau-light.css"]
"tomorrow-night-bright" ["highlight.js/styles/tomorrow-night-bright.css"]
"atelier-forest-dark" ["highlight.js/styles/atelier-forest-dark.css"]
"gml" ["highlight.js/styles/gml.css"]
"railscasts" ["highlight.js/styles/railscasts.css"]
"zenburn" ["highlight.js/styles/zenburn.css"]
"nnfx-dark" ["highlight.js/styles/nnfx-dark.css"]
"default" ["highlight.js/styles/default.css"]
"codepen-embed" ["highlight.js/styles/codepen-embed.css"]
"atelier-sulphurpool-dark" ["highlight.js/styles/atelier-sulphurpool-dark.css"]
"idea" ["highlight.js/styles/idea.css"]}}

:current {;:code-linenumber true
:codemirror "paraiso-dark"
:highlight "github"}}


:snippets [{:type :pinkie
:category :code
:id :highlightjs
:filename "snippets/code/highlight.edn"}
:category :code
:id :highlightjs
:filename "snippets/code/highlight.edn"}
{:type :goldly-clj
:category :code
:id :codemirror1
:filename "snippets/code/codemirror1.clj"}
:category :code
:id :codemirror1
:filename "snippets/code/codemirror1.clj"}
{:type :goldly-clj
:category :code
:id :codemirror2
:filename "snippets/code/codemirror2.clj"}]}
:category :code
:id :codemirror2
:filename "snippets/code/codemirror2.clj"}]}
1 change: 0 additions & 1 deletion scripts/copy_res.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ cpr () {
}

cpr "codemirror/lib" "*.css"

#mkdir -p target/node_modules/public/codemirror/theme
cpr "codemirror/theme" "*.css"

Expand Down
50 changes: 45 additions & 5 deletions src/ui/code/highlight/themes.cljs → scripts/theme.clj
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
(ns ui.code.highlight.themes)

(def themes-main
;; babashka script to generate css config.
(defn add-themes [m theme-base themes]
(let [theme-link (fn [theme]
(format theme-base theme))
add-theme (fn [acc theme]
;(println "adding:" theme)
(assoc acc theme [(theme-link theme)]))]
(reduce add-theme m themes)))

(def highlight-themes-main
["default"
"github"
"zenburn"])

(def themes
(def highlight-themes
["default"
"zenburn"
"vs2015"
Expand All @@ -15,7 +23,6 @@
"codepen-embed"
"xcode"
"vs"

"a11y-dark"
"atelier-seaside-dark"
"gruvbox-light"
Expand Down Expand Up @@ -100,4 +107,37 @@
"paraiso-light"
"atelier-savanna-light"
"gruvbox-dark"
"pojoaque"])
"pojoaque"])



(println (pr-str (add-themes
{}
"highlight.js/styles/%s.css"
highlight-themes)))


(def fonts-aggrid
["Alpine"
"Balham"
"Classic"
"Material"])

(def codemirror-themes
["default" "3024-day" "3024-night" "abcdef" "ambiance" "ayu-dark" "ayu-mirage"
"base16-dark" "base16-light" "bespin" "blackboard" "cobalt" "colorforth"
"darcula" "dracula" "duotone-dark" "duotone-light" "eclipse" "elegant"
"erlang-dark" "gruvbox-dark" "hopscotch" "icecoder" "idea" "isotope"
"lesser-dark" "liquibyte" "lucario" "material" "material-darker"
"material-palenight" "material-ocean" "mbo" "mdn-like" "midnight" "monokai"
"moxer" "neat" "neo" "night" "nord" "oceanic-next" "panda-syntax"
"paraiso-dark" "paraiso-light" "pastel-on-dark" "railscasts" "rubyblue"
"seti" "shadowfox" "solarized dark" "solarized light" "the-matrix"
"tomorrow-night-bright" "tomorrow-night-eighties" "ttcn" "twilight"
"vibrant-ink" "xq-dark" "xq-light" "yeti" "yonce" "zenburn"])


(println (pr-str (add-themes
{true ["codemirror/lib/codemirror.css"]}
"codemirror/theme/%s.css"
codemirror-themes)))
6 changes: 1 addition & 5 deletions src/ui/code/goldly/core.cljs
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
(ns ui.code.goldly.core
(:require
[re-frame.core :as rf]
[pinkie.pinkie :refer-macros [register-component]]
[ui.codemirror.core :refer [configure-cm-globally!]]
[ui.code.highlight.viewer :refer [code-viewer]]
[ui.code.goldly.codemirror-atom :refer [codemirror-atom codemirror-atom-viewonly]]
[ui.code.goldly.css :as css]))
[ui.code.goldly.codemirror-atom :refer [codemirror-atom codemirror-atom-viewonly]]))

(configure-cm-globally!)

(register-component :p/code code-viewer)
(register-component :p/codemirror codemirror-atom)
(register-component :p/codemirror-viewonly codemirror-atom-viewonly)

(rf/dispatch [:css/add-components css/components css/config])


22 changes: 0 additions & 22 deletions src/ui/code/goldly/css.cljs
View file

This file was deleted.

0 comments on commit d4fafcf

Please sign in to comment.