Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ideas Branch #56

Merged
merged 27 commits into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f3c091d
new ideas branch with vuetify get rid of old
rowelsabahat Oct 25, 2023
6e930a4
commiting vuetify changes
rowelsabahat Oct 25, 2023
41710ff
Fixed vuetify import in main.ts
daniel-panhead Oct 25, 2023
9b2acb5
a lot of commitment lmao
rowelsabahat Oct 27, 2023
94324a9
Fixed image and moved ul content outside of p tags (not allowed in ht…
daniel-panhead Oct 27, 2023
234d27a
Fixed some typos and tweaked styles to use tailwind theme
daniel-panhead Oct 27, 2023
86979ed
Tweaked layout some more; fixed footer bug
daniel-panhead Oct 27, 2023
ea68500
Some typos/spacing tweaks + Changed formatting to get consistent box …
daniel-panhead Oct 27, 2023
536376b
Don't import vuetify styles to avoid tailwind conflict (fixed footer …
daniel-panhead Oct 27, 2023
a270073
added IDs
rowelsabahat Oct 27, 2023
183d643
Made ideas page responsive
daniel-panhead Oct 27, 2023
f09507f
Merge branch 'ideas-2' of github.com:biomod2023/biomod2023 into ideas-2
daniel-panhead Oct 27, 2023
1b1e377
Make table padding consistent and fix card responsiveness
daniel-panhead Oct 27, 2023
9931e89
Make image background white for readability
daniel-panhead Oct 27, 2023
f77070b
Added subheadings for design and logic
daniel-panhead Oct 27, 2023
3d5de82
Linked ToC to correct heading
daniel-panhead Oct 27, 2023
7e7b2a0
test
rowelsabahat Oct 27, 2023
449766d
committing to see changes
rowelsabahat Oct 27, 2023
0302ced
background added
rowelsabahat Oct 27, 2023
51a68fa
Made DNA background responsive
daniel-panhead Oct 28, 2023
84a45dc
Merge branch 'main' of github.com:biomod2023/biomod2023 into ideas-2
daniel-panhead Oct 28, 2023
a9090ed
Tweaked DNA background
daniel-panhead Oct 28, 2023
3bbc23e
Fix v-timeline type error
daniel-panhead Oct 28, 2023
b8f32a6
Add intro text
daniel-panhead Oct 28, 2023
2808b2d
Fixed ul in p error and prettified
daniel-panhead Oct 28, 2023
5d85d53
Prettified Code!
daniel-panhead Oct 28, 2023
6cc3a3a
one change in the Specification subtitle margin
rowelsabahat Oct 28, 2023
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
131 changes: 83 additions & 48 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
"v-click-outside": "^3.2.0",
"vue": "^3.3.4",
"vue-router": "^4.2.2",
"vue-window-size": "^2.0.0"
"vue-window-size": "^2.0.0",
"vuetify": "^3.3.23"
},
"devDependencies": {
"@rushstack/eslint-patch": "^1.2.0",
Expand Down
Binary file added src/assets/dna_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/thiolation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions src/components/CustomTable2.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<script setup lang="ts">
defineProps<{
tableData: {
headers: string[]
rowHeaders: string[]
rowsPerRowHeader: number
data: any[][]
}
}>()

const border = 'border-notebookText'

Check warning on line 11 in src/components/CustomTable2.vue

View workflow job for this annotation

GitHub Actions / Lint and Test Build

'border' is assigned a value but never used
</script>

<template>
<table class="table-fixed border-collapse lg:w-full">
<tr class="bg-slate">
<th
v-for="(header, i) in tableData.headers"
:key="i"
:class="'w-1/' + tableData.headers.length"
class="py-2 px-4 text-sm lg:text-base"
>
{{ header }}
</th>
</tr>
<tbody class="bg-[#303030]">
<tr v-for="(row, i) in tableData.data" :key="i">
<th
v-if="i % tableData.rowsPerRowHeader == 0"
:rowspan="tableData.rowsPerRowHeader"
class="text-sm lg:text-base"
>
{{ tableData.rowHeaders[i / tableData.rowsPerRowHeader] }}
</th>
<td v-for="(item, j) in row" :key="j" class="py-4 px-2 lg:text-lg">{{ item }}</td>
</tr>
</tbody>
</table>
</template>
2 changes: 1 addition & 1 deletion src/components/Equation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ onMounted(() => {
</script>
<template>
<div
class="w-full overflow-x-scroll bg-transparent invisible-scroller text-center"
ref="containerRef"
class="w-full overflow-x-scroll bg-transparent invisible-scroller text-center"
></div>
</template>
<!--
Expand Down
Loading
Loading