Skip to content

Commit 44545ba

Browse files
authored
Footer links update (and a few style updates) (#133)
* Footer links update (and a few style updates) * bump components version
1 parent f5ceae6 commit 44545ba

File tree

12 files changed

+28
-40
lines changed

12 files changed

+28
-40
lines changed

cypress/e2e/home.cy.js

-2
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,11 @@ context('Home', () => {
3737
it('When on the home page I can see the elements on the leftnav footer menu', () => {
3838
const footerLinks = [
3939
'Documentation',
40-
'Visit Demo',
4140
'Download',
4241
'CivicActions',
4342
'Project Open Data',
4443
'DCAT',
4544
'Drupal',
46-
'Open Source Open Data',
4745
];
4846
cy.get('.dc-footer').within(() => {
4947
footerLinks.forEach((text) => cy.findByRole('link', { name: text }).should('exist'))

package-lock.json

+4-4
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
@@ -4,7 +4,7 @@
44
"private": false,
55
"homepage": "frontend/build",
66
"dependencies": {
7-
"@civicactions/data-catalog-components": "1.17.0",
7+
"@civicactions/data-catalog-components": "1.17.1",
88
"@fortawesome/fontawesome-svg-core": "^6.4.2",
99
"@fortawesome/free-brands-svg-icons": "^6.4.2",
1010
"@fortawesome/free-solid-svg-icons": "^6.4.2",

src/assets/menu.json

+1-11
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@
2929
"footer1": [
3030
{
3131
"label": "Documentation",
32-
"url": "https://docs.getdkan.com",
33-
"target": "_blank"
34-
},
35-
{
36-
"label": "Visit Demo",
37-
"url": "https://demo.getdkan.com",
32+
"url": "https://dkan.readthedocs.io/en/latest/index.html",
3833
"target": "_blank"
3934
},
4035
{
@@ -61,11 +56,6 @@
6156
"label": "Drupal",
6257
"url": "https://drupal.org",
6358
"target": "_blank"
64-
},
65-
{
66-
"label": "Open Source Open Data",
67-
"url": "https://opensourceopendata.org",
68-
"target": "_blank"
6959
}
7060
]
7161
}

src/templates/about/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ const About = () => (
2222
</Announcement>
2323
</div>
2424
</div>
25+
<h2>App version:</h2>
2526
<div className="dc-page-content row">
26-
<h2>App version:</h2>
2727
<div className="col-12">
2828
<p>data-catalog-app: {version}</p>
2929
<p>data-catalog-components: {dependencies["@civicactions/data-catalog-components"]}</p>

src/theme/index.css

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

src/theme/index.css.map

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

src/theme/styles/footer.scss

+4-2
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@
4141
}
4242
p {
4343
margin: 0 2em 1em 0;
44+
&:last-child {
45+
line-height: 2rem;
46+
}
4447
}
4548
.social {
46-
margin: 1em 0 0 0;
49+
margin: 1em 0 0 1em;
4750
svg {
4851
font-size: 25px;
4952
fill: #FFFFFF;
5053
opacity: 0.5;
51-
margin: 0 1em 1em 0;
5254
&:hover {
5355
opacity: 1;
5456
}

src/theme/styles/general.scss

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ body {
4141
border-color: $borderColor;
4242
}
4343
.form-control {
44-
font-size: 1.6rem;
4544
margin-bottom: 15px;
4645
}
4746
}

src/theme/styles/header.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
margin-bottom: 10px;
1313
a {
1414
color: $headingColor;
15-
font-size: 1.8rem;
15+
font-size: 1.15rem;
1616
}
1717
}
1818
.dc-slogan {

src/theme/styles/resource.scss

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
}
1717
select {
1818
display: inline-block;
19-
max-width: 80px;
2019
width: auto;
2120
height: 32px;
2221
border: 1px solid $grayLight;

src/theme/styles/searchinput.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import "../variables";
22

3-
.dc-search-input.form-group {
3+
.dc-search-input {
44
display: flex;
55

66
input[type="text"] {
@@ -40,7 +40,7 @@
4040
}
4141

4242
@media screen and (max-width: 768px) {
43-
.dc-search-input.form-group {
43+
.dc-search-input {
4444
position: relative;
4545
top: auto;
4646
right: auto;

0 commit comments

Comments
 (0)