Skip to content

💄 Update DSFR css to v1 and more.. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cristianpb wants to merge 4 commits into
base: master
Choose a base branch
from
Open

💄 Update DSFR css to v1 and more.. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1af98ef
⬆ Upload dsfr to v1
cristianpb Jul 1, 2021
890ce92
💄 Customize navigation bar
cristianpb Jul 1, 2021
b39072f
🔧 Solve suggestion from P AM
cristianpb Jul 1, 2021
e7831a0
📦 Update css assets
cristianpb Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/built/screen.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/built/screen.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/screen.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ production stylesheet in assets/built/screen.css
/* 1. Global - Set up the things
/* ---------------------------------------------------------- */
@import "global.css";
@import "@gouvfr/all/dist/css/all.min.css";
@import "@gouvfr/dsfr/dist/css/dsfr.min.css";

body {
background: #fff;
Expand Down
4 changes: 3 additions & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,11 @@ function js(done) {
src([
// pull in lib files first so our own code can depend on it
'assets/js/lib/*.js',
'assets/js/*.js'
'assets/js/*.js',
], {sourcemaps: true}),
concat('casper.js'),
concat('node_modules/@gouvfr/dsfr/dist/js/dsfr.module.min.js'),
concat('node_modules/@gouvfr/dsfr/dist/js/dsfr.nomodule.min.js'),
uglify(),
dest('assets/built/', {sourcemaps: '.'}),
livereload()
Expand Down
81 changes: 50 additions & 31 deletions home.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,62 @@
{{!-- The tag above means: insert everything in this file
into the {body} of the default.hbs template --}}

<header class="rf-header">
<div class="inner">
<div class="rf-container">
<div class="rf-header__body">
<div class="rf-header__brand">
<a class="rf-logo" href="#" title="Ministère de l'intérieur">
<span class="rf-logo__title">Ministère
<br>
de l'intérieur</span>
</a>
</div>
<div class="rf-header__navbar">
{{#if @site.logo}}
<a class="site-nav-logo" href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{@site.title}}" /></a>
{{else}}
<a class="site-nav-logo" href="{{@site.url}}"></a>
<div class="rf-service">
<a class="rf-service__title" href="{{@site.url}}" title="{{@site.title}}">
{{@site.title}}
</a>
<p class="rf-service__tagline">baseline - précisions sur l‘organisation</p>
<header role="banner" class="fr-header">
<div class="fr-header__body">
<div class="fr-container">
<div class="fr-header__body-row">
<div class="fr-header__brand fr-enlarge-link">
<div class="fr-header__brand-top">
<div class="fr-header__logo">
<p class="fr-logo">
République
<br>Française
</p>
</div>
<div class="fr-header__operator">
{{#if @site.logo}}
<a class="fr-responsive-img" style="max-width:4.0625rem;" href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{@site.title}}" /></a>
{{else}}
<a class="site-nav-logo" href="{{@site.url}}"></a>
<div class="rf-service">
<a class="rf-service__title" href="{{@site.url}}" title="{{@site.title}}">
{{@site.title}}
</a>
<p class="rf-service__tagline">baseline - précisions sur l‘organisation</p>
</div>
{{/if}}
</div>
<div class="fr-header__navbar">
<button class="fr-btn--menu fr-btn" data-fr-opened="false" aria-controls="modal-870" aria-haspopup="menu" title="Menu">
Menu
</button>
</div>
</div>
{{/if}}
</div>
<div class="site-nav-right">
{{#if @site.navigation}}
{{navigation}}
{{/if}}
{{#if @labs.members}}
<a class="subscribe-button" href="#subscribe">Subscribe</a>
{{/if}}
</div>
<div class="fr-header__tools">
<div class="fr-header__tools-links">
{{#if @site.navigation}}
{{navigation}}
{{/if}}
{{#if @labs.members}}
<a class="subscribe-button" href="#subscribe">Subscribe</a>
{{/if}}
</div>
</div>
</div>
</div>
</div>
</div>
<div class="fr-header__menu fr-modal" id="modal-870" aria-labelledby="button-871">
<div class="fr-container">
<button class="fr-link--close fr-link" aria-controls="modal-870">Fermer</button>
<div class="fr-header__menu-links"></div>
<nav class="fr-nav" id="navigation-869" role="navigation" aria-label="Menu principal">
</nav>
</div>
</div>
</header>


<div class="head-page">
{{> header-background background=@site.cover_image}} {{!--Special header-image.hbs partial to generate the background image--}}
<div class="head-page--wrapper container">
Expand Down
5 changes: 1 addition & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@
"bugs": "https://github.com/TryGhost/Casper/issues",
"contributors": "https://github.com/TryGhost/Casper/graphs/contributors",
"devDependencies": {
"@gouvfr/all": "^0.4.0",
"@gouvfr/footer": "^0.4.0",
"@gouvfr/header": "^0.4.0",
"@gouvfr/logo": "^0.4.0",
"@gouvfr/dsfr": "^1.0.0",
"@tryghost/release-utils": "0.6.7",
"autoprefixer": "9.8.3",
"beeper": "2.0.0",
Expand Down
5 changes: 5 additions & 0 deletions partials/navigation.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<ul class="fr-links-group">
{{#foreach navigation}}
<li><a class="fr-link{{#if current}} fr-fi-play-line{{/if}}" href="{{url absolute="true"}}">{{label}}</a></li>
{{/foreach}}
</ul>
2 changes: 2 additions & 0 deletions partials/post-card.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
<div class="post-card-primary-tag"><a href="{{url}}">{{name}}</a></div>
{{/primary_tag}}
{{/if}}
<a href="{{url}}">
<h2 class="post-card-title">{{title}}</h2>
</a>
</header>

<section class="post-card-excerpt">
Expand Down
71 changes: 51 additions & 20 deletions partials/site-nav.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,55 @@
<nav class="site-nav">
<div class="site-nav-left-wrapper">
<div class="site-nav-left">
{{#if @site.logo}}
<a class="site-nav-logo" href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{@site.title}}" /></a>
{{else}}
<a class="site-nav-logo" href="{{@site.url}}">{{@site.title}}</a>
{{/if}}
<div class="site-nav-content">
{{#is "post"}}
<span class="nav-post-title {{#unless @site.logo}}dash{{/unless}}">{{post.title}}</span>
{{/is}}
<header role="banner" class="fr-header">
<div class="fr-header__body">
<div class="fr-container">
<div class="fr-header__body-row">
<div class="fr-header__brand fr-enlarge-link">
<div class="fr-header__brand-top">
<div class="fr-header__logo">
<p class="fr-logo">
République
<br>Française
</p>
</div>
<div class="fr-header__operator">
{{#if @site.logo}}
<a class="fr-responsive-img" style="max-width:4.0625rem;" href="{{@site.url}}"><img src="{{@site.logo}}" alt="{{@site.title}}" /></a>
{{else}}
<a class="site-nav-logo" href="{{@site.url}}"></a>
<div class="rf-service">
<a class="rf-service__title" href="{{@site.url}}" title="{{@site.title}}">
{{@site.title}}
</a>
<p class="rf-service__tagline">baseline - précisions sur l‘organisation</p>
</div>
{{/if}}
</div>
<div class="fr-header__navbar">
<button class="fr-btn--menu fr-btn" data-fr-opened="false" aria-controls="modal-870" aria-haspopup="menu" title="Menu">
Menu
</button>
</div>
</div>
</div>
<div class="fr-header__tools">
<div class="fr-header__tools-links">
{{#if @site.navigation}}
{{navigation}}
{{/if}}
{{#if @labs.members}}
<a class="subscribe-button" href="#subscribe">Subscribe</a>
{{/if}}
</div>
</div>
</div>
</div>
</div>
<div class="site-nav-right">
{{#if @site.navigation}}
{{navigation}}
{{/if}}
{{#if @labs.members}}
<a class="subscribe-button" href="#subscribe">Subscribe</a>
{{/if}}
<div class="fr-header__menu fr-modal" id="modal-870" aria-labelledby="button-871">
<div class="fr-container">
<button class="fr-link--close fr-link" aria-controls="modal-870">Fermer</button>
<div class="fr-header__menu-links"></div>
<nav class="fr-nav" id="navigation-869" role="navigation" aria-label="Menu principal">
</nav>
</div>
</div>
</nav>
</header>