Merge branch 'development' into validate-feature

This commit is contained in:
Mark Drobnak
2018-10-21 12:22:55 -04:00
committed by GitHub
5 changed files with 16 additions and 4 deletions
+8 -2
View File
@@ -15,7 +15,7 @@
"node-fetch": "^2.1.2",
"node-sass-chokidar": "^1.3.0",
"npm-run-all": "^4.1.3",
"react-scripts": "^1.1.4",
"react-scripts": "^2.0.5",
"react-test-renderer": "^16.4.1"
},
"dependencies": {
@@ -54,5 +54,11 @@
"update-translations": "node update-translations.js",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
]
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

+2 -2
View File
@@ -35,9 +35,9 @@ export const navItem = (item, key, props) => (
export const navDropdown = (item, key, props) => (
<li key={key} className={dropDownClassList(item.url, props)}>
<a className="nav-link nav-dropdown-toggle" onClick={handleClick}>
<button className="nav-link nav-dropdown-toggle" onClick={handleClick}>
<i className={"nav-icon " + item.icon}/>{props.t(item.name)}
</a>
</button>
<ul className="nav-dropdown-items">
{navList(item.children, props)}
</ul>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 58 KiB

+6
View File
@@ -172,3 +172,9 @@
.sidebar .nav-item {
cursor: pointer;
}
.sidebar button.nav-dropdown-toggle {
border: none;
width: 100%;
text-align: left;
}