Skip to content

GitLab

Commit a6e776c7 authored by Sofia Papagiannaki's avatar Sofia Papagiannaki
Browse files

Merge branch 'master' of https://code.grnet.gr/git/astakos

parents 0d02a287 d3e3dd89
Hide whitespace changes
Inline Side-by-side
snf-astakos-app/Changelog
View file @ a6e776c7
v0.3.2
======
- improved styles of sign up button
- do not send admin notification email if ASTAKOS_DEFAULT_ADMIN_EMAIL is not
set
- updated cloudbar styles
v0.3.1
======
......
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.css
View file @ a6e776c7
......@@ -5,7 +5,7 @@
* Snippets of reusable CSS to develop faster and keep code readable
* ----------------------------------------------------------------- */
.servicesbar {
font-family: arial, sans-serif;
font-family: arial, sans-serif !important;
font-size: 13px !important;
line-height: 13px;
letter-spacing: 0px;
......@@ -35,7 +35,8 @@
}
.servicesbar a {
border: none !important;
font-size: inherit !important;
font-family: arial, sans-serif !important;
font-size: 13px !important;
color: #e6e6e6;
text-decoration: none;
display: block;
......@@ -48,6 +49,7 @@
}
.servicesbar a.active {
font-weight: bold;
font-size: 13px !important;
background-color: #333;
}
.servicesbar a img {
......@@ -66,6 +68,18 @@
.servicesbar .services:after {
clear: both;
}
.servicesbar .services a {
font-size: 13px !important;
font-weight: bold;
color: #ccc;
}
.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;
......@@ -86,6 +100,10 @@
.servicesbar .profile:after {
clear: both;
}
.servicesbar .profile .user > a {
font-weight: bold !important;
font-size: 12px !important;
}
.servicesbar .profile a {
float: none;
}
......
snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.less
View file @ a6e776c7
......@@ -10,7 +10,7 @@
// mini reset
ol, ul { list-style:none; margin:0; padding:0;}
li {margin:0; padding:0;}
font-family: arial, sans-serif;
font-family: arial, sans-serif !important;
font-size: 13px !important;
line-height: 13px;
letter-spacing: 0px;
......@@ -23,7 +23,8 @@
a {
border: none !important;
font-size: inherit !important;
font-family: arial, sans-serif !important;
font-size: 13px !important;
color: @toolbarColor;
text-decoration: none;
display: block;
......@@ -35,6 +36,7 @@
}
&.active {
font-weight: bold;
font-size: 13px !important;
background-color: #333;
}
......@@ -47,6 +49,20 @@
.services {
.clearfix();
a {
font-size: 13px !important;
font-weight: bold;
color: #ccc;
&.active {
font-size: 13px !important;
color: @white !important;
}
&:hover {
background-color: #444;
}
}
}
position: relative;
......@@ -57,6 +73,13 @@
text-align: right;
min-width: 200px;
width: 200px;
.user {
&> a {
font-weight: bold !important;
font-size: 12px !important;
}
}
a {
float: none;
}
......
snf-astakos-app/astakos/im/static/im/css/styles.css
View file @ a6e776c7
......@@ -189,12 +189,21 @@ textarea {
clear: both;
}
.button {
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
background-color: #3582ac;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
color: #ffffff;
border: none;
padding: 0.8em 22px;
......@@ -203,6 +212,62 @@ textarea {
.button:hover {
background-color: #f89a1c;
}
.button a {
color: #ffffff !important;
text-decoration: none !important;
border: none !important;
}
a.button {
color: #ffffff !important;
text-decoration: none !important;
border: none !important;
}
.makeRow {
zoom: 1;
margin-left: -22px;
}
.makeRow:before, .makeRow:after {
display: table;
content: "";
zoom: 1;
}
.makeRow:after {
clear: both;
}
.button {
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
background-color: #3582ac;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
color: #ffffff;
border: none;
padding: 0.8em 22px;
font-size: 1em;
}
.button:hover {
background-color: #f89a1c;
}
.button a {
color: #ffffff !important;
text-decoration: none !important;
border: none !important;
}
a.button {
color: #ffffff !important;
text-decoration: none !important;
border: none !important;
}
/*addon to style django forms rendered with as_p filter*/
/*
* Tables.less
......@@ -411,6 +476,11 @@ body {
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
}
.topbar {
background-color: #cfcdc7;
......@@ -586,6 +656,8 @@ ul.inline li {
color: #f89a1c;
}
.page {
zoom: 1;
margin-left: -22px;
zoom: 1;
margin-left: -22px;
margin-top: 42px;
......@@ -599,6 +671,14 @@ ul.inline li {
.page:after {
clear: both;
}
.page:before, .page:after {
display: table;
content: "";
zoom: 1;
}
.page:after {
clear: both;
}
.page .page-inner {
position: relative;
}
......@@ -615,6 +695,8 @@ ul.inline li {
width: 470px;
}
.maincol.full {
zoom: 1;
margin-left: -22px;
zoom: 1;
margin-left: -22px;
margin-left: 0;
......@@ -631,6 +713,14 @@ ul.inline li {
.maincol.full:after {
clear: both;
}
.maincol.full:before, .maincol.full:after {
display: table;
content: "";
zoom: 1;
}
.maincol.full:after {
clear: both;
}
.appbar {
height: 30px;
background-color: #3582ac;
......@@ -677,6 +767,11 @@ input, textarea, .form-widget {
margin-top: 9px;
}
#forms .input, #forms input {
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
......@@ -799,6 +894,11 @@ form textarea,
form input.text,
form input[type="text"],
form input[type="password"] {
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
......@@ -819,12 +919,40 @@ form input[type="password"]:focus {
z-index: 100;
}
form input.submit, form input[type="submit"] {
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
background-color: #3582ac;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
color: #ffffff;
border: none;
padding: 0.8em 22px;
font-size: 1em;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
font-family: 'Antic', sans-serif;
font-size: 14px;
font-weight: normal;
line-height: 22px;
letter-spacing: 1px;
background-color: #3582ac;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
-webkit-transition: background-color 0.15s linear;
transition: background-color 0.15s linear;
color: #ffffff;
border: none;
padding: 0.8em 22px;
......@@ -833,6 +961,19 @@ form input.submit, form input[type="submit"] {
form input.submit:hover, form input[type="submit"]:hover {
background-color: #f89a1c;
}
form input.submit a, form input[type="submit"] a {
color: #ffffff !important;
text-decoration: none !important;
border: none !important;
}
form input.submit:hover, form input[type="submit"]:hover {
background-color: #f89a1c;
}
form input.submit a, form input[type="submit"] a {
color: #ffffff !important;
text-decoration: none !important;
border: none !important;
}
form .with-errors input, form .with-errors textarea, form .with-errors select {
color: #9d261d;
}
......@@ -900,6 +1041,16 @@ table tr.consumed td.consumed {
.row {
zoom: 1;
margin-left: -22px;
zoom: 1;
margin-left: -22px;
}
.row:before, .row:after {
display: table;
content: "";
zoom: 1;
}
.row:after {
clear: both;
}
.row:before, .row:after {
display: table;
......@@ -913,11 +1064,15 @@ table tr.consumed td.consumed {
color: #808080 !important;
-webkit-transition: color 0.15s linear;
transition: color 0.15s linear;
-webkit-transition: color 0.15s linear;
transition: color 0.15s linear;
}
.footer a {
color: #b3b3b3;
-webkit-transition: color 0.15s linear;
transition: color 0.15s linear;
-webkit-transition: color 0.15s linear;
transition: color 0.15s linear;
text-decoration: none;
}
.footer a:hover {
......
snf-astakos-app/astakos/im/static/im/css/styles.less
View file @ a6e776c7
@import "../less/bootstrap.less";
@import "../less/xtra.less";
@import "../less/django_forms.less";
@import "../less/tables.less";
......
snf-astakos-app/astakos/im/static/im/less/xtra.less
View file @ a6e776c7
......@@ -16,6 +16,7 @@
.button {
#font.main();
background-color: @buttonBg;
.transit(background-color);
color: @buttonColor;
border: none;
padding: 0.8em @gridGutterWidth;
......@@ -24,6 +25,18 @@
&:hover {
background-color: @linkColor;
}
a {
color: @white !important;
text-decoration: none !important;
border: none !important;
}
}
a.button {
color: @white !important;
text-decoration: none !important;
border: none !important;
}
......
snf-astakos-app/astakos/im/templates/im/login.html
View file @ a6e776c7
......@@ -37,9 +37,13 @@ Login
</div>
{% endfor %}
</div>
<div class="section">
<a href="{% url astakos.im.views.signup %}" class="action">SIGN UP</a>
{% block body.signup %}
<div class="section signup">
<br /><br />
<h2>NEW TO OKEANOS ?</h2>
<a class="button" href="{% url astakos.im.views.signup %}">CREATE ACCOUNT</a>
</div>
</div>
{% endblock %}
{% endblock %}
snf-astakos-app/conf/20-snf-astakos-app-settings.conf
View file @ a6e776c7
......@@ -46,10 +46,10 @@
#ASTAKOS_SITENAME = 'GRNET Cloud'
# Set cloud services appear in the horizontal bar
#ASTAKOS_CLOUD_SERVICES = getattr(settings, 'ASTAKOS_CLOUD_SERVICES', (
#ASTAKOS_CLOUD_SERVICES = (
# { 'url':'/', 'name':'grnet cloud', 'id':'cloud', 'icon':'home-icon.png' },
# { 'url':'/okeanos.html', 'name':'~okeanos', 'id':'okeanos' },
# { 'url':'/ui/', 'name':'pithos+', 'id':'pithos' }))
# { 'url':'/ui/', 'name':'pithos+', 'id':'pithos' })
#
# Set recaptcha keys
......
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