Merge branch 'ivanjonas-master'

pull/249/head
Ian Prest 6 years ago
commit 5f2a5c51ce

@ -61,7 +61,7 @@ html, body {
/* Set the fixed height of the footer here */
#footer {
height: 70px;
padding: 2em 0 1.6em;
background-color: #f5f5f5;
}

@ -904,20 +904,22 @@ Nav Bar / Header
</div> <!-- END OF TAB CONTENT -->
<div class="col-md-12 col-lg-12 row" style="margin-top:1em;margin-left:0px;">
<alert type="success" ng-hide="!saved" close="saved=false" ng-cloak>
Saved! Your saved layout can be accessed via <a class="alert-link" ng-href="#/gists/{{saved}}">this link</a>.
</alert>
<alert type="danger" ng-hide="!saveError" close="saveError=''" ng-cloak>
<P>There was an error saving your layout on the server: {{saveError}}</P>
<P>To ensure you don't lose any data, it is recommended that you <a class="alert-link" ng-click="downloadJson()">download your layout as JSON</a>.</P>
</alert>
<alert type="danger" ng-hide="!loadError" close="loadError=false" ng-cloak>
The requested layout does not exist.
</alert>
<alert type="danger" ng-hide="!oauthError" close="oauthError=null" ng-cloak>
An error occurred during login: {{oauthError}}
</alert>
<div class="row" style="margin-top:1em;margin-left:0px;">
<div class="col-md-12 col-lg-12">
<alert type="success" ng-hide="!saved" close="saved=false" ng-cloak>
Saved! Your saved layout can be accessed via <a class="alert-link" ng-href="#/gists/{{saved}}">this link</a>.
</alert>
<alert type="danger" ng-hide="!saveError" close="saveError=''" ng-cloak>
<P>There was an error saving your layout on the server: {{saveError}}</P>
<P>To ensure you don't lose any data, it is recommended that you <a class="alert-link" ng-click="downloadJson()">download your layout as JSON</a>.</P>
</alert>
<alert type="danger" ng-hide="!loadError" close="loadError=false" ng-cloak>
The requested layout does not exist.
</alert>
<alert type="danger" ng-hide="!oauthError" close="oauthError=null" ng-cloak>
An error occurred during login: {{oauthError}}
</alert>
</div>
</div>
</div> <!-- body -->
@ -929,11 +931,11 @@ Footer
************************************************-->
<div id="footer" ng-cloak>
<div class="container">
<p class="text-muted credit" style="float:left">
<div class="text-muted credit" style="float:left">
Keyboard Layout Editor v{{version}} (<a href='#' ng-click="showMarkdown('CHANGELOG.md', $event)">changelog</a>)<br/>
Copyright &copy; 2013-2018 &mdash; Ian Prest (<a href='#' ng-click="showMarkdown('CONTRIB.md', $event)">and contributors</a>)<br/>
All rights reserved. (<a href='#' ng-click="showMarkdown('LICENSE.md', $event)">LICENSE</a>)
</p>
</div>
<div style="float:right;">
<a href="#" ng-click="showHelp($event)"><i class="fa fa-question-circle"></i> Help &amp; keyboard shortcuts</a><br/>
<a href="https://github.com/ijprest/keyboard-layout-editor/issues" target="_blank"><i class="fa fa-bug"></i> Found a bug?</a><br/>

Loading…
Cancel
Save