Skip to content

Commit

Permalink
Footer links update (and a few style updates) (#133)
Browse files Browse the repository at this point in the history
* Footer links update (and a few style updates)

* bump components version
  • Loading branch information
brdunfield authored Dec 14, 2023
1 parent f5ceae6 commit 44545ba
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 40 deletions.
2 changes: 0 additions & 2 deletions cypress/e2e/home.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ context('Home', () => {
it('When on the home page I can see the elements on the leftnav footer menu', () => {
const footerLinks = [
'Documentation',
'Visit Demo',
'Download',
'CivicActions',
'Project Open Data',
'DCAT',
'Drupal',
'Open Source Open Data',
];
cy.get('.dc-footer').within(() => {
footerLinks.forEach((text) => cy.findByRole('link', { name: text }).should('exist'))
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": false,
"homepage": "frontend/build",
"dependencies": {
"@civicactions/data-catalog-components": "1.17.0",
"@civicactions/data-catalog-components": "1.17.1",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
Expand Down
12 changes: 1 addition & 11 deletions src/assets/menu.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,7 @@
"footer1": [
{
"label": "Documentation",
"url": "https://docs.getdkan.com",
"target": "_blank"
},
{
"label": "Visit Demo",
"url": "https://demo.getdkan.com",
"url": "https://dkan.readthedocs.io/en/latest/index.html",
"target": "_blank"
},
{
Expand All @@ -61,11 +56,6 @@
"label": "Drupal",
"url": "https://drupal.org",
"target": "_blank"
},
{
"label": "Open Source Open Data",
"url": "https://opensourceopendata.org",
"target": "_blank"
}
]
}
2 changes: 1 addition & 1 deletion src/templates/about/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ const About = () => (
</Announcement>
</div>
</div>
<h2>App version:</h2>
<div className="dc-page-content row">
<h2>App version:</h2>
<div className="col-12">
<p>data-catalog-app: {version}</p>
<p>data-catalog-components: {dependencies["@civicactions/data-catalog-components"]}</p>
Expand Down
26 changes: 13 additions & 13 deletions src/theme/index.css

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

2 changes: 1 addition & 1 deletion src/theme/index.css.map

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

6 changes: 4 additions & 2 deletions src/theme/styles/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,16 @@
}
p {
margin: 0 2em 1em 0;
&:last-child {
line-height: 2rem;
}
}
.social {
margin: 1em 0 0 0;
margin: 1em 0 0 1em;
svg {
font-size: 25px;
fill: #FFFFFF;
opacity: 0.5;
margin: 0 1em 1em 0;
&:hover {
opacity: 1;
}
Expand Down
1 change: 0 additions & 1 deletion src/theme/styles/general.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ body {
border-color: $borderColor;
}
.form-control {
font-size: 1.6rem;
margin-bottom: 15px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/theme/styles/header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
margin-bottom: 10px;
a {
color: $headingColor;
font-size: 1.8rem;
font-size: 1.15rem;
}
}
.dc-slogan {
Expand Down
1 change: 0 additions & 1 deletion src/theme/styles/resource.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
}
select {
display: inline-block;
max-width: 80px;
width: auto;
height: 32px;
border: 1px solid $grayLight;
Expand Down
4 changes: 2 additions & 2 deletions src/theme/styles/searchinput.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import "../variables";

.dc-search-input.form-group {
.dc-search-input {
display: flex;

input[type="text"] {
Expand Down Expand Up @@ -40,7 +40,7 @@
}

@media screen and (max-width: 768px) {
.dc-search-input.form-group {
.dc-search-input {
position: relative;
top: auto;
right: auto;
Expand Down

0 comments on commit 44545ba

Please sign in to comment.