Gitlab CSE Unil

Skip to content

GitLab

Commit 6dd3a044 authored by Julien Furrer's avatar Julien Furrer
Browse files

Ajouter footer sur homepage et bon info dans navbar

parent c2fb289e
Hide whitespace changes
Inline Side-by-side
adim_app/static/_src/less/adim-footer.css 0 → 100644
View file @ 6dd3a044
#main-footer {
position: absolute;
bottom: 0;
background-color: #6C6E73;
width: 100%;
height: 120px;
overflow: auto;
padding-top: 25px;
box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.33) inset;
}
#main-footer .logo {
margin-top: -3px;
font-size: 63px;
}
#main-footer,
#main-footer a,
#main-footer a:visited {
color: #eee;
text-decoration: none;
}
#main-footer a:hover,
#main-footer a:active {
color: #fff;
text-decoration: none;
border-bottom: dotted 1px #fff;
text-shadow: 0 0 2px rgba(255, 255, 255, 0.25);
}
#main-footer .logo,
#main-footer a.logo {
line-height: 75px;
text-shadow: 0 0 1px rgba(0, 0, 0, 0.33);
}
#main-footer .logo:hover,
#main-footer a.logo:hover,
#main-footer .logo:active,
#main-footer a.logo:active {
border-bottom: none !important;
text-shadow: 0 0 1px rgba(0, 0, 0, 0.33), 0 0 4px rgba(255, 255, 255, 0.25);
}
#main-footer ul a {
line-height: 1.8em;
}
adim_app/static/_src/less/adim-footer.less 0 → 100644
View file @ 6dd3a044
@main-footer-height: 120px;
// Footer
#main-footer {
position: absolute;
bottom: 0; //-@main-footer-height;
background-color: #6C6E73;
width: 100%;
height: @main-footer-height;
overflow: auto;
padding-top: 25px;
box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.33) inset;
.logo {
margin-top: -3px;
font-size: 63px;
}
&,a,a:visited {
color: #eee;
text-decoration: none;
}
a:hover,
a:active {
color: #fff;
text-decoration: none;
border-bottom: dotted 1px #fff;
text-shadow: 0 0 2px rgba(255, 255, 255, 0.25);
}
.logo,
a.logo {
line-height: 75px;
text-shadow: 0 0 1px rgba(0, 0, 0, 0.33);
&:hover, &:active {
border-bottom: none !important;
text-shadow: 0 0 1px rgba(0, 0, 0, 0.33), 0 0 4px rgba(255, 255, 255, 0.25);
}
}
ul a {
line-height: 1.8em;
}
}
adim_app/static/_src/less/adim.css
View file @ 6dd3a044
......@@ -403,72 +403,114 @@
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
}
/*!
* Unilogo – Webfont
* Copyright (c) Université de Lausanne 2014 - Julien Furrer <Julien.Furrer@unil.ch>
* The graphics of unilogo is copyright of Unil, all rights reserved.
* The webfont was generated by IcoMoon App (https://icomoon.io/app/)
*/
@font-face {
font-family: 'adim';
src: url('../fonts/adim.eot?45qrwp8');
src: url('../fonts/adim.eot?#iefix45qrwp8') format('embedded-opentype'), url('../fonts/adim.woff?45qrwp8') format('woff'), url('../fonts/adim.ttf?45qrwp8') format('truetype'), url('../fonts/adim.svg?45qrwp8#adim') format('svg');
font-family: 'unilogo';
src: url('../fonts/unilogo.eot?br90gl');
src: url('../fonts/unilogo.eot?#iefixbr90gl') format('embedded-opentype'), url('../fonts/unilogo.woff?br90gl') format('woff'), url('../fonts/unilogo.ttf?br90gl') format('truetype'), url('../fonts/unilogo.svg?br90gl#unilogo') format('svg');
font-weight: normal;
font-style: normal;
}
[class^="adim-icon-"],
[class*=" adim-icon-"] {
font-family: 'adim';
[class^="unilogo-"],
[class*=" unilogo-"] {
font-family: 'unilogo';
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
font-size: 85px;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.adim-icon-blank:before {
content: " ";
}
.adim-icon-line-width:before {
.unilogo-unil-notext:before {
content: "\e600";
}
.adim-icon-opacity:before {
.unilogo-unil:before {
content: "\e601";
}
.adim-icon-color:before {
.unilogo-riset:before {
content: "\e602";
}
/*!
* Unilogo – Webfont
* Copyright (c) Université de Lausanne 2014 - Julien Furrer <Julien.Furrer@unil.ch>
* The graphics of unilogo is copyright of Unil, all rights reserved.
* The webfont was generated by IcoMoon App (https://icomoon.io/app/)
*/
#main-footer {
position: absolute;
bottom: 0;
background-color: #6C6E73;
width: 100%;
height: 120px;
overflow: auto;
padding-top: 25px;
box-shadow: 0 3px 3px -1px rgba(0, 0, 0, 0.33) inset;
}
#main-footer .logo {
margin-top: -3px;
font-size: 63px;
}
#main-footer,
#main-footer a,
#main-footer a:visited {
color: #eee;
text-decoration: none;
}
#main-footer a:hover,
#main-footer a:active {
color: #fff;
text-decoration: none;
border-bottom: dotted 1px #fff;
text-shadow: 0 0 2px rgba(255, 255, 255, 0.25);
}
#main-footer .logo,
#main-footer a.logo {
line-height: 75px;
text-shadow: 0 0 1px rgba(0, 0, 0, 0.33);
}
#main-footer .logo:hover,
#main-footer a.logo:hover,
#main-footer .logo:active,
#main-footer a.logo:active {
border-bottom: none !important;
text-shadow: 0 0 1px rgba(0, 0, 0, 0.33), 0 0 4px rgba(255, 255, 255, 0.25);
}
#main-footer ul a {
line-height: 1.8em;
}
@font-face {
font-family: 'unilogo';
src: url('../fonts/unilogo.eot?br90gl');
src: url('../fonts/unilogo.eot?#iefixbr90gl') format('embedded-opentype'), url('../fonts/unilogo.woff?br90gl') format('woff'), url('../fonts/unilogo.ttf?br90gl') format('truetype'), url('../fonts/unilogo.svg?br90gl#unilogo') format('svg');
font-family: 'adim';
src: url('../fonts/adim.eot?45qrwp8');
src: url('../fonts/adim.eot?#iefix45qrwp8') format('embedded-opentype'), url('../fonts/adim.woff?45qrwp8') format('woff'), url('../fonts/adim.ttf?45qrwp8') format('truetype'), url('../fonts/adim.svg?45qrwp8#adim') format('svg');
font-weight: normal;
font-style: normal;
}
[class^="unilogo-"],
[class*=" unilogo-"] {
font-family: 'unilogo';
[class^="adim-icon-"],
[class*=" adim-icon-"] {
font-family: 'adim';
speak: none;
font-style: normal;
font-weight: normal;
font-variant: normal;
text-transform: none;
line-height: 1;
font-size: 85px;
/* Better Font Rendering =========== */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.unilogo-unil-notext:before {
.adim-icon-blank:before {
content: " ";
}
.adim-icon-line-width:before {
content: "\e600";
}
.unilogo-unil:before {
.adim-icon-opacity:before {
content: "\e601";
}
.unilogo-riset:before {
.adim-icon-color:before {
content: "\e602";
}
body {
......@@ -524,6 +566,9 @@ body {
#main-navbar:hover .adim-image-name .glyphicon {
opacity: 0.75;
}
#main-navbar li.info {
border-left: 1px solid rgba(255, 255, 255, 0.1);
}
.navbar-separator {
background-color: rgba(255, 255, 255, 0.1);
margin: 1px 15px 0;
......
adim_app/static/_src/less/adim.less
View file @ 6dd3a044
......@@ -46,8 +46,9 @@
@property-panel-light-color: #888;
@import "adim-icons";
@import "unilogo";
@import "adim-footer";
@import "adim-icons";
// ===== Global ===========================================
body {
......@@ -116,6 +117,10 @@ html, body {
opacity: 0.75;
}
}
li.info {
border-left: 1px solid rgba(255, 255, 255, 0.1);
}
}
.navbar-separator {
......
adim_app/templates/adim_app/base_annotation.html
View file @ 6dd3a044
......@@ -27,6 +27,10 @@
{{ block.super }}
<li class="info">
<a href="#"><span class="icon-info-sign"></span></a>
</li>
{% endblock navbar_right_content %}
......@@ -248,7 +252,7 @@ if (t === "light") {
<span class="tool-text">Plein</span>
</button>
<button class="btn btn-default" id="attr-font" type="button" autocomplete="off">
<button class="btn btn-default" id="attr-font" type="button">
<span class="icon-fontcase"></span>
</button>
......
adim_app/templates/adim_app/home.html
View file @ 6dd3a044
......@@ -3,6 +3,14 @@
{% block page_head %}{% endblock %}
{% block navbar_right_content %}
{{ block.super }}
<li>
<p class="navbar-text">&nbsp;&nbsp;&nbsp;</p>
</li>
{% endblock %}
{% block main_content %}
<div class="container" id="home-container">
<div class="row">
......@@ -22,9 +30,40 @@
{% endif %}
</div>
</div>
</div>
<div id="main-footer">
<div class="container">
<div class="row">
<div class="col-sm-4">
<a href="http://www.unil.ch/" class="logo unilogo-unil"></a>
</div>
<div class="col-sm-4">
<ul class="list-unstyled small">
<li><a href="contacts.html">
<span class="glyphicon glyphicon-envelope"></span>&nbsp;
Contacts</a></li>
<li><a href="credits.html">
<span class="glyphicon glyphicon-glass"></span>&nbsp;
Credits
</a></li>
<li><a href="legal_info.html">
<span class="glyphicon glyphicon-briefcase"></span>&nbsp;
Informations légale
</a></li>
</ul>
</div>
<div class="col-sm-4">
<p class="text-right small">© 2014 Unil &mdash; <a href="http://www.unil.ch/">Université de Lausanne</a> <br>
{# <a href="/thinkcloud/legal_info/">Some rights reverved</a>#}
</p>
</div>
</div>
</div>
</div>
{# <iframe sandbox="allow-same-origin" src="{% url "shib-login" %}" width="0" height="0"></iframe>#}
{% endblock main_content %}
{% block main_container %}{% endblock %}
......
adim_app/templates/base.html
View file @ 6dd3a044
......@@ -26,7 +26,6 @@
{% block navbar_content %}
<ul class="nav navbar-nav navbar-right">
{% block navbar_right_content %}
{% if user.is_authenticated %}
<li>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
......@@ -40,7 +39,6 @@
</ul>
</li>
{% endif %}
<li><p class="navbar-text">&nbsp;&nbsp;&nbsp;</p></li>
{% endblock navbar_right_content %}
</ul>
{% endblock navbar_content %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment