Skip to content
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.

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

Celine #213

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions webpack/src/prodsys/components/LoginForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ const LoginForm2 = ({ logIn, error }) => {

return (
<Container>
<Title>Logg inn i prodsys</Title>
<Title>Prodsys</Title>
<h1> LOGG INN</h1>
<Input
value={username}
onChange={event => setUsername(event.target.value)}
Expand All @@ -25,7 +26,7 @@ const LoginForm2 = ({ logIn, error }) => {
<Input
value={password}
onChange={event => setPassword(event.target.value)}
placeholder="password"
placeholder="passord"
type="password"
/>
<Button onClick={handleLogin}>Logg inn</Button>
Expand Down
4 changes: 3 additions & 1 deletion webpack/src/universitas/components/NewsFeed/NewsFeed.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import FeedItem from './FeedItem.js'
import PlaceHolder from './PlaceHolder.js'
import './NewsFeed.scss'

//import banner from '../../images/universitas_mars.jpg'
import banner from '../../images/anonnse_til_nett_universitas.png'

// Standard grid sizes for below the fold feed items.
// This makes dense css grid much less likely to have voids
Expand Down Expand Up @@ -156,6 +156,8 @@ class NewsFeed extends React.Component {
//Toppbanner
<section className={cx('NewsFeed', className)}>
<TopBanner
url="https://valg2.uio.no/"
src={banner}
url="https://www.akademika.no/butikker/akademika-blindern?utm_source=Universitas&utm_medium=banner&utm_campaign=v_21​"
src={null}
/>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.