Skip to content
Snippets Groups Projects
Commit fb109040 authored by Yacine Chalabi's avatar Yacine Chalabi
Browse files

EDIT changement de version de bootstrap + modification du theme

parent 507c6d6c
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
static/css/custom.css 0 → 100644
+ 45
− 0
View file @ fb109040
/*
* AJOUT CUSTOM
*/
html {
font-size: 14px;
}
h1, h2, h3, h4 {
color: rgb(49, 126, 172);
}
h1 {
font-size: 36px;
}
nav {
height: 50px;
}
.nav-link {
padding: 15px !important;
}
.navbar-nav a {
font-size: 14px !important;
}
.list-group-item {
padding-left: 0;
}
#sidebar .card {
/*background: rgb(245, 245, 245);*/
}
#links {
padding-left: 0;
}
.navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
color: #ffffff;
background-color: #178acc;
}
\ No newline at end of file
static/css/style.css
+ 2
− 0
View file @ fb109040
......@@ -247,3 +247,5 @@ figure.floatcenter, .align-center {
.article-list article + hr:last-child {
display: none;
}
templates/article_list.html
+ 1
− 2
View file @ fb109040
......@@ -4,8 +4,7 @@
<div class="article-list">
{% for article in (articles_page.object_list if articles_page else articles) %}
<article>
<time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }}</time>
<h2><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h2>
<h1><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
{% if DISPLAY_ARTICLE_INFO_ON_INDEX %}
<div class="card">
<div class="card-block">
......
templates/base.html
+ 37
− 20
View file @ fb109040
......@@ -53,9 +53,13 @@
{# Twitter Cards tags #}
{% include 'includes/twitter_cards.html' %}
<!-- Bootstrap -->
{% if BOOTSTRAP_THEME %}
<link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/themes/{{ BOOTSTRAP_THEME }}/bootstrap.min.css" rel="stylesheet">
<!--<link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/themes/{{ BOOTSTRAP_THEME }}/bootstrap.min.css" rel="stylesheet">-->
<link href="https://cdn.jsdelivr.net/npm/bootswatch@4.5.2/dist/cerulean/bootstrap.min.css" rel="stylesheet">
{% else %}
<link href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/bootstrap.min.css" rel="stylesheet">
{% endif %}
......@@ -91,7 +95,7 @@
{% endif %}
{% if tag and TAG_FEED_ATOM %}
<link href="{{ SITEURL }}/{{ TAG_FEED_ATOM|.format(tag.slug) }}" type="application/atom+xml" rel="alternate"
<link href="{{ SITEURL }}/{{ TAG_FEED_ATOM.format(tag.slug) }}" type="application/atom+xml" rel="alternate"
title="{{ SITENAME }} {{ tag }} ATOM Feed"/>
{% endif %}
......@@ -100,29 +104,35 @@
title="{{ SITENAME }} {{ category }} ATOM Feed"/>
{% endif %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.4.7/js/tether.min.js" integrity="sha512-X7kCKQJMwapt5FCOl2+ilyuHJp+6ISxFTVrx+nkrhgplZozodT9taV2GuGHxBgKKpOJZ4je77OuPooJg9FJLvw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" integrity="sha512-iBBXm8fW90+nuLcSKlbmrPcLa0OT92xO1BIsZ+ywDWZCvqsWgccV3gFoRBv0z+8dLJgyAHIhR35VZc2oM/gI1w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
</head>
<body>
<nav class="navbar navbar-expand-lg flex-column flex-md-row bd-navbar navbar-dark bg-primary fixed-top text-white" role="navigation">
<nav class="navbar navbar-expand-lg fixed-top navbar-dark bg-primary" role="navigation">
<div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}">
<!--<div class="navbar-header">
{% if MENUITEMS or (pages and DISPLAY_PAGES_ON_MENU) or (categories and DISPLAY_CATEGORIES_ON_MENU) %}
<div class="navbar-header">
<!-- {% if MENUITEMS or (pages and DISPLAY_PAGES_ON_MENU) or (categories and DISPLAY_CATEGORIES_ON_MENU) %}
<button type="button" class="navbar-toggler navbar-toggler-right" data-toggle="collapse" data-target=".navbar-main-collapse" aria-label="Toggle navigation">
<i class="icon-menu"></i>
</button>
{% endif %}-->
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target=".navbar-main-collapse" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#maNavbar">
<i class="icon-menu"></i>
</button>
<a href="{{ SITEURL }}/" class="navbar-brand">
<a href="{{ SITEURL }}/" class="navbar-brand" style="float: left;">
{% if SITELOGO %}<img class="img-responsive pull-left gap-right" src="{{ SITEURL }}/{{ SITELOGO }}" width="{{ SITELOGO_SIZE }}"/> {% endif %}
{% if not HIDE_SITENAME %}{{ SITENAME }}{% endif %}
</a>
<!--</div>-->
<div class="collapse navbar-collapse navbar-main-collapse">
</div>
<div class="collapse navbar-collapse" id="maNavbar">
<ul class="navbar-nav">
{% for title, link in MENUITEMS %}
<li class="nav-item"><a href="{{ link }}" class="nav-link">{{ title }}</a></li>
......@@ -146,6 +156,9 @@
</li>
{% endfor %}
{% endif %}
{% for title, link in MENUITEMS_LAST %}
<li class="nav-item"><a href="{{ link }}" class="nav-link">{{ title }}</a></li>
{% endfor %}
</ul>
<ul class="navbar-nav navbar-right">
{% if 'tipue_search' in PLUGINS %}
......@@ -174,16 +187,9 @@
<!-- End Banner -->
<div class="container{% if BOOTSTRAP_FLUID %}-fluid{% endif %}">
<div class="row">
{% if not HIDE_SIDEBAR or ABOUT_ME or AVATAR %}
<div class="col-md-9{% if SIDEBAR_ON_LEFT %} push-md-3{% endif %}">
{% else %}
<div class="col-xl-12">
{% endif %}
{% block breadcrumbs %}
{% endblock %}
{% block content %}
{% endblock %}
</div>
{% if not HIDE_SIDEBAR or ABOUT_ME or AVATAR %}
<div class="col-md-3{% if SIDEBAR_ON_LEFT %} pull-md-9{% endif %}" id="sidebar">
<aside>
......@@ -196,6 +202,17 @@
</aside>
</div>
{% endif %}
{% if not HIDE_SIDEBAR or ABOUT_ME or AVATAR %}
<div class="col-md-9{% if SIDEBAR_ON_LEFT %} push-md-3{% endif %}">
{% else %}
<div class="col-xl-12">
{% endif %}
{% block breadcrumbs %}
{% endblock %}
{% block content %}
{% endblock %}
</div>
</div>
</div>
{% include 'includes/footer.html' %}
......
templates/includes/article_info.html
+ 15
− 6
View file @ fb109040
<footer class="post-info">
<footer class="bg-secondary p-2">
<span class="published">
<i class="icon-calendar"></i><time datetime="{{ article.date.isoformat() }}"> {{ article.locale_date }}</time>
</span>
{% if SHOW_DATE_MODIFIED %}
{% if article.modified %}
<span class="badge badge-default">{{ _('Modified') }}</span>
<span class="badge badge-info mr-2">{{ _('Modified') }}</span>
<span class="modified">
<i class="icon-calendar"></i><time datetime="{{ article.modified.isoformat() }}"> {{ article.locale_modified }}</time>
</span>
{% endif %}
{% endif %}
{% if SHOW_DEADLINE %}
{% if article.deadline %}
<span class="badge badge-warning">{{ _('Deadline') }}</span>
<span class="deadline">
<i class="icon-calendar"></i><time datetime="{{ article.deadline }}"> {{ article.deadline | get_date | strftime("%a %d %B %Y") }}</time>
</span>
{% endif %}
{% endif %}
{% if SHOW_SERIES %}
{% if article.series %}
<span class="badge badge-default">{{ _('Series') }}</span>
<span class="badge badge-info">{{ _('Series') }}</span>
Part {{ article.series.index}} of {{ article.series.name }}
{% endif %}
{% endif %}
{% if SHOW_ARTICLE_AUTHOR %}
{% if article.author %}
<span class="badge badge-default">{{ _('By') }}</span>
<span class="badge badge-info">{{ _('By') }}</span>
<a href="{{ SITEURL }}/{{ article.author.url }}"><i class="icon-user"></i> {{ article.author }}</a>
{% endif %}
{% endif %}
{% if SHOW_ARTICLE_CATEGORY %}
<span class="badge badge-default">{{ _('Category') }}</span>
<span class="badge badge-info">{{ _('Category') }}</span>
<a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>
{% endif %}
{% if PDF_PROCESSOR %}
<span class="badge badge-default">
<span class="badge badge-info">
<a href="{{ SITEURL }}/pdf/{{ article.slug }}.pdf">PDF</a>
</span>
{% endif %}
......
templates/includes/sidebar/links.html
+ 14
− 5
View file @ fb109040
{% if LINKS %}
{% from 'includes/sidebar/macros.jinja' import title %}
<!-- Sidebar/Links -->
<li class="list-group-item">
<h4>{{ title(_('Links'), DISABLE_SIDEBAR_TITLE_ICONS, icon='external-link-square') }}</h4>
<ul class="list-group" id="links">
<li class="list-group-item d-flex flex-column bg-secondary pl-5">
<h4>
<!--<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" fill="currentColor" class="bi bi-arrow-up-right-square-fill" viewBox="0 0 16 16">
<path d="M14 0a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V2a2 2 0 0 1 2-2h12zM5.904 10.803 10 6.707v2.768a.5.5 0 0 0 1 0V5.5a.5.5 0 0 0-.5-.5H6.525a.5.5 0 1 0 0 1h2.768l-4.096 4.096a.5.5 0 0 0 .707.707z"/>
</svg>-->
<i class="fas fa-external-link-square-alt"></i>
{{ title(_('Links'), DISABLE_SIDEBAR_TITLE_ICONS, icon="external-link-square") }}</h4>
<ul class="@-group" id="links">
{% for name, link in LINKS %}
<li class="list-group-item">
<li class="list-group-item ml-0">
<a href="{{ link }}" target="_blank">{{ name }}</a>
</li>
{% endfor %}
......
templates/includes/translations.html
+ 1
− 1
View file @ fb109040
{% macro translations_for(article) %}
{% if article.translations %}
<span class="badge badge-default">{{ _('Lang') }}</span>
<span class="badge badge-info">{{ _('Lang') }}</span>
{% for translation in article.translations %}
<a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
{% endfor %}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment