diff --git a/.eslintrc.js b/.eslintrc.js
index 0bfaaf7..a1cd9eb 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -2,16 +2,16 @@ module.exports = {
root: true,
env: {
browser: true,
- node: true
+ node: true,
},
parserOptions: {
- parser: 'babel-eslint'
+ parser: 'babel-eslint',
},
extends: [
'@nuxtjs',
'prettier',
'plugin:prettier/recommended',
- 'plugin:nuxt/recommended'
+ 'plugin:nuxt/recommended',
],
plugins: ['prettier'],
rules: {
@@ -19,6 +19,7 @@ module.exports = {
semi: ['warn', 'always'],
indent: ['warn', 2],
'no-multi-spaces': ['warn'],
- 'vue/comment-directive': 'off'
- }
+ 'vue/comment-directive': 'off',
+ 'prettier/prettier': 'warn',
+ },
};
diff --git a/assets/logos/ccv-logo.vue b/assets/logos/ccv-logo.vue
index be3fc43..bd3015c 100644
--- a/assets/logos/ccv-logo.vue
+++ b/assets/logos/ccv-logo.vue
@@ -105,18 +105,7 @@
diff --git a/assets/scss/_button.scss b/assets/scss/_button.scss
index c66db94..d5a901f 100644
--- a/assets/scss/_button.scss
+++ b/assets/scss/_button.scss
@@ -4,9 +4,21 @@
@extend .button;
border-radius: 0 !important;
font-family: $font-family-bold;
+ white-space: normal;
+ line-height: 1.2;
}
.d-button-delete {
@extend .delete;
border-radius: 0 !important;
-}
\ No newline at end of file
+}
+
+.button-nostyle {
+ background: transparent;
+ border: none;
+ cursor: pointer;
+ color: var(--color-link);
+ &:hover {
+ color: var(--color-dark);
+ }
+}
diff --git a/assets/scss/_color.scss b/assets/scss/_color.scss
index 2f0aeba..e32ed84 100644
--- a/assets/scss/_color.scss
+++ b/assets/scss/_color.scss
@@ -1,5 +1,3 @@
-@import './node_modules/bulma/bulma.sass';
-
$variants: "yellow",
"yellow-light",
"yellow-lighter",
@@ -56,3 +54,15 @@ $variants: "yellow",
@extend .has-text-grey-dark;
@extend .has-background-light;
}
+
+svg {
+ .c1 {
+ fill: var(--color-yellow);
+ }
+ .c2 {
+ fill: var(--color-green);
+ }
+ .v {
+ fill: var(--color-yellow);
+ }
+}
diff --git a/assets/scss/_footer.scss b/assets/scss/_footer.scss
deleted file mode 100644
index c078414..0000000
--- a/assets/scss/_footer.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.d-footer {
- @extend .footer;
- display: grid;
- grid-template-columns: 1fr 10fr 1fr;
- grid-template-areas:
- '. first .'
- '. second .'
- '. third .';
-}
-.d-footer-content-first {
- grid-area: first;
-}
-.d-footer-content-second {
- grid-area: second;
-}
-.d-footer-content-third {
- display: grid;
- justify-content: center;
- grid-area: third;
-}
\ No newline at end of file
diff --git a/assets/scss/_helpers.scss b/assets/scss/_helpers.scss
index 68141d8..7eb60ba 100644
--- a/assets/scss/_helpers.scss
+++ b/assets/scss/_helpers.scss
@@ -1,5 +1,3 @@
-@import "./node_modules/bulma/bulma.sass";
-
// cursor
.has-cursor-pointer {
cursor: pointer;
@@ -57,4 +55,4 @@
@include mobile {
padding-top: 2rem;
}
-}
\ No newline at end of file
+}
diff --git a/assets/scss/_navbar.scss b/assets/scss/_navbar.scss
deleted file mode 100644
index ae21bd4..0000000
--- a/assets/scss/_navbar.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@import "./node_modules/bulma/bulma.sass";
-
-.d-nav-brand {
- @extend .pr-3;
-}
-.navbar-burger {
- @include mobile {
- align-self: center;
- }
-}
-
-.navbar-start {
- font-size: 1.1em;
-}
\ No newline at end of file
diff --git a/assets/scss/disco.scss b/assets/scss/disco.scss
index 4bbd202..9d54f5a 100644
--- a/assets/scss/disco.scss
+++ b/assets/scss/disco.scss
@@ -1,10 +1,9 @@
@charset "utf-8";
@import 'variables';
-@import './node_modules/bulma/bulma.sass';
+@import '~bulma/bulma';
@import 'helpers';
-
@import 'banner';
@import 'button';
@import 'border';
@@ -12,9 +11,7 @@
@import 'color';
@import 'dialog';
@import 'expandable';
-@import 'footer';
@import 'hero';
@import 'icon';
@import 'layout';
-@import 'navbar';
@import 'typography';
diff --git a/components/ComparisonTable.vue b/components/ComparisonTable.vue
index e74367f..3aba8d8 100644
--- a/components/ComparisonTable.vue
+++ b/components/ComparisonTable.vue
@@ -19,7 +19,7 @@
:key="cat"
class="px-4 py-4"
:class="[
- ind % 2 === 0 ? 'has-background-light' : 'has-background-white'
+ ind % 2 === 0 ? 'has-background-light' : 'has-background-white',
]"
>
{{ cat | humanize }}
@@ -37,45 +37,45 @@
{{ feat.class }}
{{ feat.class }}
{{ feat.class }}
Yes
{{ feat.class }}
No
{{ feat.class }}
{{ feat.class }}
@@ -100,18 +100,18 @@ export default {
const cleanStr = str.replace(/_/g, ' ');
const upperFirst = cleanStr.charAt(0).toUpperCase() + cleanStr.slice(1);
return upperFirst;
- }
+ },
},
props: {
data: {
type: [Array, Object],
- required: true
+ required: true,
},
categories: {
type: Array,
- required: true
- }
- }
+ required: true,
+ },
+ },
};
diff --git a/components/ServiceSelection.vue b/components/ServiceSelection.vue
index cddf8a8..c2e19be 100644
--- a/components/ServiceSelection.vue
+++ b/components/ServiceSelection.vue
@@ -4,11 +4,11 @@
v-for="(s, i) in data"
:id="'field' + s.service + i"
:key="'field' + s.service + i"
- class="field service-box"
+ class="field service-box my-1 p-4"
:class="[
selectedData.includes(s.service)
? 'has-background-info'
- : 'has-background-light'
+ : 'has-background-light',
]"
>
@@ -48,34 +48,34 @@
diff --git a/components/base/BrownLogo.vue b/components/base/BrownLogo.vue
index f71b97c..15191c3 100644
--- a/components/base/BrownLogo.vue
+++ b/components/base/BrownLogo.vue
@@ -9,7 +9,7 @@ import BrownLogo from '@/assets/logos/brown-logo.vue';
export default {
components: {
- BrownLogo
+ BrownLogo,
},
props: {
size: {
@@ -18,8 +18,8 @@ export default {
validator(value) {
// The value must match one of these strings
return ['xxs', 'xs', 's', 'm', 'l', 'xl', 'xxl'].includes(value);
- }
- }
- }
+ },
+ },
+ },
};
diff --git a/components/base/CCVLogo.vue b/components/base/CCVLogo.vue
index 1c9d07d..80a504f 100644
--- a/components/base/CCVLogo.vue
+++ b/components/base/CCVLogo.vue
@@ -9,7 +9,7 @@ import CCVLogo from '@/assets/logos/ccv-logo.vue';
export default {
components: {
- CCVLogo
+ CCVLogo,
},
props: {
size: {
@@ -18,8 +18,8 @@ export default {
validator(value) {
// The value must match one of these strings
return ['xxs', 'xs', 's', 'm', 'l', 'xl', 'xxl'].includes(value);
- }
- }
- }
+ },
+ },
+ },
};
diff --git a/components/base/DBanner.vue b/components/base/DBanner.vue
index 6775bc0..c806430 100644
--- a/components/base/DBanner.vue
+++ b/components/base/DBanner.vue
@@ -32,19 +32,19 @@ export default {
props: {
text: {
type: String,
- required: true
+ required: true,
},
tagSize: {
type: String,
default: 'normal',
validator(value) {
return ['normal', 'medium', 'large'].includes(value);
- }
- }
+ },
+ },
},
data() {
return {
- dismissed: false
+ dismissed: false,
};
},
methods: {
@@ -56,7 +56,7 @@ export default {
},
dismiss() {
this.dismissed = true;
- }
- }
+ },
+ },
};
diff --git a/components/base/DButton.vue b/components/base/DButton.vue
index e82b3a4..4b55ea3 100644
--- a/components/base/DButton.vue
+++ b/components/base/DButton.vue
@@ -8,7 +8,7 @@
'is-' + size,
'is-' + variant,
textColor,
- { 'is-outlined': outlined }
+ { 'is-outlined': outlined },
]"
@click="onClick"
>
@@ -26,32 +26,33 @@ export default {
props: {
name: {
type: String,
- required: true
+ required: true,
},
type: {
type: String,
- default: 'button'
+ default: 'button',
},
size: {
type: String,
required: false,
validator(value) {
return ['small', 'normal', 'medium', 'large'].includes(value);
- }
+ },
+ default: 'normal',
},
icon: {
type: Boolean,
- default: true
+ default: true,
},
outlined: {
type: Boolean,
- default: false
- }
+ default: false,
+ },
},
methods: {
onClick() {
this.$emit('click');
- }
- }
+ },
+ },
};
diff --git a/components/base/DCard.vue b/components/base/DCard.vue
index 9460a9c..bd7e1f6 100644
--- a/components/base/DCard.vue
+++ b/components/base/DCard.vue
@@ -7,7 +7,7 @@
'is-width-' + width,
borderColor,
textColor,
- 'has-background-' + variant
+ 'has-background-' + variant,
]"
>
@@ -31,12 +31,12 @@ export default {
person: {
type: Boolean,
required: false,
- default: false
+ default: false,
},
border: {
type: Boolean,
- default: false
- }
- }
+ default: false,
+ },
+ },
};
diff --git a/components/base/DHero.vue b/components/base/DHero.vue
index 004c405..e58e216 100644
--- a/components/base/DHero.vue
+++ b/components/base/DHero.vue
@@ -26,16 +26,16 @@ export default {
props: {
title: {
type: String,
- required: true
+ required: true,
},
subtitle: {
type: String,
- required: true
+ required: true,
},
fullHeight: {
type: Boolean,
- default: false
- }
- }
+ default: false,
+ },
+ },
};
diff --git a/components/base/DModal.vue b/components/base/DModal.vue
index d9b4a13..729157a 100644
--- a/components/base/DModal.vue
+++ b/components/base/DModal.vue
@@ -16,7 +16,7 @@
:class="[
'is-width-' + width,
'has-border-top-' + accent,
- 'has-background-' + variant
+ 'has-background-' + variant,
]"
>
@@ -32,7 +32,7 @@
-
diff --git a/components/base/DPersonCard.vue b/components/base/DPersonCard.vue
index 16cebfd..56a3639 100644
--- a/components/base/DPersonCard.vue
+++ b/components/base/DPersonCard.vue
@@ -39,44 +39,44 @@
diff --git a/components/base/DTableOfContents.vue b/components/base/DTableOfContents.vue
index 46f145b..2a10b9a 100644
--- a/components/base/DTableOfContents.vue
+++ b/components/base/DTableOfContents.vue
@@ -8,7 +8,7 @@
@@ -33,17 +33,17 @@ export default {
props: {
data: {
type: Array,
- required: true
+ required: true,
},
name: {
- type: String
- }
- }
+ type: String,
+ required: true,
+ },
+ },
};
diff --git a/components/base/MultipleChoice.vue b/components/base/MultipleChoice.vue
index 83e02ad..eaaaf75 100644
--- a/components/base/MultipleChoice.vue
+++ b/components/base/MultipleChoice.vue
@@ -10,7 +10,7 @@
class="ml-2"
@click="clear(data.affected_category)"
>
-
+
@@ -19,8 +19,8 @@
-
-
+
+
@@ -49,22 +49,22 @@
diff --git a/components/base/Navbar.vue b/components/base/Navbar.vue
index 3886432..3417ed9 100644
--- a/components/base/Navbar.vue
+++ b/components/base/Navbar.vue
@@ -6,12 +6,10 @@
:class="'has-background-light'"
>
+
+
+
+
+
+
diff --git a/components/base/PageHeader.vue b/components/base/PageHeader.vue
index 49d63c1..e5e83a9 100644
--- a/components/base/PageHeader.vue
+++ b/components/base/PageHeader.vue
@@ -26,8 +26,8 @@
params: {
main: 'home',
category: 'banners',
- page: banner.title.toLowerCase()
- }
+ page: banner.title.toLowerCase(),
+ },
}"
>
{{ banner.title }}
@@ -38,12 +38,18 @@
diff --git a/components/base/Search.vue b/components/base/Search.vue
new file mode 100644
index 0000000..484bf01
--- /dev/null
+++ b/components/base/Search.vue
@@ -0,0 +1,220 @@
+
+
+
+
+
+
+
+
diff --git a/components/blocks/About.vue b/components/blocks/About.vue
index f18294a..f7d4e9c 100644
--- a/components/blocks/About.vue
+++ b/components/blocks/About.vue
@@ -72,14 +72,14 @@
"
:hover-image="
'https://ccv.brown.edu/images/people/JPEG/' +
- person.image.replace('main', 'hover')
+ person.image.replace('main', 'hover')
"
>
+ >
@@ -92,24 +92,24 @@
diff --git a/components/blocks/CardGroup.vue b/components/blocks/CardGroup.vue
index 46bf179..3bf4409 100644
--- a/components/blocks/CardGroup.vue
+++ b/components/blocks/CardGroup.vue
@@ -10,7 +10,7 @@
>
{{ item.group }}
REPOSITORY
WEBSITE
DOCUMENTATION
PUBLICATION
PUBLICATION
@@ -74,28 +74,28 @@
diff --git a/components/blocks/DirsToCardSections.vue b/components/blocks/DirsToCardSections.vue
index a91d1bc..d18c4d4 100644
--- a/components/blocks/DirsToCardSections.vue
+++ b/components/blocks/DirsToCardSections.vue
@@ -10,33 +10,29 @@
:key="'section' + i"
class="content-section"
>
-
-
-
-
-
- {{ category.title }}
-
-
-
+
+
+
+
+ {{ category.title }}
+
+
diff --git a/components/blocks/FilesToCards.vue b/components/blocks/FilesToCards.vue
index c6ab515..f6e02a9 100644
--- a/components/blocks/FilesToCards.vue
+++ b/components/blocks/FilesToCards.vue
@@ -1,10 +1,17 @@
-
-
+
+
- {{ item.description }}
+ {{ item.description }}
@@ -56,51 +63,31 @@