Skip to content

Commit

Permalink
Start screen.
Browse files Browse the repository at this point in the history
  • Loading branch information
kreinhard committed Oct 31, 2018
1 parent 608f2be commit 18c8457
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ logviewer.message=Meldung
logviewer.timestamp=Zeitstempel

startscreen.welcome.title=Willkommen zu Merlin Runner
startscreen.welcome.text=Glückwunsch. Mit Merlin Runner haben Sie einen smarten Assistenten für Ihre tägliche Arbeit mit Word gestartet.
startscreen.welcome.text=Herzlichen Glückwunsch. Mit Merlin Runner haben Sie einen smarten Assistenten für Ihre tägliche Arbeit mit Word gestartet.
startscreen.welcome.enjoy=Viel Spaß!
startscreen.welcome.documentation=Gehe zur Dokumentation

Expand Down
2 changes: 1 addition & 1 deletion merlin-webapp/src/components/views/Start.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Start extends React.Component {
</PageHeader>
<div class="welcome-intro"><I18n name={'startscreen.welcome.text'}/></div>
<div class="welcome-enjoy"><I18n name={'startscreen.welcome.enjoy'}/></div>
<div class="welcome-documentation-link"><a href={'/docs/index.html'} target="_blank" rel="noopener noreferrer"><I18n name={'startscreen.welcome.documentation'}/></a></div>
<div class="welcome-documentation-link"><a class={'btn btn-link btn-outline-primary'} href={'/docs/index.html'} target="_blank" rel="noopener noreferrer"><I18n name={'startscreen.welcome.documentation'}/></a></div>
</React.Fragment>
);
}
Expand Down
11 changes: 11 additions & 0 deletions merlin-webapp/src/css/my-style.css
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,18 @@ div.drop-area span.info {
margin-top: -17px;
}

.welcome-intro {
}

.welcome-enjoy {
padding-top: 20px;
font-weight: bold;
font-style: italic;
}

.welcome-documentation-link {
padding-top: 20px;
}
/* @media only screen and (max-width: 1050px) {
.navbar.navbar-light a.nav-link {
font-size: 0.8rem;
Expand Down

0 comments on commit 18c8457

Please sign in to comment.