Skip to content

Commit

Permalink
upgrade deps; try blinking focus
Browse files Browse the repository at this point in the history
  • Loading branch information
tiye committed Nov 16, 2023
1 parent 560f03f commit 5d53c84
Show file tree
Hide file tree
Showing 8 changed files with 406 additions and 282 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/npm-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ jobs:

- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.8/cr'
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/cr'
name: 'cr'
version: '0.8.8'
version: '0.8.9'

- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.8/caps'
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/caps'
name: 'caps'
version: '0.8.8'
version: '0.8.9'

- run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-node@v3
with:
node-version: 18
node-version: 20
cache: yarn

- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.8/cr'
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/cr'
name: 'cr'
version: '0.8.8'
version: '0.8.9'

- uses: supplypike/setup-bin@v3
with:
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.8/caps'
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.9/caps'
name: 'caps'
version: '0.8.8'
version: '0.8.9'

- run: caps --ci && yarn && yarn compile-server && yarn compile-page && yarn release-page

Expand Down
21 changes: 20 additions & 1 deletion assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,14 @@ body * {
}

.comp-expr:hover {
border-color: hsla(0,0%,100%,0.86);
border-color: hsla(0,0%,100%,0.6);
}

.comp-expr:active {
transition-duration: 0ms;
/* transform: scale(1.02);*/
transform: translate(1px, 0px);
border-color: white;
}

/** tricky selector to reset parent hover color */
Expand All @@ -107,3 +108,21 @@ div.comp-expr:has(.comp-leaf:active):active {
.comp-leaf.cirru-focused {
opacity: 1;
}


@keyframes border-blinking {
0% {
border-color: #888;
}

40% {
border-color: #fff;
}
60% {
border-color: #fff;
}

100% {
border-color: #888;
}
}
36 changes: 32 additions & 4 deletions calcit.cirru

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions compact.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@
sorted-children $ -> (:data expr) (.to-list) (.sort-by first)
list->
{} (:tab-index 0)
:class-name $ str-spaced "\"comp-expr" (base-style-expr theme) (if focused? |cirru-focused |)
:class-name $ str-spaced "\"comp-expr" style-expr (base-style-expr theme) (if focused? |cirru-focused |)
:style $ decide-expr-theme expr (includes? others coord) focused? focus-in? tail? layout-mode (count coord) depth theme
:on $ if readonly?
{} $ :click
Expand Down Expand Up @@ -962,6 +962,11 @@
true $ do
; println |Keydown $ :key-code e
on-window-keydown event d! $ {} (:name :editor)
|style-expr $ %{} :CodeEntry (:doc |)
:code $ quote
defstyle style-expr $ {}
"\"&" $ {}
"\"&.cirru-focused" $ {} (:animation "\"border-blinking 1s ease infinite normal")
:ns $ %{} :CodeEntry (:doc |)
:code $ quote
ns app.comp.expr $ :require
Expand All @@ -978,6 +983,7 @@
app.util.dom :refer $ do-copy-logics!
bisection-key.util :refer $ get-min-key get-max-key
app.schema :refer $ CirruLeaf CirruExpr
respo.css :refer $ defstyle
|app.comp.file-replacer $ %{} :FileEntry
:defs $ {}
|comp-file-replacer $ %{} :CodeEntry (:doc |)
Expand Down Expand Up @@ -3017,7 +3023,6 @@
do
wss-send! sid $ :: :patch changes
swap! *client-caches assoc sid new-store
new-twig-loop!
|transform-compact-to-calcit! $ %{} :CodeEntry (:doc |)
:code $ quote
defn transform-compact-to-calcit! () $ let
Expand Down Expand Up @@ -3057,7 +3062,7 @@
"\"node:http" :refer $ createServer
"\"node:fs" :refer $ readFile
ws-edn.server :refer $ wss-serve! wss-send! wss-each!
recollect.twig :refer $ clear-twig-caches! new-twig-loop!
recollect.twig :refer $ clear-twig-caches!
recollect.diff :refer $ diff-twig
app.twig.container :refer $ twig-container
app.util.env :refer $ check-version!
Expand Down
4 changes: 2 additions & 2 deletions package.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
:dependencies $ {}
|calcit-lang/lilac |main
|calcit-lang/memof |main
|Respo/respo.calcit |main
|Respo/respo.calcit |0.16.2
|Respo/respo-ui.calcit |main
|Respo/respo-markdown.calcit |main
|calcit-lang/recollect |main
|calcit-lang/bisection-key |main
|Respo/respo-message.calcit |main
|Respo/respo-feather.calcit |main
|Respo/alerts.calcit |0.9.2
|Respo/alerts.calcit |main
|mvc-works/ws-edn.calcit |main
|Cumulo/cumulo-util.calcit |main
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
"bottom-tip": "^0.1.5",
"feather-icons": "^4.29.1",
"url-parse": "^1.5.10",
"vite": "^4.4.11"
"vite": "^5.0.0"
},
"dependencies": {
"@calcit/procs": "^0.8.8",
"@calcit/procs": "^0.8.9",
"chalk": "^5.3.0",
"dayjs": "^1.11.10",
"gaze": "^1.1.3",
"latest-version": "^7.0.0",
"md5": "^2.3.0",
"nanoid": "^5.0.1",
"nanoid": "^5.0.3",
"ws": "^8.14.2"
}
}
Loading

0 comments on commit 5d53c84

Please sign in to comment.