Skip to content

GitLab

Commit 81e9e469 authored by Olga Brani's avatar Olga Brani
Browse files

Style fixes

parent 8a0408f7
Hide whitespace changes
Inline Side-by-side
snf-astakos-app/astakos/im/static/im/css/formating.css
View file @ 81e9e469
...@@ -29,7 +29,7 @@ a img, :link img, :visited img { border:none; } ...@@ -29,7 +29,7 @@ a img, :link img, :visited img { border:none; }
a span { cursor:pointer; } a span { cursor:pointer; }
abbr[title], dfn[title] { border-bottom:1px dotted; cursor:help; } abbr[title], dfn[title] { border-bottom:1px dotted; cursor:help; }
address { font-style:italic; margin:0 0 1.5em 0; } address { font-style:italic; margin:0 0 1.5em 0; }
body { background:white; color:#222; font-family: Antic, Arial, sans-serif; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px; } body { background:white; color:#222; font-family: Antic, Arial, sans-serif; font-size:81.3%; line-height:1.5; text-align:left; letter-spacing:1px;}
code, kbd, pre, samp { font-family:monospace, sans-serif; } code, kbd, pre, samp { font-family:monospace, sans-serif; }
del { text-decoration:line-through; } del { text-decoration:line-through; }
dl { margin:1em 0; } dl { margin:1em 0; }
...@@ -39,8 +39,8 @@ em, i { font-style:italic; font-weight:inherit; } ...@@ -39,8 +39,8 @@ em, i { font-style:italic; font-weight:inherit; }
h1, h2, h3, h4, h5, h6 { font-weight:bold; line-height:1.4; margin-bottom:0; } h1, h2, h3, h4, h5, h6 { font-weight:bold; line-height:1.4; margin-bottom:0; }
/* Typographic scale based on 12px body size */ /* Typographic scale based on 12px body size */
h1 { font-size:4em; } h1 { font-size:4em; }
h2 { font-size:1.231em; } h2 { font-size:1em; }
h3 { font-size:1.154em; } h3 { font-size:1em; }
h4 { font-size:1.5em; } h4 { font-size:1.5em; }
h5 { font-size:1.333em; } h5 { font-size:1.333em; }
h6 { font-size:1.167em; } h6 { font-size:1.167em; }
......
snf-astakos-app/astakos/im/static/im/css/forms.css
View file @ 81e9e469
...@@ -24,7 +24,7 @@ form .form-row.submit { margin: 22px 0 ;} ...@@ -24,7 +24,7 @@ form .form-row.submit { margin: 22px 0 ;}
form .form-row .extra-link { color: #808080; text-decoration: none; border: none; margin-top:15px; line-height:42px; float: right; } form .form-row .extra-link { color: #808080; text-decoration: none; border: none; margin-top:15px; line-height:42px; float: right; }
form .form-row .extra-link:hover { text-decoration:underline;} form .form-row .extra-link:hover { text-decoration:underline;}
form .form-row label { font-size: 1.1em; } form .form-row label { font-size: 1.1em; }
form.innerlabels label { position: absolute; top: 1.1em; left: 1.5em; color: #808080 ; } form.innerlabels label { position: absolute; top: 12px; left: 1.5em; color: #808080 ; }
form.innerlabels p { margin:0; position: relative;} form.innerlabels p { margin:0; position: relative;}
form.innerlabels p.p15px { font-size:1.154em;} form.innerlabels p.p15px { font-size:1.154em;}
form.innerlabels p.p15px a { margin:0 5px;} form.innerlabels p.p15px a { margin:0 5px;}
...@@ -65,7 +65,7 @@ form .with-errors input, ...@@ -65,7 +65,7 @@ form .with-errors input,
form .with-errors textarea, form .with-errors textarea,
form .with-errors select { color: #9d261d;} form .with-errors select { color: #9d261d;}
form .with-errors label { color: #e4776f; } form .with-errors label { color: #e4776f; }
.form-error { color:red; font-style:italic; font-size: 0.8em; padding: 5px 5px; } .form-error { color:red; font-size: 0.8em; padding: 5px 5px; }
.form-errors.all .form-error { position: relative; border-radius: 0; margin-bottom: 1.3em; padding: 0.5em; } .form-errors.all .form-error { position: relative; border-radius: 0; margin-bottom: 1.3em; padding: 0.5em; }
div.form-stacked { margin-bottom: 4em; } div.form-stacked { margin-bottom: 4em; }
.checkbox-widget.checked { background-color: #FF0000; background-image: url("../images/checkbox.png"); background-position: 50% 50%; } .checkbox-widget.checked { background-color: #FF0000; background-image: url("../images/checkbox.png"); background-position: 50% 50%; }
...@@ -76,14 +76,14 @@ form.innerlabels .checkbox-widget + label + a { border-bottom:1px solid #F89A1C ...@@ -76,14 +76,14 @@ form.innerlabels .checkbox-widget + label + a { border-bottom:1px solid #F89A1C
form span.info { position:absolute;z-index:10; top:10px; left: 290px; } form span.info { position:absolute;z-index:10; top:10px; left: 290px; }
form span.info em { display:block; overflow:hidden; position:absolute; left:0; text-indent:-100px; top:0; height:21px; width:21px; background:url(../images/symbols.png) no-repeat -4px -31px;cursor:pointer; } form span.info em { display:block; overflow:hidden; position:absolute; left:0; text-indent:-100px; top:0; height:21px; width:21px; background:url(../images/symbols.png) no-repeat -4px -31px;cursor:pointer; }
form span.info:hover em { background-position:-4px -3px; } form span.info:hover em { background-position:-4px -3px; }
form span.info span { position:absolute; left:29px; top:-2px; width:150px; padding-left:55px; background:url(../images/black-line.jpg ) no-repeat left 12px; min-height:50px; display:none; } form span.info span { position:absolute; left:29px; top:-2px; width:120px; padding-left:30px; background:url(../images/black-line.jpg ) no-repeat left 12px; min-height:50px; display:none; font-size:0.846em;}
form span.info:hover span { display:block; } form span.info:hover span { display:block; }
form .with-errors span.info { display:none;} form .with-errors span.info { display:none;}
form p { margin-bottom:0;position:relative;} form p { margin-bottom:0;position:relative;}
form input[readonly=true] { background-color: #ddd; color: #5e5e5e; } form input[readonly=true] { /*background-color: #ddd;*/ color: #5e5e5e; }
#recaptcha_area { margin-top:20px; } #recaptcha_area { margin-top:20px; }
form.innerlabels .with-checkbox .checkbox-widget { margin-top:15px; } form.innerlabels .with-checkbox .checkbox-widget { margin-top:15px; }
form.innerlabels .with-checkbox .checkbox-label { left:2.5em; } form.innerlabels .with-checkbox .checkbox-label { left:2.5em; top:17px; }
form .extra-img { display:block; width:21px; height:21px; overflow:hidden; position:absolute; left:440px;top:10px; z-index:101;} form .extra-img { display:block; width:21px; height:21px; overflow:hidden; position:absolute; left:440px;top:10px; z-index:101;}
form .with-errors .extra-img { background:url(../images/symbols.png) no-repeat -58px -3px;} form .with-errors .extra-img { background:url(../images/symbols.png) no-repeat -58px -3px;}
......
snf-astakos-app/astakos/im/static/im/css/ie7.css
View file @ 81e9e469
...@@ -7,5 +7,9 @@ textarea { overflow:auto; } ...@@ -7,5 +7,9 @@ textarea { overflow:auto; }
img { -ms-interpolation-mode:bicubic; } img { -ms-interpolation-mode:bicubic; }
.clearfix { zoom:1; } .clearfix { zoom:1; }
.container .navigation ul li { display:inline;} .container .navigation ul li { display:inline;}
.lt .box-more ul.col { display:inline;} .lt .box-more ul.col { display:inline;}
\ No newline at end of file
form input.text,
form input[type="text"],
form input[type="password"] { margin-bottom:-3px;}
snf-astakos-app/astakos/im/static/im/css/modules.css
View file @ 81e9e469
.wrapper { margin:0 auto; position:relative; width:820px; padding:36px 70px; } .wrapper { margin:0 auto; position:relative; width:820px; padding:36px 70px; }
.container .wrapper, .container .wrapper,
.footer .wrapper { border: 1px solid #808080; border-top:0 none;} .footer .wrapper { border: 1px solid #808080; border-top:0 none;}
.footer .wrapper { padding:20px 70px 25px; }
.centered { text-align:center;} .centered { text-align:center;}
img.left { margin:0 1em 1em 0; float:left;} img.left { margin:0 1em 1em 0; float:left;}
img.right { margin:0 0 1em 1em; float:right;} img.right { margin:0 0 1em 1em; float:right;}
/* header */
.header { background:#000; color:#fff; height:35px; line-height:35px; }
.header .wrapper { width:auto; padding:0;}
.header a { color:#fff; text-decoration:none;}
.header .profile { float:right; background:#01A1AE; min-width:150px; padding:0 20px; text-align:right; }
.header .profile a { text-decoration:none; color:#fff; }
.header .profile ul { position:absolute; right:0; top:35px; padding:0; margin:0; width:190px; display:none; z-index:9; background:#fff;}
.header .profile ul li { list-style:none outside; line-height:35px; padding:0 20px;}
.header .profile ul li:hover a { color:#01A1AE;}
.header .profile:hover ul { display:block; }
.header .profile .full a { padding-right:20px; background:url(../images/arrow-white.png) no-repeat right center;}
.header .profile .full ul { border:1px dashed #000; border-top:0 none; border-right:0 none;}
.header .profile ul li a { padding-right:0; background:none; color:#000;}
.header ul.services { margin:0; padding:0; }
.header ul.services li { float:left; height:35px; line-height:35px; text-align:center; padding: 0 30px; list-style:none outside;}
.header ul.services li:first-child { padding:0 5px;}
.header ul.services li.active { background:#333;}
.header ul.services li:hover { background:#444; }
/* footer */ /* footer */
.footer { font-size:0.923em;color:#B3B3B3; } .footer { font-size:0.923em;color:#B3B3B3; }
.footer a { color:#B3B3B3; text-decoration:none; transition:color 0.15s ease-in-out 0s; -moz-transition: color 0.15s ease-in-out 0s; -webkit-transition: color 0.15s ease-in-out 0s; -o-transition: color 0.15s ease-in-out 0s; } .footer a { color:#B3B3B3; text-decoration:none; transition:color 0.15s ease-in-out 0s; -moz-transition: color 0.15s ease-in-out 0s; -webkit-transition: color 0.15s ease-in-out 0s; -o-transition: color 0.15s ease-in-out 0s; }
.footer:hover a { color:#808080;} .footer:hover a { color:#808080;}
.footer a:hover { color:#000;} .footer a:hover { color:#000;}
.footer ul { float:left; margin:0 0 0 22px; width:140px; padding:0;} .footer ul { float:left; margin:0 0 0 22px; width:140px; padding:0;}
.footer ul li { padding:0; margin:0 0 0.5em 0; list-style:none outside;} .footer ul li { padding:0; margin:0; list-style:none outside;}
.footer ul li:first-child { margin-bottom:1em; } .footer ul li:first-child { margin-bottom:1em; }
.footer .clearfix { padding-bottom:20px;} .footer .clearfix { padding-bottom:20px;}
.footer .clearfix ul:first-child { margin-left:0;} .footer .clearfix ul:first-child { margin-left:0;}
...@@ -47,22 +28,22 @@ img.right { margin:0 0 1em 1em; float:right;} ...@@ -47,22 +28,22 @@ img.right { margin:0 0 1em 1em; float:right;}
.top-msg .close { position:absolute; bottom:20px; right:20px; font-size:1.3em; font-weight:bold; border:0 none; color:#fff; text-decoration:none;} .top-msg .close { position:absolute; bottom:20px; right:20px; font-size:1.3em; font-weight:bold; border:0 none; color:#fff; text-decoration:none;}
.top-msg .close:hover { color:#000;} .top-msg .close:hover { color:#000;}
/* container */ /* container */
.container .wrapper { padding-bottom:100px;} .container .wrapper { padding-bottom:100px;}
.container .navigation { margin:20px 0 40px; font-size:1.231em;} .mainlogo h1 { line-height:100%; font-size:1em; }
.container .navigation { margin:20px 0 0; font-size:1.154em; height:95px;}
.container .navigation ul { margin:5px 0; padding:0;} .container .navigation ul { margin:5px 0; padding:0;}
.container .navigation ul li { list-style:none outside; padding:0; margin:0 0 0 1em; display:inline-block;} .container .navigation ul li { list-style:none outside; padding:0; margin:0 0 0 1em; display:inline-block;}
.container .navigation ul li:first-child { margin-left:0;} .container .navigation ul li:first-child { margin-left:0;}
.container .navigation ul li a { color:#000; text-decoration:none; } .container .navigation ul li a { color:#000; text-decoration:none; }
.container .navigation ul li a:hover { color:#F89A1C; } .container .navigation ul li a:hover { color:#F89A1C; }
.container .navigation ul li.active a { color:#F89A1C; } .container .navigation ul li.active a { color:#F89A1C; }
.dotted { background:url(../images/double-dots.jpg) no-repeat bottom center; padding:0 0 30px; margin-bottom:30px;} .dotted { background:url(../images/double-dots.jpg) no-repeat bottom center; padding:0 0 30px; margin-bottom:30px;}
.two-cols .rt { float:right; width:390px;} .two-cols .rt { float:right; width:400px;}
.two-cols .lt { float:left; width:390px;} .two-cols .lt { float:left; width:400px;}
.two-cols .lt p { padding-right:40px;} .two-cols-blog .rt { float:right; width:220px; margin-left:80px; padding-right:65px;}
.two-cols-lt580 .rt { float:right; width:200px; margin-left:40px;} .two-cols-blog .lt { overflow:hidden;}
.two-cols-lt580 .lt { overflow:hidden;}
.container h2, .container h3 { font-weight:normal; margin-bottom:1em; } .container h2, .container h3 { font-weight:normal; margin-bottom:1em; }
.container h2 em { color: #3582AC; font-style:normal; } .container h2 em { color: #3582AC; font-style:normal; }
.content a { border-bottom: 1px solid #F89A1C; text-decoration:none; color:#000; } .content a { border-bottom: 1px solid #F89A1C; text-decoration:none; color:#000; }
...@@ -72,7 +53,10 @@ img.right { margin:0 0 1em 1em; float:right;} ...@@ -72,7 +53,10 @@ img.right { margin:0 0 1em 1em; float:right;}
.container ul.options li a { border:0 none;} .container ul.options li a { border:0 none;}
.container ul.options li a:hover { text-decoration:underline;} .container ul.options li a:hover { text-decoration:underline;}
.landing h2, .landing a:hover { color:#01A1AE;} .landing h2, .landing a:hover { color:#01A1AE;}
.faq h2, .faq a:hover { color:#EF4F54; border:0 none;} .faq h2, .faq a:hover, .faq .current a { color:#EF4F54; border:0 none;}
.content .question h2 { color:#4085A6 }
.content .question .backlink a { border:0 none; color:#F89A1C }
.content .question .backlink a:hover { text-decoration:underline; }
.faq h3 { color:#4085a6; margin:0;} .faq h3 { color:#4085a6; margin:0;}
.faq ul { padding:0; margin:0; } .faq ul { padding:0; margin:0; }
.faq ul li { list-style:none outside; padding:0; margin:0; } .faq ul li { list-style:none outside; padding:0; margin:0; }
...@@ -88,8 +72,8 @@ img.right { margin:0 0 1em 1em; float:right;} ...@@ -88,8 +72,8 @@ img.right { margin:0 0 1em 1em; float:right;}
.posts ul { margin:0;padding:0; } .posts ul { margin:0;padding:0; }
.posts ul li { padding:0; margin:0 0 50px; list-style:none outside; } .posts ul li { padding:0; margin:0 0 50px; list-style:none outside; }
.posts ul li img { max-width:580px; margin-bottom:1em;} .posts ul li img { max-width:580px; margin-bottom:1em;}
.posts ul li p.info { padding-bottom:10px; margin-bottom:20px; font-size:0.923em; color:#808080; border-bottom:1px dashed #000;} .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 ;}
.article p.info { margin-top:20px; padding-top:10px; font-size:0.923em; color:#808080; } .article p.info { margin-top:20px; padding-top:10px; font-size:0.769em; color:#808080; }
.article h2, .posts h2 { color:#ef4f53; } .article h2, .posts h2 { color:#ef4f53; }
.posts h2 a, .posts h2 a:hover { border:0 none;color:#ef4f53;} .posts h2 a, .posts h2 a:hover { border:0 none;color:#ef4f53;}
.posts p.date, .article p.date { margin:0; font-size:1.231em; color:#01a1ae; } .posts p.date, .article p.date { margin:0; font-size:1.231em; color:#01a1ae; }
......
snf-astakos-app/astakos/im/templates/im/base.html
View file @ 81e9e469
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<link href="https://fonts.googleapis.com/css?family=Antic" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Antic" rel="stylesheet" type="text/css">
<link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/global.css"> <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/global.css">
<!--[if lte IE 7]> <!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}im/css/ie7.css"> <link rel="stylesheet" type="text/css" href="{{ IM_STATIC_URL }}css/ie7.css">
<![endif]--> <![endif]-->
{% endblock page.css %} {% endblock page.css %}
......
snf-astakos-app/astakos/im/templates/im/login_base.html
View file @ 81e9e469
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
{% endwith %} {% endwith %}
<input type="hidden" name="next" value="{{ next }}"> <input type="hidden" name="next" value="{{ next }}">
<div class="form-row submit"> <div class="form-row submit">
<a class="extra-link" href="{% url django.contrib.auth.views.password_reset %}">Forgot your password?</a>
<input type="submit" class="submit altcol" value="SUBMIT" /> <input type="submit" class="submit altcol" value="SUBMIT" />
<a class="extra-link" href="{% url django.contrib.auth.views.password_reset %}">Forgot your password?</a>
</div> </div>
</form> </form>
{% endif %} {% endif %}
......
snf-astakos-app/astakos/im/templates/im/signup.html
View file @ 81e9e469
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
{% endblock %} {% endblock %}
{% block body.left %} {% block body.left %}
<img class="pic" src="{{ IM_STATIC_URL }}images/pictures/signup_pic.png" /> <img class="pic" src="{{ IM_STATIC_URL }}images/pictures/ring_bell_beige.gif" />
{% comment %}{% include "im/services_description.html" %}{% endcomment %} {% comment %}{% include "im/services_description.html" %}{% endcomment %}
{% endblock body.left %} {% endblock body.left %}
......
snf-astakos-app/conf/20-snf-astakos-app-settings.conf~ 0 → 100644
View file @ 81e9e469
# Set the expiration time of newly created auth tokens
# to be this many hours after their creation time.
#ASTAKOS_AUTH_TOKEN_DURATION = 30 * 24
# Authenticate via Twitter.
#ASTAKOS_TWITTER_KEY = ''
#ASTAKOS_TWITTER_SECRET = ''
#ASTAKOS_DEFAULT_USER_LEVEL = 4
#ASTAKOS_INVITATIONS_PER_LEVEL = {
# 0 : 100,
# 1 : 2,
# 2 : 0,
# 3 : 0,
# 4 : 0
#}
# Address to use for outgoing emails
#ASTAKOS_DEFAULT_FROM_EMAIL = 'GRNET Cloud <no-reply@grnet.gr>'
#ASTAKOS_DEFAULT_CONTACT_EMAIL = 'support@cloud.grnet.gr'
#ASTAKOS_DEFAULT_ADMIN_EMAIL = 'admin@cloud.grnet.gr'
# Identity Management enabled modules
#ASTAKOS_IM_MODULES = ['local', 'twitter', 'shibboleth']
# Force user profile verification
#ASTAKOS_FORCE_PROFILE_UPDATE = True
#Enable invitations
#ASTAKOS_INVITATIONS_ENABLED = True
#ASTAKOS_COOKIE_NAME = '_pithos2_a'
#ASTAKOS_COOKIE_DOMAIN = None
#ASTAKOS_COOKIE_SECURE = True
#ASTAKOS_IM_STATIC_URL = '/static/im/'
# If set to False and invitations not enabled newly created user will be
# automatically accepted
#ASTAKOS_MODERATION_ENABLED = True
# Set baseurl
#ASTAKOS_BASEURL = 'http://pithos.dev.grnet.gr'
# Set service name
#ASTAKOS_SITENAME = 'GRNET Cloud'
# Set cloud services appear in the horizontal bar
#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' })
#
# Set recaptcha keys
# http://www.google.com/recaptcha/whyrecaptcha
#ASTAKOS_RECAPTCHA_PUBLIC_KEY = ''
#ASTAKOS_RECAPTCHA_PRIVATE_KEY = ''
ASTAKOS_RECAPTCHA_OPTIONS = {'theme':'clean'}
#ASTAKOS_RECAPTCHA_USE_SSL = True
#ASTAKOS_RECAPTCHA_ENABLED = True
# set AstakosUser fields to propagate in the billing system
#ASTAKOS_BILLING_FIELDS = ['is_active']
# Queue for billing.
#'rabbitmq://guest:guest@localhost:5672/astakos'
#QUEUE_CONNECTION = None
# Set where the user should be redirected after logout
#ASTAKOS_LOGOUT_NEXT = ''
# Set user email patterns that are automatically activated
#ASTAKOS_RE_USER_EMAIL_PATTERNS = []
# Messages to display on login page header
# e.g. {'warning': 'This warning message will be displayed on the top of login page'}
#ASTAKOS_LOGIN_MESSAGES = {}
# messages to display as extra actions in account forms
# e.g. {'https://cms.okeanos.grnet.gr/': 'Back to ~okeanos'}
#ASTAKOS_PROFILE_EXTRA_LINKS = {}
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