Skip to content

Commit

Permalink
Merge pull request #17 from Cumulo/css-preset
Browse files Browse the repository at this point in the history
upgrade calcit; moving to css-preset
  • Loading branch information
NoEgAm authored Dec 13, 2023
2 parents 3f4e462 + fd098fd commit dcc3f2d
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 53 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/upload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:

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

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

- run: caps --ci && cr --entry server --emit-ir -1

Expand Down
30 changes: 0 additions & 30 deletions assets/main.css

This file was deleted.

1 change: 1 addition & 0 deletions calcit.cirru

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

2 changes: 1 addition & 1 deletion compact.cirru
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
{}
router-data $ :data router
div
{} $ :class-name (str-spaced css/global css/fullscreen css/column)
{} $ :class-name (str-spaced css/preset css/global css/fullscreen css/column)
comp-navigation (:logged-in? store) (:count store)
if (:logged-in? store)
case-default (:name router) (<> router)
Expand Down
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"/>
<link rel="stylesheet" type="text/css" href="https://cdn.tiye.me/favored-fonts/main-fonts.css">
<link rel="stylesheet" type="text/css" href="./assets/main.css">
</head>

<body>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"@calcit/procs": "^0.8.13"
"@calcit/procs": "^0.8.14"
},
"scripts": {
"compile-page": "cr --emit-js --once",
Expand All @@ -10,7 +10,7 @@
"devDependencies": {
"bottom-tip": "^0.1.5",
"url-parse": "^1.5.10",
"vite": "^5.0.4"
"vite": "^5.0.5"
},
"version": "0.0.1"
}
30 changes: 15 additions & 15 deletions yarn.lock

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

0 comments on commit dcc3f2d

Please sign in to comment.