Skip to content

Welcome Message Issue Fix and UI Change #51

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

Open
tintheanh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Welcome Message Issue Fix and UI Change #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/components/GetInvolved/GetInvolved.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class GetInvolved extends Component {
const [ rules, user, slack ] = await Promise.all([ ruleRes.json(), userRes.json(), slackRes.json() ]);

const ruleSorted = rules.sort((a, b) => a.order - b.order);
this.setState({ rules: ruleSorted, numberOfUsers: user.members.length - 8, slack: slack[0].slack });
//this.setState({ rules: ruleSorted, numberOfUsers: user.members.length - 8, slack: slack[0].slack });
}

renderRules = () => {
Expand Down
3 changes: 3 additions & 0 deletions src/components/Header/Header.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ export default class Header extends Component {
</div>
))}
</Carousel>
<div style={{ position: 'absolute', height:'60px', color:'white',opacity:0.9, backgroundColor: '#000000'}}>
<p>We are ML@SJSU, a Recognized Student Organization at San Jose State University! Our community provides an interactive, hands-on environment to support growth in artificial intelligence and machine learning. Come join us on Fridays from 4-6pm in MacQuarrie Hall 226. All are welcome!</p>
</div>
</header>
);
}
Expand Down
7 changes: 4 additions & 3 deletions src/components/Header/NavBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import logo from './logo.svg';
const NavBar = () => {
return (
<div>
<div className="top-header" style={{ position: 'absolute', top: 0 }}>
<div className="top-header" style={{ position: 'absolute', top: 0 , background:"#000000", opacity:0.6, height:'120px'}}>
<div className="container">
<div className="row">
<div id="logo" className="col-sm-4 col-xs-8" style={{ marginTop: 20 }}>
<div id="logo" className="col-sm-4 col-xs-8" style={{ marginTop: 10}}>
<img src={logo} alt="logo" height="66" />
</div>
<div id="mynav" className="col-sm-8 col-xs-4">
<nav className="header-navigation">
<nav className="header-navigation" >
<ul id="menu-illdy-main" className="clearfix">
<li
id="menu-item-16"
Expand Down Expand Up @@ -58,6 +58,7 @@ const NavBar = () => {
</div>
</div>
</div>

</div>
<nav className="responsive-menu">
<ul>
Expand Down