litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tenderfoot updates

Browse source
This commit is contained in:
Graham Triggs 2017-06-06 23:08:35 +01:00
parent ff37204799
commit 43523ab9cf
6 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
webapp/src/main/webapp/themes/tenderfoot/css/page-home.css
View file

@ -166,3 +166,10 @@ div#adjImgHeight {
text-align:center;
margin-top:100px;
}
div.faculty-home {
padding-top: 20px;
}
.faculty-home,
.research-count {
background-color: #fff;
}

12
webapp/src/main/webapp/themes/tenderfoot/css/page-login.css
View file

@ -122,19 +122,15 @@ p.password-note {
border: 1px dotted #E2C822;
background-color: #FFF9D7;
padding: .5em;
margin-top: 10px;
margin-bottom: 10px;
}
#welcome-message {
border: 1px dotted #E2C822;
background-color: #FFF9D7;
padding: .25em;
margin-bottom: 8px;
}
#welcome-msg-container {
margin-bottom: 8px;
margin-top: -10px;
margin-right:-10px;
height:34px;
padding: .5em;
margin-top: 10px;
margin-bottom: 10px;
}
p.external-auth {
margin: 0 auto;

1
webapp/src/main/webapp/themes/tenderfoot/templates/page/page-home.ftl
View file

@ -31,6 +31,7 @@
<#include "identity.ftl">
</header>
<#include "menu.ftl">
<#include "message.ftl">
<div class="row hero">
<div class="theme-showcase">
<div class="col-md-12">

1
webapp/src/main/webapp/themes/tenderfoot/templates/page/page.ftl
View file

@ -13,6 +13,7 @@
<#include "identity.ftl">
</header>
<#include "menu.ftl">
<#include "message.ftl">
<div id="wrapper-content" role="main" class="container">
<#if flash?has_content>

2
webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/menu.ftl
View file

@ -1,3 +1,5 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<div id="nav">
<div class="container">
<nav class="navbar navbar-default">

15
webapp/src/main/webapp/themes/tenderfoot/templates/page/partials/message.ftl Normal file
View file

@ -0,0 +1,15 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#if flash?has_content>
<div id="wrapper-content" role="main" class="container">
<#if flash?starts_with(i18n().menu_welcomestart) >
<section id="welcome-msg-container" role="container">
<section id="welcome-message" role="alert">${flash}</section>
</section>
<#else>
<section id="flash-message" role="alert">
${flash}
</section>
</#if>
</div>
</#if>