diff --git a/webpack/src/prodsys/components/LoginForm.js b/webpack/src/prodsys/components/LoginForm.js index 0595df39..1089f165 100644 --- a/webpack/src/prodsys/components/LoginForm.js +++ b/webpack/src/prodsys/components/LoginForm.js @@ -15,7 +15,8 @@ const LoginForm2 = ({ logIn, error }) => { return ( - Logg inn i prodsys + Prodsys +

LOGG INN

setUsername(event.target.value)} @@ -25,7 +26,7 @@ const LoginForm2 = ({ logIn, error }) => { setPassword(event.target.value)} - placeholder="password" + placeholder="passord" type="password" /> diff --git a/webpack/src/universitas/components/NewsFeed/NewsFeed.js b/webpack/src/universitas/components/NewsFeed/NewsFeed.js index b209570b..0aee783d 100755 --- a/webpack/src/universitas/components/NewsFeed/NewsFeed.js +++ b/webpack/src/universitas/components/NewsFeed/NewsFeed.js @@ -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 @@ -156,6 +156,8 @@ class NewsFeed extends React.Component { //Toppbanner
diff --git a/webpack/src/universitas/images/anonnse_til_nett_universitas.png b/webpack/src/universitas/images/anonnse_til_nett_universitas.png new file mode 100644 index 00000000..cbb14794 Binary files /dev/null and b/webpack/src/universitas/images/anonnse_til_nett_universitas.png differ