--- a/src/hdalab/static/hdalab/css/head.css Wed Dec 10 11:37:32 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-#header {
- background: url(../img/bg-header.jpg) center top no-repeat;
- border-bottom: 1px solid #4f5451;
- -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
- box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
-}
-#header .top {
- padding-bottom: 2px;
- background-color: rgba(255, 255, 255, 0.3);
-}
-#header #logo {
- padding: 20px 0 15px;
-}
-#header #logo img {
- display: block;
-}
-#header nav {
- padding: 15px 0;
- background-color: #f8f8f8;
- position: relative;
- font-weight: 300;
- font-family: 'FranklinGothic', Arial, Helvetica, sans-serif;
- text-transform: uppercase;
- background-color: rgba(248, 248, 248, 0.7);
- -webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3);
- -moz-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3);
- box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3);
-}
-#header nav:after {
- content: "";
- width: 100%;
- height: 2px;
- top: 100%;
- display: block;
- left: 0;
- position: absolute;
- background-color: rgba(248, 248, 248, 0.5);
-}
-#header nav .profile {
- float: right;
-}
-#menu {
- float: left;
- margin-top: 3px;
-}
-#menu:before,
-#menu:after {
- content: " ";
- display: table;
-}
-#menu:after {
- clear: both;
-}
-#menu li {
- float: left;
- color: #2d2b25;
-}
-#menu li:before {
- content: "/";
- float: left;
- margin-top: 2px;
-}
-#menu li:first-child:before {
- content: "";
-}
-#menu li:first-child a {
- padding-left: 0;
-}
-#menu li.actif a {
- font-weight: normal;
-}
-#menu a {
- color: inherit;
- padding: 0 8px;
- font-size: 14.6px;
- font-size: 1.46rem;
-}
-#subhead{
- margin:30px auto;
- width: 810px;
- font-family: "FranklinGothic",Arial,Helvetica,sans-serif;
- font-weight: 300;
- text-transform: uppercase;
- position: relative;
-
-}
-#subhead h3 {
- font-weight: normal;
- color: #2d2b25;
- font-size: 13px;
- font-size: 1.3rem;
-}
-#subhead h3:before {
- content: "/";
- font-weight: bold;
- margin-right: 3px;
- position: relative;
-}
-.bg-wrap {
- background-color: rgba(0, 0, 0, 0.15);
- border-radius: 2px;
- padding: 10px 10px;
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hdalab/static/hdalab/css/header.css Wed Dec 10 11:46:15 2014 +0100
@@ -0,0 +1,116 @@
+#header {
+ background: url(../img/bg-header.jpg) center top no-repeat;
+ border-bottom: 1px solid #4f5451;
+ -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+ -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
+}
+#header .top {
+ padding-bottom: 2px;
+ background-color: rgba(255, 255, 255, 0.3);
+}
+#header #logo {
+ padding: 20px 0 15px;
+}
+#header #logo img {
+ display: block;
+}
+#header nav {
+ padding: 15px 0;
+ background-color: #f8f8f8;
+ position: relative;
+ font-weight: 300;
+ font-family: 'FranklinGothic', Arial, Helvetica, sans-serif;
+ text-transform: uppercase;
+ background-color: rgba(248, 248, 248, 0.7);
+ -webkit-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3);
+ -moz-box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3);
+ box-shadow: 0 2px 3px rgba(0, 0, 0, 0.3);
+}
+#header nav:after {
+ content: "";
+ width: 100%;
+ height: 2px;
+ top: 100%;
+ display: block;
+ left: 0;
+ position: absolute;
+ background-color: rgba(248, 248, 248, 0.5);
+}
+#header nav .profile {
+ float: right;
+}
+#menu {
+ float: left;
+ margin-top: 3px;
+}
+#menu:before,
+#menu:after {
+ content: " ";
+ display: table;
+}
+#menu:after {
+ clear: both;
+}
+#menu li {
+ float: left;
+ color: #2d2b25;
+}
+#menu li:before {
+ content: "/";
+ float: left;
+ margin-top: 2px;
+}
+#menu li:first-child:before {
+ content: "";
+}
+#menu li:first-child a {
+ padding-left: 0;
+}
+#menu li.actif a {
+ font-weight: normal;
+}
+#menu a {
+ color: inherit;
+ padding: 0 8px;
+ font-size: 14.6px;
+ font-size: 1.46rem;
+}
+#subhead{
+ margin:30px auto;
+ width: 810px;
+ font-family: "FranklinGothic",Arial,Helvetica,sans-serif;
+ font-weight: 300;
+ text-transform: uppercase;
+ position: relative;
+
+}
+#subhead h3 {
+ font-weight: normal;
+ color: #2d2b25;
+ font-size: 13px;
+ font-size: 1.3rem;
+}
+#subhead h3:before {
+ content: "/";
+ font-weight: bold;
+ margin-right: 3px;
+ position: relative;
+}
+.bloc h3 {
+ font-size: 15px;
+ margin-bottom: 7px;
+}
+#header .bloc{
+ padding: 6px 8px 2px;
+ background-color: rgba(255, 255, 255, 0.9);
+ border-radius: 5px;
+}
+#header .bg-wrap {
+ background-color: rgba(0, 0, 0, 0.15);
+ border-radius: 5px;
+ padding: 10px 10px;
+}
+#menu li.external a {
+ color: #7cb0bd;
+}
--- a/src/hdalab/templates/base.html Wed Dec 10 11:37:32 2014 +0100
+++ b/src/hdalab/templates/base.html Wed Dec 10 11:46:15 2014 +0100
@@ -14,7 +14,7 @@
{% block css_import %}
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/common.css' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/head.css' %}" />
+ <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/header.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/footer.css' %}" />
{% endblock %}
@@ -24,9 +24,6 @@
</head>
<body>
{% block header %}
- <div id="topnav">
- <img src="{% static 'hdalab/img/topnav.jpg' %}" alt="" style="display:block;margin:0 auto;">
- </div>
<header id="header">
<div class="top">
@@ -43,6 +40,7 @@
<li class="{% block categories_actif %}{% endblock %}"><a href="{% url 'categories' %}">Catégories de Wikipedia</a></li>
<li class="{% block thesaurus_actif %}{% endblock %}"><a href="{% url 'thesaurus' %}">Thésaurus</a></li>
<li class="{% block renkans_actif %}{% endblock %}"><a href="{% url 'renkan_public_list' %}">Renkan</a></li>
+ <li class="external"><a href="http://www.histoiredesarts.culture.fr/" target="_blank">Histoire des Arts</a></li>
</ul>
<ul id="menu" class="profile">
@@ -50,7 +48,7 @@
<li class="{% block profile_actif %}{% endblock %}"><a href="{% url 'profile_home' %}">{{ user.username }}</a></li>
<li><a href="{% url 'logout' %}?next={% url 'home' %}">{% trans "Log out" %}</a></li>
{% else %}
- <li class="hello-user"><a href="{% url 'login' %}">{% trans "Log in" %}</a></li>
+ <li class="{% block login_actif %}{% endblock %}"><a href="{% url 'login' %}">{% trans "Log in" %}</a></li>
{% endif %}
</ul>
</div>
@@ -73,13 +71,10 @@
<div class="nav">
<div class="row">
<ul>
- <li><a href="#">Partenaires</a></li>
- <li><a href="#">Lettres infos</a></li>
- <li><a href="#">Data culture</a></li>
+ <li><a href="#">A Propos</a></li>
+ <li><a href="#">Crédits</a></li>
<li><a href="#">Mentions légales</a></li>
- <li><a href="#">Accessibilité</a></li>
- <li><a href="#">Plan du site</a></li>
- <li><a href="#">Open search</a></li>
+ <li><a href="#">Contact</a></li>
</ul>
</div>
</div>
--- a/src/hdalab/templates/categories.html Wed Dec 10 11:37:32 2014 +0100
+++ b/src/hdalab/templates/categories.html Wed Dec 10 11:46:15 2014 +0100
@@ -8,7 +8,6 @@
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/ui-lightness/jquery-ui-1.10.4.min.css' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/trees.css?refresh' %}" />
<link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/cattree.css?refresh' %}" />
- <link rel="stylesheet" type="text/css" href="{% static 'hdalab/css/categories.css' %}" />
{% endblock %}
{% block js_import %}