Skip to content

Commit 451fc55

Browse files
committed
Merge branch 'master' into staging-release
2 parents f42601b + 967b515 commit 451fc55

File tree

5 files changed

+65
-61
lines changed

5 files changed

+65
-61
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Access CoursePlan at [courseplan.io](https://courseplan.io)!
44

5-
CoursePlan is a four-year academic planner for Cornell undergraduates developed by the Design & Tech Initiative. CoursePlan helps undergraduates track their courses and their requirements automatically depending on their college, major, and minor. It aims to allow students view the big picture of their time at Cornell.
5+
CoursePlan is a four-year academic planner for Cornell undergraduates developed by the Digital Tech & Innovation. CoursePlan helps undergraduates track their courses and their requirements automatically depending on their college, major, and minor. It aims to allow students view the big picture of their time at Cornell.
66

77
View documentation in our [wiki](https://github.com/cornell-dti/course-plan/wiki).
88

@@ -29,7 +29,7 @@ Then access http://localhost:8080/
2929
- **Rohan Maheshwari** - Developer
3030
- **Elizabeth Tang** - Developer
3131
- **Pablo Raigoza** - Developer
32-
- **Noorejehan Umarn** - Designer
32+
- **Noorejehan Umar** - Designer
3333
- **Michelle Dai** - Designer
3434
- **Larrisa Chen** - Designer
3535
- **Jonathan Mak** - PMM

package-lock.json

+56-56
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
"serve": "^14.1.2",
7979
"ts-node": "^9.1.1",
8080
"typescript": "<=4.1.5",
81-
"vite": "^2.9.13",
81+
"vite": "^2.9.16",
8282
"vue-tsc": "^0.3.0",
8383
"wait-on": "^5.3.0"
8484
},

src/components/Semester/SemesterView.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<img class="semesterView-heart" src="@/assets/images/redHeart.svg" alt="heart" />
6565
by
6666
<a target="_blank" href="https://www.cornelldti.org/projects/courseplan/">
67-
Cornell Design &amp; Tech Initiative
67+
Cornell Digital Tech &amp; Innovation
6868
</a>
6969
</div>
7070
</div>
@@ -211,6 +211,7 @@ export default defineComponent({
211211
margin-bottom: 1rem;
212212
min-height: 2.25rem;
213213
align-items: center;
214+
214215
&--two {
215216
justify-content: space-between;
216217
}
@@ -280,6 +281,7 @@ export default defineComponent({
280281
281282
a {
282283
color: $medGray;
284+
283285
&:hover {
284286
text-decoration: underline $medGray;
285287
}
@@ -308,9 +310,11 @@ export default defineComponent({
308310
margin-top: 5.5rem;
309311
margin-left: 2.5rem;
310312
margin-right: 1rem;
313+
311314
&-switch {
312315
padding-right: 0.75rem;
313316
}
317+
314318
&-content {
315319
width: 100%;
316320
justify-content: center;

src/containers/Policy.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="content">
55
<h2>Privacy Policy</h2>
66
<p>
7-
Your privacy is important to us. It is Cornell Design Tech Initiative&#39;s policy to
7+
Your privacy is important to us. It is Cornell Digital Tech & Innovation&#39;s policy to
88
respect your privacy and comply with any applicable law and regulation regarding any
99
personal information we may collect about you, including across our website,
1010
<a href="https://courseplan.io/">https://courseplan.io/</a>, and other sites we own and

0 commit comments

Comments
 (0)