Skip to content

Commit 2aa3baa

Browse files
committed
minor fixes chart-wrapper & dropdown-menu-right & components
1 parent b7ffd29 commit 2aa3baa

File tree

14 files changed

+44
-74
lines changed

14 files changed

+44
-74
lines changed

.gitignore

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# See http://help.github.com/ignore-files/ for more about ignoring files.
2+
3+
# dependencies
4+
node_modules
5+
6+
# testing
7+
coverage
8+
9+
# production
10+
build
11+
12+
# misc
13+
.DS_Store
14+
Thumbs.db
15+
.env
16+
.idea
17+
npm-debug.log
18+
compilation-stats.json

React_Full_Project/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ build
1111

1212
# misc
1313
.DS_Store
14+
Thumbs.db
1415
.env
1516
.idea
1617
npm-debug.log
18+
compilation-stats.json

React_Full_Project/CORE_REACT.md

-30
This file was deleted.

React_Full_Project/scss/core/_callout.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
.chart-wrapper {
1313
position: absolute;
1414
top: 18px;
15-
left: 45%;
15+
left: 50%;
1616
float: right;
17-
width: 100px;
17+
width: 60%;
1818
}
1919
}
2020

React_Full_Project/scss/core/_temp.scss

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@
1212
border-radius: 1rem !important;
1313
}
1414

15-
// temp fix for Vue-Strap
15+
// temp fix for Vue & React
1616

1717
// Open state for the dropdown
1818
.open, .show {
1919
// Show the menu
2020
> .dropdown-menu {
2121
display: block;
2222
}
23-
23+
> .dropdown-menu-right {
24+
right: 0;
25+
left: auto; // Reset the default from `.dropdown-menu`
26+
}
2427
// Remove the outline when :focus is triggered
2528
> a {
2629
outline: 0;

React_Full_Project/src/components/Breadcrumb/Breadcrumb.js

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ const getPaths = (pathname) => {
1515
paths.push(currPath);
1616
return currPath;
1717
});
18-
console.log(paths);
1918
return paths;
2019
};
2120

@@ -41,7 +40,6 @@ const BreadcrumbsItem = ({...rest, match}) => {
4140

4241
const Breadcrumbs = ({...rest, location : {pathname}, match}) => {
4342
const paths = getPaths(pathname);
44-
// const i = 0;
4543
const items = paths.map((path, i) => <Route key={i++} path={path} component={BreadcrumbsItem}/>);
4644
return (
4745
<Breadcrumb>

React_Full_Project/src/components/Sidebar/Sidebar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class Sidebar extends Component {
3838
};
3939

4040
// simple wrapper for nav-title item
41-
const wrapper = item => { return (!item.wrapper ? item.name : (React.createElement(item.wrapper.element, item.wrapper.attributes, item.name))) };
41+
const wrapper = item => { return (item.wrapper && item.wrapper.element ? (React.createElement(item.wrapper.element, item.wrapper.attributes, item.name)): item.name ) };
4242

4343
// nav list section title
4444
const title = (title, key) => {

React_Full_Project/src/components/Sidebar/_nav.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ export default {
1313
title: true,
1414
name: 'UI elements',
1515
wrapper: { // optional wrapper object
16-
element: "span", // required valid HTML5 element tag
16+
element: '', // required valid HTML5 element tag
1717
attributes: {} // optional valid JS object with JS API naming ex: { className: "my-class", style: { fontFamily: "Verdana" }, id: "my-id"}
1818
},
19-
class: "" // optional class names space delimited list for title item ex: "text-center"
19+
class: '' // optional class names space delimited list for title item ex: "text-center"
2020
},
2121
{
2222
name: 'Components',

React_Full_Project/src/containers/Full/Full.js

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import Footer from '../../components/Footer/';
99
import Dashboard from '../../views/Dashboard/';
1010
import Charts from '../../views/Charts/';
1111
import Widgets from '../../views/Widgets/';
12+
13+
// Components
1214
import Buttons from '../../views/Components/Buttons/';
1315
import Cards from '../../views/Components/Cards/';
1416
import Forms from '../../views/Components/Forms/';
@@ -17,6 +19,8 @@ import SocialButtons from '../../views/Components/SocialButtons/';
1719
import Switches from '../../views/Components/Switches/';
1820
import Tables from '../../views/Components/Tables/';
1921
import Tabs from '../../views/Components/Tabs/';
22+
23+
// Icons
2024
import FontAwesome from '../../views/Icons/FontAwesome/';
2125
import SimpleLineIcons from '../../views/Icons/SimpleLineIcons/';
2226

React_Full_Project/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ ReactDOM.render((
3232
<Route path="/" name="Home" component={Full}/>
3333
</Switch>
3434
</HashRouter>
35-
), document.getElementById('root'));
35+
), document.getElementById('root'));

React_Starter/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ build
1111

1212
# misc
1313
.DS_Store
14+
Thumbs.db
1415
.env
1516
.idea
1617
npm-debug.log
18+
compilation-stats.json

React_Starter/CORE_REACT.md

-30
This file was deleted.

React_Starter/scss/core/_callout.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
.chart-wrapper {
1313
position: absolute;
1414
top: 18px;
15-
left: 45%;
15+
left: 50%;
1616
float: right;
17-
width: 100px;
17+
width: 60%;
1818
}
1919
}
2020

React_Starter/scss/core/_temp.scss

+5-2
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,18 @@
1212
border-radius: 1rem !important;
1313
}
1414

15-
// temp fix for Vue-Strap
15+
// temp fix for Vue & React
1616

1717
// Open state for the dropdown
1818
.open, .show {
1919
// Show the menu
2020
> .dropdown-menu {
2121
display: block;
2222
}
23-
23+
> .dropdown-menu-right {
24+
right: 0;
25+
left: auto; // Reset the default from `.dropdown-menu`
26+
}
2427
// Remove the outline when :focus is triggered
2528
> a {
2629
outline: 0;

0 commit comments

Comments
 (0)