Skip to content

Integrate Vocabulary styles into Chooser #169

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
May 25, 2020
Merged

Integrate Vocabulary styles into Chooser #169

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c92d4c
Update vocabulary to v.1, import vocabulary styles
obulat May 24, 2020
37e9016
Replace app title with new logo image, update header styles
obulat May 24, 2020
785c7b4
Update footer to match cccatalog
obulat May 24, 2020
7c4c122
Use styles from vocabulary package for headings
obulat May 24, 2020
9986666
Remove temporary ha class from heading in App.vue
obulat May 24, 2020
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
Prev Previous commit
Next Next commit
Use styles from vocabulary package for headings 
Styles in styles.scss were created as temporary before the vocabulary package is ready. Since the styles for headings are available in vocabulary package now, they were removed from the styles.scss.
  • Loading branch information
@obulat
obulat committed May 24, 2020
commit 7c4c1225859144f4c095cdccbaa0d72e14a56f0e
2 changes: 1 addition & 1 deletion src/components/HelpSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="help-section">
<h3 class="vocab ha h3a">
<h3 class="vocab">
{{ $t('help.heading') }}
</h3>
<ul class="help-links">
Expand Down
4 changes: 2 additions & 2 deletions src/components/LicenseDetailsCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<template>
<div class="selected-license-card">
<h3 class="vocab ha h3a">
<h3 class="vocab">
{{ $t('license-details-card.heading') }}
</h3>
<h4 class="vocab h4b hb">
<h4 class="vocab b-header">
<a
:href="licenseUrl('web')"
class="license-name"
Expand Down
2 changes: 1 addition & 1 deletion src/components/LicenseUseCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="license-use-card">
<h4 class="vocab h4b hb">
<h4 class="vocab b-header">
{{ $t('license-use.heading') }}
</h4>
<p class="license-use-instructions">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Stepper.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
:class="['step-header']"
@click="setActiveStep(step.id)"
>
<h5 class="step-title vocab hb h5b">
<h5 class="step-title vocab b-header">
{{ $t(stepHeaderText(step.name, step.status)) }}
</h5>
</div>
Expand Down
49 changes: 4 additions & 45 deletions src/styles/vocab.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,3 @@
/* Vocabulary Header styles */
.vocab.ha {
font-family: Roboto Condensed,sans-serif;
font-weight: bold;
font-style: normal;
letter-spacing: 0.02em;
padding-bottom: 0.5rem;
}
.vocab.hb {
font-family: Source Sans Pro,sans-serif;
font-weight: bold;
font-style: normal;
padding-bottom: 0.5rem;
}
.vocab.h2a {
color: black;
font-size: 36px;
line-height: 47px;
}
.vocab.h3a {
font-size: 28px;
line-height: 36px;
color: black;
}
.vocab.h3b {
font-size: 28px;
line-height: 33px;
}
.vocab.h4a {
font-size: 23px;
line-height: 30px;
}
.vocab.h4b {
font-size: 23px;
line-height: 27px;
}
.vocab.h5a {
font-size: 20px;
line-height: 30px;
}
.vocab.h5b {
font-size: 20px;
line-height: 26px;
}

/* Vocabulary Text styles */
.vocab-body {
font-style: normal;
Expand Down Expand Up @@ -86,3 +41,7 @@
width: 35px;
height: 35px;
}
// Remove underlines from Previous/Next buttons
a, a:hover {
text-decoration: none;
}