Skip to content

Commit 79a9ff3

Browse files
authored
Merge pull request #142 from incluud/feature/ux-improvements
Feature/ux improvements
2 parents c8ed30d + 76d552d commit 79a9ff3

File tree

114 files changed

+3157
-1224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3157
-1224
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,7 @@ yarn-error.log*
2727
package-lock.json
2828

2929
# astro build files
30-
.astro
30+
.astro
31+
32+
# cursor rules
33+
.cursor/rules

README.md

Lines changed: 22 additions & 13 deletions

astro.config.mjs

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
import { defineConfig } from 'astro/config'
22
import mdx from '@astrojs/mdx'
3-
import tailwind from '@astrojs/tailwind'
43
import compress from 'astro-compress'
54
import icon from 'astro-icon'
5+
import tailwindcss from '@tailwindcss/vite'
6+
import { fileURLToPath } from 'url'
7+
import path from 'path'
68

79
// https://astro.build/config
810
export default defineConfig({
911
compressHTML: true,
10-
site: 'https://accessible-astro.netlify.app',
11-
integrations: [
12-
mdx(),
13-
icon(),
14-
tailwind({
15-
applyBaseStyles: false,
16-
}),
17-
compress(),
18-
],
12+
site: 'https://accessible-astro-starter.incluud.dev',
13+
integrations: [mdx(), icon(), compress()],
1914
vite: {
2015
css: {
2116
preprocessorOptions: {
@@ -26,5 +21,18 @@ export default defineConfig({
2621
},
2722
},
2823
},
24+
plugins: [tailwindcss()],
25+
resolve: {
26+
alias: {
27+
'@components': fileURLToPath(new URL('./src/components', import.meta.url)),
28+
'@layouts': fileURLToPath(new URL('./src/layouts', import.meta.url)),
29+
'@assets': fileURLToPath(new URL('./src/assets', import.meta.url)),
30+
'@content': fileURLToPath(new URL('./src/content', import.meta.url)),
31+
'@pages': fileURLToPath(new URL('./src/pages', import.meta.url)),
32+
'@public': fileURLToPath(new URL('./public', import.meta.url)),
33+
'@post-images': fileURLToPath(new URL('./public/posts', import.meta.url)),
34+
'@project-images': fileURLToPath(new URL('./public/projects', import.meta.url)),
35+
},
36+
},
2937
},
3038
})

package.json

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "accessible-astro-starter",
33
"description": "An Accessible Starter Theme for Astro including several accessibility features and tools to help you build faster.",
4-
"version": "3.4.1",
4+
"version": "4.0.0",
55
"author": "Incluud",
66
"license": "MIT",
77
"homepage": "https://accessible-astro.netlify.app/",
@@ -22,7 +22,8 @@
2222
"responsive",
2323
"ui-library",
2424
"ui-components",
25-
"blog"
25+
"blog",
26+
"portfolio"
2627
],
2728
"repository": {
2829
"type": "git",
@@ -32,28 +33,28 @@
3233
"url": "https://github.com/incluud/accessible-astro-starter/issues"
3334
},
3435
"devDependencies": {
35-
"@astrojs/mdx": "^4.0.8",
36-
"@astrojs/partytown": "^2.1.3",
37-
"@astrojs/tailwind": "^6.0.0",
38-
"@iconify-json/ion": "^1.2.1",
39-
"@iconify-json/mdi": "^1.2.1",
40-
"@typescript-eslint/eslint-plugin": "^6.21.0",
41-
"@typescript-eslint/parser": "^6.21.0",
42-
"astro": "^5.3.0",
43-
"astro-compress": "^2.3.5",
44-
"astro-icon": "^1.1.4",
45-
"eslint": "^8.57.0",
46-
"eslint-plugin-astro": "^0.31.4",
36+
"@astrojs/mdx": "^4.2.5",
37+
"@astrojs/partytown": "^2.1.4",
38+
"@iconify-json/lucide": "^1.2.39",
39+
"@typescript-eslint/eslint-plugin": "^8.31.0",
40+
"@typescript-eslint/parser": "^8.31.0",
41+
"astro": "^5.7.5",
42+
"astro-compress": "^2.3.8",
43+
"astro-icon": "^1.1.5",
44+
"eslint": "^9.0.0",
45+
"eslint-plugin-astro": "^1.3.1",
4746
"eslint-plugin-jsx-a11y": "^6.10.2",
48-
"prettier": "^3.4.1",
47+
"prettier": "^3.5.3",
4948
"prettier-plugin-astro": "^0.14.1",
5049
"prettier-plugin-css-order": "^2.1.2",
51-
"prettier-plugin-tailwindcss": "^0.6.9",
52-
"sass": "^1.81.0",
50+
"prettier-plugin-tailwindcss": "^0.6.11",
51+
"sanitize-html": "^2.16.0",
52+
"sass": "^1.87.0",
5353
"svgo": "^3.3.2",
54-
"tailwindcss": "^3.4.15"
54+
"tailwindcss": "^4.1.4"
5555
},
5656
"dependencies": {
57-
"accessible-astro-components": "^4.1.0"
57+
"@tailwindcss/vite": "^4.1.4",
58+
"accessible-astro-components": "^4.1.1"
5859
}
5960
}
24.1 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

public/fonts/OFL.txt

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
Copyright (c) 2020, Braille Institute of America, Inc. (https://www.brailleinstitute.org/),
2+
with Reserved Font Names: "ATKINSON" and "HYPERLEGIBLE".
3+
4+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
5+
This license is copied below, and is also available with a FAQ at:
6+
https://openfontlicense.org
7+
8+
9+
-----------------------------------------------------------
10+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
11+
-----------------------------------------------------------
12+
13+
PREAMBLE
14+
The goals of the Open Font License (OFL) are to stimulate worldwide
15+
development of collaborative font projects, to support the font creation
16+
efforts of academic and linguistic communities, and to provide a free and
17+
open framework in which fonts may be shared and improved in partnership
18+
with others.
19+
20+
The OFL allows the licensed fonts to be used, studied, modified and
21+
redistributed freely as long as they are not sold by themselves. The
22+
fonts, including any derivative works, can be bundled, embedded,
23+
redistributed and/or sold with any software provided that any reserved
24+
names are not used by derivative works. The fonts and derivatives,
25+
however, cannot be released under any other type of license. The
26+
requirement for fonts to remain under this license does not apply
27+
to any document created using the fonts or their derivatives.
28+
29+
DEFINITIONS
30+
"Font Software" refers to the set of files released by the Copyright
31+
Holder under this license and clearly marked as such. This may
32+
include source files, build scripts and documentation.
33+
34+
"Reserved Font Names" refers to any names specified as such after the
35+
copyright statement.
36+
37+
"Original Version" refers to the collection of Font Software components as
38+
distributed by the Copyright Holder.
39+
40+
"Modified Version" refers to any derivative made by adding to, deleting,
41+
or substituting -- in part or in whole -- any of the components of the
42+
Original Version, by changing formats or by porting the Font Software to a
43+
new environment.
44+
45+
"Author" refers to any designer, engineer, programmer, technical writer or other
46+
person who contributed to the Font Software.
47+
48+
PERMISSION & CONDITIONS
49+
VP/#68933639.2
50+
Permission is hereby granted, free of charge, to any person obtaining a copy of the Font
51+
Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and
52+
unmodified copies of the Font Software, subject to the following conditions:
53+
54+
1) Neither the Font Software nor any of its individual components, in Original or
55+
Modified Versions, may be sold by itself.
56+
57+
2) Original or Modified Versions of the Font Software may be bundled, redistributed
58+
and/or sold with any software, provided that each copy contains the above copyright
59+
notice and this license. These can be included either as stand-alone text files, human-
60+
readable headers or in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font Names unless
64+
explicit written permission is granted by the Copyright Holder. This restriction only
65+
applies to the primary font name as presented to the users.
66+
67+
4) The name of the Copyright Holder or the Author(s) of the Font Software shall not be
68+
used to promote, endorse or advertise any Modified Version, except to acknowledge the
69+
contributions of the Copyright Holder and the Author(s) or with their explicit written
70+
permission.
71+
72+
5) The Font Software, modified or unmodified, in part or in whole, must be distributed
73+
entirely under this license, and must not be distributed under any other license. The
74+
requirement for fonts to remain under this license does not apply to any document
75+
created using the Font Software.
76+
77+
TERMINATION
78+
This license becomes null and void if any of the above conditions are not met.
79+
80+
DISCLAIMER
81+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
82+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
83+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
84+
NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO
85+
EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR
86+
OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
87+
CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
88+
OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
89+
SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.

public/fonts/OpenSans-Bold.woff

-76.3 KB
Binary file not shown.

public/fonts/OpenSans-Bold.woff2

-56.8 KB
Binary file not shown.

public/fonts/OpenSans-ExtraBold.woff

-76.9 KB
Binary file not shown.

public/fonts/OpenSans-ExtraBold.woff2

-57.1 KB
Binary file not shown.

public/fonts/OpenSans-Italic.woff

-82.1 KB
Binary file not shown.

public/fonts/OpenSans-Italic.woff2

-61.4 KB
Binary file not shown.

public/fonts/OpenSans-Regular.woff

-78.3 KB
Binary file not shown.

public/fonts/OpenSans-Regular.woff2

-58.7 KB
Binary file not shown.

public/posts/post-image-1.png

130 KB

public/posts/post-image-2.png

117 KB

public/posts/post-image-3.png

129 KB

public/posts/post-image-4.png

126 KB

public/posts/post-image-5.png

140 KB

public/posts/post-image-6.png

123 KB

public/projects/project-image-1.png

130 KB

public/projects/project-image-2.png

117 KB

public/projects/project-image-3.png

129 KB

public/projects/project-image-4.png

126 KB

public/projects/project-image-5.png

140 KB

public/projects/project-image-6.png

123 KB

public/social-preview-image.png

3.67 KB
130 KB
117 KB
129 KB
126 KB
140 KB
123 KB
130 KB
117 KB
129 KB
126 KB
140 KB
123 KB

src/assets/scss/base/_breakpoint.scss

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,23 @@
1-
@use 'sass:map';
2-
3-
// | -------------------------------------------------------------
4-
// | Breakpoint
5-
// | -------------------------------------------------------------
6-
71
$breakpoints: (
82
'default': 0,
9-
'small': 24em,
10-
'medium': 48em,
11-
'large': 75em,
3+
'xs': 320px,
4+
's': 480px,
5+
'm': 768px,
6+
'l': 1024px,
7+
'xl': 1280px,
8+
'2xl': 1536px,
129
) !default;
1310

1411
@mixin breakpoint($breakpoint) {
15-
@if map.has-key($breakpoints, $breakpoint) {
16-
@media (min-width: map.get($breakpoints, $breakpoint)) {
12+
@if map-has-key($breakpoints, $breakpoint) {
13+
@media (min-width: map-get($breakpoints, $breakpoint)) {
1714
@content;
1815
}
1916
} @else if (type_of($breakpoint) == number) {
20-
@media (min-width: $breakpoint+'px') {
17+
@media (min-width: #{$breakpoint}px) {
2118
@content;
2219
}
2320
} @else {
24-
@error "Not a correct value, check _base-breakpoints for available values.";
21+
@error "Not a correct value";
2522
}
2623
}

0 commit comments

Comments
 (0)