Skip to content

GitLab

Commit 98e2fe38 authored by Olga Brani's avatar Olga Brani
Browse files

Cloudbar fixes. Html updates.

parent a27e90cf
Hide whitespace changes
Inline Side-by-side
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
View file @ 98e2fe38
/* Variables.less
* Variables to customize the look and feel of Bootstrap
* ----------------------------------------------------- */
/* Mixins.less
* Snippets of reusable CSS to develop faster and keep code readable
* ----------------------------------------------------------------- */
.servicesbar {
font-family: arial, sans-serif !important;
font-size: 13px !important;
line-height: 13px;
letter-spacing: 0px;
zoom: 1;
color: #ccc;
z-index: 1000;
border-bottom: 1px solid #444;
background-color: #000000;
position: relative;
}
.servicesbar ol, .servicesbar ul {
list-style: none;
margin: 0;
padding: 0;
}
.servicesbar li {
margin: 0;
padding: 0;
}
.servicesbar:before, .servicesbar:after {
display: table;
content: "";
zoom: 1;
}
.servicesbar:after {
clear: both;
}
.servicesbar a {
border: none !important;
font-family: arial, sans-serif !important;
font-size: 13px !important;
color: #e6e6e6;
text-decoration: none;
display: block;
float: left;
padding: 11px;
height: 13px;
}
.servicesbar a:hover {
background-color: #444;
}
.servicesbar a.active {
font-weight: bold;
font-size: 13px !important;
background-color: #333;
}
.servicesbar a img {
border: none;
margin: 1px;
margin-bottom: 2px;
}
.servicesbar .services {
zoom: 1;
}
.servicesbar .services:before, .servicesbar .services:after {
display: table;
content: "";
zoom: 1;
}
.servicesbar .services:after {
clear: both;
}
.servicesbar .services a {
font-size: 13px !important;
font-weight: bold;
color: #ccc;
}
.servicesbar .services a.with-icon {
margin: 0 !important;
padding: 0 !important;
width: 35px;
height: 35px;
}
.servicesbar .services a.active {
font-size: 13px !important;
color: #ffffff !important;
}
.servicesbar .services a:hover {
background-color: #444;
}
.servicesbar .profile {
margin-top: -35px;
zoom: 1;
text-align: right;
min-width: 200px;
width: 200px;
background-color: #000000;
zoom: 1;
position: absolute;
right: 0;
float: right;
}
.servicesbar .profile:before, .servicesbar .profile:after {
display: table;
content: "";
zoom: 1;
}
.servicesbar .profile:after {
clear: both;
}
.servicesbar .profile .user > a {
font-weight: bold !important;
font-size: 12px !important;
}
.servicesbar .profile .user.active {
background-color: #333;
}
.servicesbar .profile a {
float: none;
}
.servicesbar .profile ul {
display: none;
}
.servicesbar .profile ul li {
width: 100%;
border-bottom: 1px solid #444;
background-color: #333;
}
.servicesbar .profile ul li a {
float: none;
display: block;
}
.servicesbar .profile:hover, .servicesbar .profile.hover {
background-color: #222;
}
.servicesbar .profile:hover ul, .servicesbar .profile.hover ul {
display: block;
}
.servicesbar .profile:before, .servicesbar .profile:after {
display: table;
content: "";
zoom: 1;
}
.servicesbar .profile:after {
clear: both;
}
/* helpers ------------------------------------*/
.clearfix:before,
.clearfix:after { content:" "; display:block; height:0; visibility:hidden; } /* http://www.yuiblog.com/blog/2010/09/27/clearfix-reloaded-overflowhidden-demystified/ */
.clearfix:after { clear:both; }
.visuallyhidden { position:absolute !important; clip:rect(0 0 0 0); }
/* cloudbar header */
.cloudbar { background:#000; color:#fff; line-height:35px; width:100%; font-size:13px; font-family:Antic,Arial,sans-serif;}
div.cloudbar { background:#000; color:#fff; line-height:35px; width:100%; font-size:13px; font-family:Antic,Arial,sans-serif;}
.cloudbar .wrapper { width:auto; padding:0;}
.cloudbar a { color:#fff; text-decoration:none;}
.cloudbar .profile { float:right; background:#01A1AE; min-width:190px; padding:0; text-align:right; }
......
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js
View file @ 98e2fe38
......@@ -27,6 +27,12 @@ $(document).ready(function(){
var css = $("<link />");
css.attr({rel:'stylesheet', type:'text/css', href:cssloc + 'cloudbar.css'});
$("head").append(css);
// load fonts
var font_url = 'https://fonts.googleapis.com/css?family=Antic';
var css_font = $("<link />");
css_font.attr({rel:'stylesheet', type:'text/css', href:font_url});
$("head").append(css_font);
// load service specific css
var SKIP_ADDITIONAL_CSS = window.SKIP_ADDITIONAL_CSS == undefined ? false : window.SKIP_ADDITIONAL_CSS;
......
snf-astakos-app/astakos/im/static/im/css/modules.css
View file @ 98e2fe38
body { overflow-y: scroll;}
.wrapper { margin:0 auto; position:relative; width:820px; padding:36px 70px; }
.container .wrapper,
.footer .wrapper { border: 1px solid #808080; border-top:0 none;}
......@@ -65,9 +66,8 @@ img.right { margin:0 0 1em 1em; float:right;}
.container .extra ul.options { font-size:1em; margin:0 ; padding:15px; }
.landing h2, .landing a:hover { color:#01A1AE;}
.faq h2, .faq a:hover, .faq .current a { color:#EF4F54; border:0 none;}
.content .question h2 { color:#EF4F54 }
.question h2 { color:#EF4F54 }
.content .backlink { margin:1em 0; }
.content .question .backlink a:hover { border-bottom:1px solid #F89A1C }
.faq h3 { color:#4085a6; margin:0;}
.faq ul { padding:0; margin:0; }
.faq ul li { list-style:none outside; padding:0; margin:0; }
......@@ -83,7 +83,7 @@ img.right { margin:0 0 1em 1em; float:right;}
.posts ul { margin:0;padding:0; }
.posts ul li { padding:0; margin:0 0 50px; list-style:none outside; }
.posts ul li img { max-width:100%; margin-bottom:1em;}
.posts ul li p.info { padding-bottom:10px; margin-bottom:20px; font-size:0.769em; color:#808080; background:url(../images/dots.jpg) repeat-x bottom ;}
.posts ul li p.info { padding-bottom:10px; margin:20px 0; font-size:0.769em; color:#808080; background:url(../images/dots.jpg) repeat-x bottom ;}
.article p.info { margin-top:20px; padding-top:10px; font-size:0.769em; color:#808080; }
.article h2, .posts h2 { color:#ef4f53; }
.posts h2 a, .posts h2 a:hover { border:0 none;color:#ef4f53;}
......@@ -133,8 +133,7 @@ a.videolink:hover { background:url(../images/video_image.png)
.resources .categories ul li a { color: #000000; margin-right: 22px; text-decoration: none; }
.resources .categories ul li a:hover,
.resources .categories ul li a.selected { color: #000000;}
.resources .categories ul li.resource-cat-1.active a { border-bottom: 1px solid #F89A1C; }
.resources .categories ul li.resource-cat-2.active a { border-bottom: 1px solid #4085A5 }
.resources .categories ul li.active a { text-decoration: underline }
.resources .categories ul li.inactive { opacity: 0.3; }
.resources .categories ul li.active { opacity: 1; }
.resources .list { line-height: 1em; margin-top: 60px; position: relative; margin-right:-35px; }
......@@ -161,14 +160,11 @@ a.videolink:hover { background:url(../images/video_image.png)
.resources .list .resource-cat-1.resource { border-color: #4085A5 }
.resources .list .resource-cat-1.resource .title { color: #4085A5 }
.resources .list .resource-cat-1.resource .description { background-color: #4085A5 }
.resources .resource-cat-1.filter-item a { color: #4085A5 }
.resources .filter-item a { display:inline-block; line-height:100%; }
.resources .resource-cat-1.filter-item a:hover { border-bottom:1px solid #F89A1C; }
.resources .resource-cat-2.filter-item a:hover { border-bottom:1px solid #4085A5; }
.resources .filter-item a:hover { text-decoration:underline }
.resources .list .resource-cat-2.resource { border-color: #FF6F00 }
.resources .list .resource-cat-2.resource .title { color: #FF6F00 }
.resources .list .resource-cat-2.resource .description { background-color: #FF6F00 }
.resources .resource-cat-2.filter-item a { color: #FF6F00 }
table { width:80%; color:#B3B3B3;}
table th, table td { padding:5px 5px 5px 0; }1234
......@@ -216,4 +212,60 @@ a.button:hover { background-color: #F89A1C; border:0 none; color:#fff;}
#animation p img { display:inline-block; width:65%; }
/* Weird bug in pages that contain captcha. An extra iframe appears in chrome :S*/
.container +iframe { display:none; }
\ No newline at end of file
.container +iframe { display:none; }
/* Style for im/projects */
table.alt-style { color:#000; width:100%; }
table.alt-style caption { font-weight:normal; font-size:1.154em; }
table.alt-style tr th { font-weight:normal; color:#3582AC }
table.alt-style tr td { color:#222; }
table.alt-style tr td:first-child,
table.alt-style tr th:first-child { padding-left:5px; }
.content a.submit { margin:0; display:inline-block; margin:10px 0 ; height:auto;}
table.alt-style tr:nth-child(2n) td { background:#F2F2F2 }
dl.alt-style { width:500px; }
dl.alt-style dt { width:50%; float:left; color:#3582AC; font-weight:normal;}
dl.alt-style dt:nth-child(2n) { background:black; }
.projects { padding-bottom:30px; }
.projects h2 span { color:#3582AC;}
.projects h2 em { float:right; }
.projects h3 { font-size:1.154em; }
.projects .submit-rt { margin:0; text-align:right; }
.projects +.buttons-list.fixpos { left:0; right:auto; }
/* new faq-userguide styles */
.faq .two-cols .lt { width:460px; }
.faq .two-cols .rt { width:340px; }
.lt-small .rt { width:520px; }
.lt-small .lt { width:280px; }
.unequal-dotted { background:url(../images/double-dots-unequal.jpg) no-repeat top center; padding: 30px 0 0 ; margin-top:30px;}
.unequal-dotted:first-child { background:none; padding-top:0; margin-top:0; }
.tirkouaz h2,
.tirkouaz h2 a,
.tirkouaz h3,
.tirkouaz a:hover { color:#00A1B0; }
.yellow h2,
.yellow h2 a,
.yellow h3,
.yellow a:hover { color:#F6921E; }
.purple h2,
.purple h2 a,
.purple h3,
.purple a:hover { color:#7B499C; }
.details ul li a,
.details ul li a:hover,
.question .content a:hover { color:#F6921E }
.details .extra-menu { background: url(../images/dots.jpg) repeat-x center top ;padding-top:20px; margin-top:20px; }
.details .faq-category h2 { font-size:1em; }
.question .next-prev { margin:10px 0; }
.question .next { float:right; }
.details img { max-width:100%; }
.question .section { margin-top:1em; }
.question pre { border:1px dashed #000; padding:5px; margin:10px 0; line-height:auto; }
.widjets { margin: 0; padding:0; }
.widjets li { width:50%; float:left; list-style:none outside; margin:30px 0; }
.widjets li div { border:1px dashed #000; padding:20px 20px 70px; width:60%; margin:0 auto; position:relative; }
.widjets li div img { max-width:100%; }
.widjets li .btn { text-align:center; position:absolute; bottom:0; left:0; right:0; }
\ No newline at end of file
snf-astakos-app/astakos/im/templates/registration/password_reset_form.html
View file @ 98e2fe38
......@@ -4,12 +4,12 @@
Password reset
{% endblock %}
{% block body %}
{% block body.left %}
<div class="section">
<img class="pic" src="{{ IM_STATIC_URL }}images/pictures/login_pic.png" />
</div>
{% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body %}
{% endblock body.left %}
{% block body.right %}
{% if "local" in im_modules %}
......
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