Skip to content

Commit 9d89dd8

Browse files
authored
Merge pull request #23 from calcit-lang/upgrade-ui
upgrade ui and use snippet component
2 parents db06c19 + f32acd4 commit 9d89dd8

File tree

7 files changed

+293
-393
lines changed

7 files changed

+293
-393
lines changed

.github/workflows/upload.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ jobs:
1919

2020
- uses: supplypike/setup-bin@v3
2121
with:
22-
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.13/cr'
22+
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.14/cr'
2323
name: 'cr'
24-
version: '0.8.13'
24+
version: '0.8.14'
2525

2626
- uses: supplypike/setup-bin@v3
2727
with:
28-
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.13/caps'
28+
uri: 'https://github.com/calcit-lang/calcit/releases/download/0.8.14/caps'
2929
name: 'caps'
30-
version: '0.8.13'
30+
version: '0.8.14'
3131
- name: "compiles to js"
3232
run: >
3333
caps --ci && cr --emit-js --once

assets/main.css

Lines changed: 0 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -6,70 +6,13 @@
66
src: url('./Federo-Regular.ttf');
77
}
88

9-
109
.tile {
1110
background-image: url('./calcit-tile.png');
1211
background-size: 163px 395px;
1312
}
1413

15-
body {
16-
margin: 0;
17-
overscroll-behavior-y: none;
18-
}
19-
20-
body * {
21-
flex-shrink: 0;
22-
box-sizing: border-box;
23-
}
24-
25-
::-webkit-scrollbar {
26-
width: 4px;
27-
height: 4px;
28-
}
29-
30-
::-webkit-scrollbar-track {
31-
background-color: hsla(0,0%,100%);
32-
}
33-
34-
::-webkit-scrollbar-thumb {
35-
background-color: hsla(200,100%,76%,0.8);
36-
}
37-
38-
::-webkit-scrollbar-corner {
39-
background-color: transparent;
40-
}
41-
42-
::-webkit-resizer {
43-
background-color: transparent;
44-
}
45-
4614
.md-block .md-p {
4715
font-size: 16px;
4816
margin: 24px 0px;
4917
line-height: 25px;
5018
}
51-
52-
.md-block pre.md-code-block {
53-
background-color: hsla(0, 0%, 98%, 0.6);
54-
border: 1px solid hsla(0, 0%, 90%, 0.9);
55-
overflow: auto;
56-
padding: 8px 8px;
57-
line-height: 21px;
58-
border-radius: 4px;
59-
font-size: 13px;
60-
61-
font-family: Menlo, Roboto Mono, Ubuntu Mono, Consolas, monospace;
62-
}
63-
64-
.md-block .md-p code {
65-
background-color: hsla(0, 0%, 98%, 0.8);
66-
border: 1px solid hsla(0, 0%, 90%, 0.9);
67-
font-size: 14px;
68-
padding: 2px 8px;
69-
border-radius: 4px;
70-
font-size: 13px;
71-
white-space: pre;
72-
}
73-
.md-block .md-p a {
74-
white-space: pre;
75-
}

calcit.cirru

Lines changed: 26 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

compact.cirru

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
state $ either (:data states)
2828
{} $ :content "\""
2929
div
30-
{} $ :class-name css/global
30+
{} $ :class-name (str-spaced css/preset css/global)
3131
comp-bg
3232
div
3333
{} $ :class-name style-content
@@ -147,12 +147,10 @@
147147
[] (&{} :name :tag-match :title "|Pattern matching") (&{} :name :component :title |Component) (&{} :name :persistent-data :title "|Persistent data") (&{} :name :pipeline :title "|Pipeline macro")
148148
fn (info d!)
149149
d! cursor $ :name info
150-
pre $ {}
151-
:class-name $ str-spaced css/expand style-snippet
152-
:style $ {} (:min-width 300)
153-
:innerHTML $ cirru-color/generateHtml
154-
trim $ pick-demo state
155-
, "\"defcomp comp-link (link)\n tag-match link $ \n :link title sub-title url\n div ({})\n a $ {} (:href url)\n :inner-text title\n :target \"\\\"_blank\"\n :class-name style-display-link\n =< 8 nil\n <> sub-title $ str-spaced css/font-fancy style-sub-title\n"
150+
comp-cirru-snippet
151+
trim $ pick-demo state
152+
{} $ :style
153+
{} (:flex 1) (:margin "\"12px 0px")
156154
|comp-visual $ %{} :CodeEntry (:doc |)
157155
:code $ quote
158156
defcomp comp-visual () $ div ({})
@@ -245,14 +243,6 @@
245243
:code $ quote
246244
defstyle style-secondary-title $ {}
247245
"\"&" $ {} (:font-size 16) (:line-height "\"24px")
248-
|style-snippet $ %{} :CodeEntry (:doc |)
249-
:code $ quote
250-
defstyle style-snippet $ {}
251-
"\"&" $ {} (:padding "\"8px 12px") (:border-radius "\"8px")
252-
:background-color $ hsl 0 0 100
253-
:border $ str "\"1px solid " (hsl 0 0 90)
254-
:line-height "\"24px"
255-
:overflow :auto
256246
|style-sub-title $ %{} :CodeEntry (:doc |)
257247
:code $ quote
258248
defstyle style-sub-title $ {}
@@ -271,7 +261,7 @@
271261
respo.css :refer $ defstyle
272262
respo-ui.css :as css
273263
app.schema :refer $ doc-features doc-columns
274-
respo-ui.comp :refer $ comp-tabs
264+
respo-ui.comp :refer $ comp-tabs comp-cirru-snippet
275265
|app.config $ %{} :FileEntry
276266
:defs $ {}
277267
|cdn? $ %{} :CodeEntry (:doc |)

package.cirru

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
|Respo/respo.calcit |main
77
|Respo/reel.calcit |main
88
|Respo/respo-markdown.calcit |main
9-
|Respo/respo-ui.calcit |main
9+
|Respo/respo-ui.calcit |0.5.15

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"dependencies": {
3-
"@calcit/procs": "^0.8.13",
4-
"cirru-color": "^0.2.3"
3+
"@calcit/procs": "^0.8.14",
4+
"cirru-color": "^0.2.4",
5+
"copy-text-to-clipboard": "^3.2.0"
56
},
67
"devDependencies": {
78
"bottom-tip": "^0.1.5",
8-
"vite": "^5.0.4"
9+
"vite": "^5.0.11"
910
},
1011
"version": "0.0.1"
1112
}

0 commit comments

Comments
 (0)