From c48e74922433ef6b2bf62d3e72e5397e736dc0bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Wed, 25 Jun 2014 17:57:22 +0200 Subject: [PATCH] style: switch to gadjo for styling (#5055) --- passerelle/settings.py | 1 + passerelle/static/css/style.css | 392 ---------------------- passerelle/templates/passerelle/base.html | 61 +--- requirements.txt | 1 + 4 files changed, 10 insertions(+), 445 deletions(-) diff --git a/passerelle/settings.py b/passerelle/settings.py index 8cb007bc..3e8102eb 100644 --- a/passerelle/settings.py +++ b/passerelle/settings.py @@ -144,6 +144,7 @@ INSTALLED_APPS = ( 'choosit', 'oxyd', 'ovh', + 'gadjo', ) # A sample logging configuration. The only tangible logging diff --git a/passerelle/static/css/style.css b/passerelle/static/css/style.css index 23bd2193..b4b1ae8b 100644 --- a/passerelle/static/css/style.css +++ b/passerelle/static/css/style.css @@ -1,406 +1,14 @@ -/* theme derived and inspired by TerraFirma - * - */ - -@font-face { - font-family: "FontAwesome"; - src: url('fontawesome-webfont.eot'); - src: url('fontawesome-webfont.eot?#iefix') format('eot'), url('fontawesome-webfont.woff') format('woff'), url('fontawesome-webfont.ttf') format('truetype'), url('fontawesome-webfont.svg#FontAwesome') format('svg'); - font-weight: normal; - font-style: normal; -} - -html, body { - margin: 0; - font-family: sans-serif; -} - -html { - background: #F9F9F7 url(../images/a1.gif) repeat-x; - color: #8c8c73; -} - -a { - color: #FF7800; - text-decoration: underline; - transition: all .2s ease-in-out; - -webkit-transition: all .2s ease-in-out; - -moz-transition: all .2s ease-in-out; -} - -a:hover { - text-decoration: none; - color: #D76500; -} - -div#user-links { - display: inline; - padding: 5px; - background: rgba(100, 100, 100, 0.8); - border-top-right-radius: 6px; - border-bottom-left-radius: 6px; -} - -div#user-links a { - color: white; - text-decoration: none; -} - -div#user-links a:hover { - text-shadow: 1px 1px 1px black; -} - -div#wrap-large, -div#wrap { - background: white; - width: 640px; - margin: 3em auto; - margin-bottom: 0; - padding: 15px; - border-radius: 6px; - -moz-border-radius: 6px; - -webkit-border-radius:6px; - box-shadow: 0 0 4px rgba(0,0,0,0.75); - -moz-box-shadow: 0 0 4px rgba(0,0,0,0.75); - -webkit-box-shadow: 0 0 4px rgba(0,0,0,0.75); - position: relative; -} - -div#wrap-large { - width: 95%; -} - -#header -{ - position: absolute; - background: #FF7800 url(../images/a8.gif) repeat-x; - border-radius: 6px 0 0 6px; - -moz-border-radius: 6px 0 0 6px; - -webkit-border-radius: 6px 0 0 6px; - width: 212px; - height: 92px; - color: #fff; - padding-left: 10px; - z-index: 14; -} - -#header h1 -{ - font-size: 23px; - letter-spacing: -1px; - padding-top: 30px; - margin: 0; -} - -#header span -{ - margin: 0; - font-size: 10px; - font-weight: normal; - color: #FCE2CA; -} - -#header h1 a, -#header span a { - color: white; - text-decoration: none; -} - -#splash -{ - position: absolute; - right: 15px; - background: #5D91E5 url(../images/banner-green.jpg) no-repeat top right; - width: 90%; - height: 87px; - border-radius: 0 6px 6px 0; - -moz-border-radius: 0 6px 6px 0; - -webkit-border-radius: 0 6px 6px 0; - z-index: 10; - color: white; - font-weight: bold; - text-align: right; - padding-top: 5px; -} - -div#content { - margin: 1em 1ex; - margin-top: 100px; - padding: 7px; - position: relative; -} - -div#content h2 { - margin-top: 0; - font-weight: normal; - color: #656551; - font-size: 18px; - letter-spacing: -1px; - line-height: 25px; - margin-bottom: 20px; - padding: 0 0 10px 15px; - position: relative; - top: 4px; - background: url(../images/a22.gif) bottom repeat-x; -} - -div#content ul { - line-height: 1.5em; -} - -#footer -{ - font-size: 70%; - position: relative; - clear: both; - height: 66px; - text-align: center; - line-height: 66px; - background-image: url(../images/a50.gif); - color: #A8A88D; -} - -#footer a -{ - color: #8C8C73; -} - - -form#login-form p { - float: left; - width: 40%; -} - -form input.submit { - float: right; - width: 18%; - margin-top: 30px; -} - -div.login-actions { - clear: both; - padding-top: 2em; -} - -div.login-actions p { - margin: 0; -} - -form p { - margin: 0 0 1em 0; -} - -form.inline p label { - display: inline; -} - -form .inline label { - display: inline; -} -form .inline li { - display: inline; -} - -form p label { - display: block; -} - -form p input, -form p textarea { - margin-left: 10px; -} - -ul.errorlist { - margin: 0; - padding: 0; - color: #e80404; - list-style: none; -} - -input, textarea { - padding: 5px; - border: 1px solid #cccccc; - color:#666666; - background: white; - color: black; - -webkit-border-radius: 4px; -} - -textarea:focus, input[type="text"]:focus, input[type="password"]:focus { - border: 1px solid #4690d6; - color:#333333; -} - -input[type=submit] { - color: #ffffff; - background:#4690d6; - border: 1px solid #2a567f; - font-weight: bold; - padding: 2px 8px 2px 8px; - margin: 0; - cursor: pointer; -} - -input[type=submit]:hover { - border-color: #0e1d2b; -} - -form#login-form ul.errorlist { - margin-bottom: 1em; - width: 80%; - font-weight: normal; -} - -div#content h4 { - margin-bottom: 5px; - margin-top: 30px; -} - -div.errors { - margin: 0; - padding: 0; - color: #e80404; - list-style: none; -} - -div#breadcrumb { - font-size: 80%; - margin-bottom: 1em; -} - -form input.submit { - position: relative; - top: -22px; -} - -form#login-form input.submit { - position: relative; - top: -5px; -} - -div.content { - float: left; - width: 82%; - margin-left: 8px; - margin-top: -10px; -} - -abbr { - border-bottom: 1px dotted #8c8c73; - cursor: help; -} - -pre.code, pre.sample { - border: 1px solid #babdb6; - padding: 0.5em 1em; - background: #fefefe; -} - -/* makes the font 33% larger relative to the icon container */ -.icon-large:before { - vertical-align: top; - font-size: 1.3333333333333333em; -} - -.icon-edit:before { content: "\f044"; } -.icon-remove-sign:before { content: "\f057"; } -.icon-remove:before { content: "\f00d"; } -.icon-minus:before { content: "\f068"; } -.icon-envelope:before { content: "\f003"; } -.icon-comment:before { content: "\f075"; } -.icon-home-space:before { content: "\f015 "; } -.icon-user-space:before { content: "\f007 "; } -.icon-circle-arrow-left:before { content: "\f0a8"; } -.icon-circle-arrow-right:before { content: "\f0a9"; } - - -ul.apps { - margin-top: 2em; - margin-bottom: 2em; -} - -ul.apps li { - display: block; - float: left; - margin-right: 1em; -} - -ul.apps li a { - background-color: transparent; - background-repeat: no-repeat; - background-position: 50% 50%; -} - -ul.apps li a { - display: block; - width: 120px; - height: 40px; - padding-top: 80px; - font-weight: bold; - text-align: center; - border: 1px dotted #666; - text-decoration: none; - transition: all .2s ease-in-out; - -webkit-transition: all .2s ease-in-out; - -moz-transition: all .2s ease-in-out; -} - -ul.apps li a:hover { - border: 1px solid #333; -} - -li.calendar a { background-image: url(icons/icon-calendar.png); } -li.calendar a:hover { background-image: url(icons/icon-calendar-hover.png); } - -li.personnes a { background-image: url(icons/icon-personnes.png); } -li.personnes a:hover { background-image: url(icons/icon-personnes-hover.png); } - -li.user a { background-image: url(icons/icon-user.png); } -li.user a:hover { background-image: url(icons/icon-user-hover.png); } - li.webservices a { background-image: url(icons/icon-webservices.png); } li.webservices a:hover { background-image: url(icons/icon-webservices-hover.png); } -li.annonces a { background-image: url(icons/icon-annonces.png); } -li.annonces a:hover { background-image: url(icons/icon-annonces-hover.png); } - li.settings a { background-image: url(icons/icon-settings.png); } li.settings a:hover { background-image: url(icons/icon-settings-hover.png); } li.security a { background-image: url(icons/icon-password.png); } li.security a:hover { background-image: url(icons/icon-password-hover.png); } -li.dossiers a { background-image: url(icons/icon-dossiers.png); } -li.dossiers a:hover { background-image: url(icons/icon-dossiers-hover.png); } - -li.sql a { background-image: url(icons/icon-grid.png); } -li.sql a:hover { background-image: url(icons/icon-grid-hover.png); } - -li.sms a { background-image: url(icons/icon-phone.png); } -li.sms a:hover { background-image: url(icons/icon-phone-hover.png); } - -li.ckan a { background-image: url(icons/icon-ckan.png); } -li.ckan a:hover { background-image: url(icons/icon-ckan-hover.png); } - li.add a { background-image: url(icons/icon-add.png); } li.add a:hover { background-image: url(icons/icon-add-hover.png); } -li.actes a { background-image: url(icons/icon-actes.png); } -li.actes a:hover { background-image: url(icons/icon-actes-hover.png); } - li.ressources a { background-image: url(icons/icon-ressources.png); } li.ressources a:hover { background-image: url(icons/icon-ressources-hover.png); } - -li.facturation a { background-image: url(icons/icon-facturation.png); } -li.facturation a:hover { background-image: url(icons/icon-facturation-hover.png); } - -li.stats a { background-image: url(icons/icon-stats.png); } -li.stats a:hover { background-image: url(icons/icon-stats-hover.png); } - -#appbar .button { - position: relative; - float: right; - left: -20px; - top: -45px; - padding: 0 15px; -} diff --git a/passerelle/templates/passerelle/base.html b/passerelle/templates/passerelle/base.html index 566288c2..206ab7a4 100644 --- a/passerelle/templates/passerelle/base.html +++ b/passerelle/templates/passerelle/base.html @@ -1,53 +1,8 @@ -{% load url from future %} -{% load i18n %} - - - - - {% block page-title %}Passerelle{% endblock %} - - - {% block extrascripts %} - {% endblock %} - - - {% block wrapper %} -
- {% endblock %} - {% if not popup %} - -
- {% block user-links %} - - {% endblock %} -
- {% endif %} -
-
- {% block appbar %} - {% endblock %} -
- {% block beforecontent %} - {% endblock %} - {% block content %} - {% endblock %} -
- -
- {% block page-end %} - {% endblock %} - - +{% extends "gadjo/base.html" %} +{% block page-title %}Passerelle{% endblock %} +{% block site-title %}Passerelle{% endblock %} +{% block footer %}Passerelle — Copyright © Entr'ouvert{% endblock %} + +{% block css %} + +{% endblock %} diff --git a/requirements.txt b/requirements.txt index f2a69cd4..5e21ef6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ phpserialize mako requests sqlalchemy +-e git+http://repos.entrouvert.org/gadjo.git/#egg=gadjo