Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ To add a component :
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";
</style>
```
2. You can now add this component to a page by using `import ComponentName from '../../src/components/ComponentName.vue'` in the `<script setup>`, and using it with the `<ComponentName/>` tag inside the html.
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="">
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand Down
13 changes: 7 additions & 6 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"deploy": "npm run build && npx gh-pages -d dist"
},
"dependencies": {
"help": "^3.0.2",
"vue": "^3.2.13"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="">
<html lang="en">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand Down
4 changes: 2 additions & 2 deletions src/about/about-page.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import AboutExplanatoryText from '../../src/components/AboutExplanatoryText.vue'
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";

template {
color: $text;
color: base.$text;
}

h1 {
Expand Down
4 changes: 2 additions & 2 deletions src/assets/main.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import './base.scss';
@use 'base.scss';

#app {
margin: 0 auto;
Expand All @@ -8,7 +8,7 @@
a,
.green {
text-decoration: none;
color: $secondary;
color: base.$secondary;
transition: 0.4s;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/AboutExplanatoryText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";

p {
text-align: center;
Expand Down
4 changes: 2 additions & 2 deletions src/components/AboutOrganizationalChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const mentors = [
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";

h2 {
font-weight: 600;
Expand All @@ -56,7 +56,7 @@ h2 {
width: max-content;
margin: 15px auto;

border-bottom: 4px solid $blue;
border-bottom: 4px solid base.$blue;
}

.category {
Expand Down
18 changes: 9 additions & 9 deletions src/components/AboutSubteams.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ document.addEventListener("DOMContentLoaded", function () {
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";

$grid-columns: 3;
$grid-rows: 3;
Expand Down Expand Up @@ -142,7 +142,7 @@ $grid-rows: 3;
width: max-content;
margin: 15px auto;

border-bottom: 4px solid $blue;
border-bottom: 4px solid base.$blue;
}

.programming {
Expand Down Expand Up @@ -179,33 +179,33 @@ $grid-rows: 3;
display: flex;
max-height: 20%;
height: 100%;
background-color: $primary;
color: $text;
background-color: base.$primary;
color: base.$text;
align-items: center;
justify-content: center;

h3 {
width: 100%;
color: $blue;
color: base.$blue;
cursor: pointer;
text-align: center;
padding: calc(4vh - 12px) 0;
margin: 0;

.arrow {
color: $accent;
color: base.$accent;
margin-left: 5px;
}
}

h3:hover {
color: $accent;
color: base.$accent;
font-weight: 1000;
}
}

.subteamExplanation {
background-color: $primary;
background-color: base.$primary;
max-height: 0px;
height: 100%;
overflow: hidden;
Expand All @@ -228,7 +228,7 @@ $grid-rows: 3;
flex-flow: column nowrap;
justify-content: flex-end;
transition: 0.5s ease-in-out;
border: 5px solid $primary;
border: 5px solid base.$primary;

* {
transition: inherit;
Expand Down
34 changes: 17 additions & 17 deletions src/components/BaseFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ export default {
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";

main {
position: relative;
Expand All @@ -133,7 +133,7 @@ h2 {

hr {
border-width: 0px;
border-top: 1px solid $primary;
border-top: 1px solid base.$primary;
width: 50vw;
margin: 10px auto;
}
Expand All @@ -146,22 +146,22 @@ h5 {

a {
font-weight: 500;
color: $accent;
color: base.$accent;
padding: 5px;
border-radius: 10px;
}

a:hover {
background-color: $accent;
background-color: base.$accent;
color: white;
}
}

footer {
position: relative;
z-index: 1;
outline: 1px solid $primary;
background-color: $background;
outline: 1px solid base.$primary;
background-color: base.$background;
padding: 25px;
margin: 25px 0px 25px;
display: grid;
Expand All @@ -188,10 +188,10 @@ footer {
h1 {
font-size: 32px;
line-height: 1.5;
color: $text;
color: base.$text;

span {
background-color: $accent;
background-color: base.$accent;
border-radius: 8vh;
padding: 5px 0.6em;
color: white;
Expand Down Expand Up @@ -252,11 +252,11 @@ footer {
display: block;

a:hover {
background-color: rgba($secondary, $alpha: 0.2);
background-color: rgba(base.$secondary, $alpha: 0.2);
}

li {
color: $secondary;
color: base.$secondary;
font-weight: 300;
margin-left: 0px;
clear: both;
Expand All @@ -278,20 +278,20 @@ footer {
display: flex;
justify-content: left;
align-items: center;
outline: 0px solid $primary;
outline: 0px solid base.$primary;
position: relative;
z-index: 2;
}

a:hover {
transition: all 0.5s ease;
background-color: rgba($secondary, $alpha: 0.2);
outline: 1px solid $secondary;
background-color: rgba(base.$secondary, $alpha: 0.2);
outline: 1px solid base.$secondary;
}

a.active, a.active>li{
color: white;
background-color: $secondary;
background-color: base.$secondary;
}
}
}
Expand Down Expand Up @@ -333,7 +333,7 @@ footer {
a {
position: relative;
height: auto;
color: $text;
color: base.$text;
width: 70px;
display: flex;
align-items: center;
Expand All @@ -342,8 +342,8 @@ footer {

a:hover {
span {
background-color: rgba($secondary, $alpha: 0.2);
outline: 1px solid $secondary;
background-color: rgba(base.$secondary, $alpha: 0.2);
outline: 1px solid base.$secondary;
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/BaseHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import BaseNav from './BaseNav.vue'
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";

header {
display: grid;
Expand Down Expand Up @@ -60,11 +60,11 @@ header a {
height: min-content;
width: min-content;
line-height: 1;
color: rgba($text, 0.9);
color: rgba(base.$text, 0.9);
}

.icons a:hover {
color: rgba($secondary, $alpha: 0.6);
color: rgba(base.$secondary, $alpha: 0.6);
}

h1 {
Expand Down
18 changes: 9 additions & 9 deletions src/components/BaseNav.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default {
</template>

<style scoped lang="scss">
@import "../assets/base.scss";
@use "../assets/base.scss";

.openButton {
display: none;
Expand Down Expand Up @@ -98,7 +98,7 @@ nav {
display: flex;
justify-content: center;
align-items: center;
outline: 0px solid $primary;
outline: 0px solid base.$primary;
position: relative;
z-index: 2;
}
Expand All @@ -111,13 +111,13 @@ nav {

a:hover {
transition: all 0.5s ease;
background-color: rgba($secondary, $alpha: 0.2);
outline: 1px solid $secondary;
background-color: rgba(base.$secondary, $alpha: 0.2);
outline: 1px solid base.$secondary;
}

a.active {
color: white;
background-color: $secondary;
background-color: base.$secondary;
}
}

Expand All @@ -132,7 +132,7 @@ nav {

ul {
height: auto;
background: $grey;
background: base.$grey;
padding-top: 40px;
transform: translateY(-40px);
border-radius: 10px;
Expand Down Expand Up @@ -169,7 +169,7 @@ ul li ul:focus {
top: 10px;
right: 10px;
font-size: 24px;
background-color: $background;
background-color: base.$background;
width: 40px;
height: 40px;
border-radius: 50%;
Expand All @@ -185,7 +185,7 @@ ul li ul:focus {
top: 0px;
right: 0px;
padding: 8px 20px;
background-color: $background;
background-color: base.$background;
z-index: 3;
transform: translateX(110%);

Expand Down Expand Up @@ -215,7 +215,7 @@ ul li ul:focus {
transform: translate(0, 0);
background-color: transparent;
font-size: 90%;
color: $secondary;
color: base.$secondary;

li {
padding: 0;
Expand Down
Loading