Skip to content

Commit

Permalink
Merge branch 'master' into ops/zone0A/persist
Browse files Browse the repository at this point in the history
 Conflicts: (kept all HEAD)
	assets/js/app.js
	assets/js/hooks/index.js
	lib/vyasa/draft.ex
	lib/vyasa/written/verse.ex
	lib/vyasa_web/components/action_bar.ex
	lib/vyasa_web/components/contexts/read/verse_matrix.ex
	lib/vyasa_web/components/control_panel.ex
	lib/vyasa_web/components/hoverune.ex
	lib/vyasa_web/components/source_content/verses.ex
	lib/vyasa_web/components/user_mode_components.ex
	lib/vyasa_web/live/display_manager/display_live.ex
	lib/vyasa_web/live/display_manager/display_live.html.heex
	lib/vyasa_web/live/media_live/media_bridge.html.heex
	lib/vyasa_web/router.ex
	mix.exs
	mix.lock
  • Loading branch information
rtshkmr committed Sep 23, 2024
2 parents 6b96b26 + df554e2 commit 9b338d2
Show file tree
Hide file tree
Showing 4 changed files with 159,373 additions and 0 deletions.
3 changes: 3 additions & 0 deletions assets/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ module.exports = {
fontSize: {
xs: "0.65rem",
},
fontSize: {
xs: "0.65rem",
},
colors: {
primary: "var(--color-primary)",
primaryAccent: "var(--color-primary-accent)",
Expand Down
Loading

0 comments on commit 9b338d2

Please sign in to comment.