Skip to content

Commit

Permalink
😞 proffesionalize website (a little more)
Browse files Browse the repository at this point in the history 
remove falling stars
fixed bulma title text based on scheme
update packages
  • Loading branch information
@csc530
csc530 committed Aug 20, 2024
1 parent 207248f commit 15521a5
Show file tree
Hide file tree
Showing 15 changed files with 216 additions and 253 deletions.
Binary file modified bun.lockb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<head>
<meta charset="UTF-8">
<link href="/favicon.ico" rel="icon">
<link href="/favicon.png" type="image/png" rel="icon">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <link href="https://cdn.jsdelivr.net/npm/bulma/css/bulma.min.css" rel="stylesheet"> -->
<!-- <link href="https://unpkg.com/@catppuccin/palette/css/catppuccin.css" rel="stylesheet"> -->
Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,33 @@
"@catppuccin/palette": "^1.2.0",
"@vercel/analytics": "^1.3.1",
"@vercel/speed-insights": "^1.0.12",
"@vueuse/core": "^10.11.0",
"@vueuse/core": "^10.11.1",
"bulma": "^1.0.2",
"consola": "^3.2.3",
"devicon": "^2.16.0",
"i": "^0.3.7",
"pinia": "^2.2.0",
"pinia": "^2.2.2",
"sass": "^1.77.8",
"sass-embedded": "^1.77.8",
"vue": "^3.4.35",
"vue-router": "^4.4.2"
"vue": "^3.4.38",
"vue-router": "^4.4.3"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.10.4",
"@tsconfig/node20": "^20.1.4",
"@types/bun": "latest",
"@types/node": "^20.14.14",
"@types/node": "^20.16.1",
"@vitejs/plugin-vue": "^5.1.2",
"@vitejs/plugin-vue-jsx": "^3.1.0",
"@vue/eslint-config-typescript": "^13.0.0",
"@vue/tsconfig": "^0.5.1",
"eslint": "^8.57.0",
"eslint-plugin-vue": "^9.27.0",
"npm-run-all2": "^6.2.2",
"vite": "^5.3.5",
"vite": "^5.4.2",
"vite-plugin-checker": "^0.7.2",
"vite-plugin-vercel": "^8.0.0",
"vite-plugin-vue-devtools": "^7.3.7",
"vite-plugin-vercel": "^8.0.1",
"vite-plugin-vue-devtools": "^7.3.8",
"vue-tsc": "^2.0.29"
},
"peerDependencies": {
Expand Down
Binary file added public/favicon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 4 additions & 6 deletions src/App.vue
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<template>
<!-- <MatrixRain /> -->
<header>
<TheNav />
</header>
Expand All @@ -17,11 +18,8 @@
</style>

<script setup lang="ts">
import { RouterView } from "vue-router";
import TheNav from "@/components/TheNav.vue";
import TheFoot from "@/components/TheFoot.vue";
import { SpeedInsights } from "@vercel/speed-insights/vue"
import { useFavicon } from "@vueuse/core";
import favicon from "./assets/images/favicon.ico"
useFavicon(favicon, { rel: 'icon' })
import TheNav from "@/components/TheNav.vue";
import { SpeedInsights } from "@vercel/speed-insights/vue";
import { RouterView } from "vue-router";
</script>
111 changes: 61 additions & 50 deletions src/assets/cat.scss
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,28 @@
@use "@catppuccin/palette/scss/catppuccin";

@use "sass:map";
@use "sass:color";

@use "bulma/sass" as bulma;
@use "bulma/sass/utilities/css-variables" as cv;
@use "bulma/sass/themes/setup";
@use "bulma/sass/themes/setup" as setup;
@use "bulma/sass/utilities/derived-variables" as dv;

$flavour: map-get(
$map: catppuccin.$palette,
$key: "frappe"
);

// colours
$orange: map-get($flavour, "peach");
$yellow: map-get($flavour, "yellow");
$green: map-get($flavour, "green");
$turquoise: map-get($flavour, "teal");
$cyan: map-get($flavour, "sky");
$blue: map-get($flavour, "blue");
$purple: map-get($flavour, "lavender");
$pink: map-get($flavour, "pink");
$red: map-get($flavour, "red");
// $flavour: map-get($map: catppuccin.$palette,
// $key: "frappe"
// );

// // colours
// $orange: map-get($flavour, "peach");
// $yellow: map-get($flavour, "yellow");
// $green: map-get($flavour, "green");
// $turquoise: map-get($flavour, "teal");
// $cyan: map-get($flavour, "sky");
// $blue: map-get($flavour, "blue");
// $purple: map-get($flavour, "lavender");
// $pink: map-get($flavour, "pink");
// $red: map-get($flavour, "red");

//@use "bulma/sass" as bulma
// with
Expand Down Expand Up @@ -71,43 +75,50 @@ $red: map-get($flavour, "red");
// );

@each $flavour, $colours in catppuccin.$palette {
$colourMap: (
"orange": map-get($map: $colours, $key: "peach"),
"yellow": map-get($map: $colours, $key: "yellow"),
"green": map-get($map: $colours, $key: "green"),
"turquoise": map-get($colours, "teal"),
"cyan": map-get($map: $colours, $key: "sky"),
"blue": map-get($map: $colours, $key: "blue"),
"purple": map-get($map: $colours, $key: "lavender"),
"pink": map-get($map: $colours, $key: "pink"),
"red": map-get($map: $colours, $key: "red"),
"text": map-get($map: $colours, $key: "text"),
"background": map-get($map: $colours, $key: "base"),
"black": map-get($map: $colours, $key: "crust"),
"black-bis": map-get($map: $colours, $key: "mantle"),
"black-ter": map-get($map: $colours, $key: "base"),
"grey-darker": map-get($map: $colours, $key: "surface0"),
"grey-dark": map-get($map: $colours, $key: "surface1"),
"grey": map-get($map: $colours, $key: "surface2"),
"grey-light": map-get($map: $colours, $key: "overlay0"),
"grey-lighter": map-get($map: $colours, $key: "overlay1"),
"grey-lightest": map-get($map: $colours, $key: "overlay2"),
"white-ter": map-get($map: $colours, $key: "subtext0"),
"white-bis": map-get($map: $colours, $key: "subtext1"),
"white": map-get($map: $colours, $key: "text"),
//"body-background-color": map-get($colours, "crust"),
// things that were not "auto" overridden in the css vars
"scheme-main": map-get($colours, "base"),
"scheme-main-bis": map-get($colours, "mantle"),
"scheme-main-ter": map-get($colours, "crust"),
"scheme-invert": map-get($colours, "text"),
"scheme-invert-bis": map-get($colours, "subtext1"),
"scheme-invert-ter": map-get($colours, "subtext0"),
"text-strong": map-get($map: $colours, $key: "text"),
"scheme": map-get($colours, "base"),
);

@include cv.bulma-theme($name: $flavour) {
@include cv.register-vars(
(
"orange": map-get($map: $colours, $key: "peach"),
"yellow": map-get($map: $colours, $key: "yellow"),
"green": map-get($map: $colours, $key: "green"),
"turquoise": map-get($colours, "teal"),
"cyan": map-get($map: $colours, $key: "sky"),
"blue": map-get($map: $colours, $key: "blue"),
"purple": map-get($map: $colours, $key: "lavender"),
"pink": map-get($map: $colours, $key: "pink"),
"red": map-get($map: $colours, $key: "red"),
"text": map-get($map: $colours, $key: "text"),
"background": map-get($map: $colours, $key: "base"),
"black": map-get($map: $colours, $key: "crust"),
"black-bis": map-get($map: $colours, $key: "mantle"),
"black-ter": map-get($map: $colours, $key: "base"),
"grey-darker": map-get($map: $colours, $key: "surface0"),
"grey-dark": map-get($map: $colours, $key: "surface1"),
"grey": map-get($map: $colours, $key: "surface2"),
"grey-light": map-get($map: $colours, $key: "overlay0"),
"grey-lighter": map-get($map: $colours, $key: "overlay1"),
"grey-lightest": map-get($map: $colours, $key: "overlay2"),
"white-ter": map-get($map: $colours, $key: "subtext0"),
"white-bis": map-get($map: $colours, $key: "subtext1"),
"white": map-get($map: $colours, $key: "text"),
@include cv.register-vars($colourMap);
//// Then, setup the new theme.
//@each $name, $color in dv.$colors {
// @include cv.generate-on-scheme-colors($name, map.get($colourMap, $name), map-get($colours, "base"));
//}
//@include setup.setup-theme();

//"body-background-color": map-get($colours, "crust"),
"scheme-main": map-get($colours, "base"),
"scheme-main-bis": map-get($colours, "mantle"),
"scheme-main-ter": map-get($colours, "crust"),
"scheme-invert": map-get($colours, "text"),
"scheme-invert-bis": map-get($colours, "subtext1"),
"scheme-invert-ter": map-get($colours, "subtext0"),
//"scheme": map-get($colours, "crust"),
)
);
}
}

Expand Down
13 changes: 13 additions & 0 deletions src/assets/stylesheets/sense.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,17 @@ h1, h2, h3, h4, h5, h6 {
text-transform: capitalize;
/* small caps */
font-variant: small-caps;
word-break: keep-all;
word-wrap: normal;
}
a {
text-decoration: underline 0.05em;
transition: all 2s cubic-bezier(0.47, 0, 0.745, 0.715) 0.5ms;
}
a:hover {
text-decoration: underline;
}
a:hover:has(>*:empty,svg):only-child {
text-decoration: underline;
border-bottom: solid 0.1em;
}
Loading

1 comment on commit 15521a5

@vercel
Copy link

@vercel vercel bot commented on 15521a5 Aug 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

portfolio – ./

portfolio-csc530.vercel.app
portfolio-git-master-csc530s-projects.vercel.app
portfolio-csc530s-projects.vercel.app
www.christofercousins.ca
christofercousins.ca

Please sign in to comment.