Shikiryu/journal-intime
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

💄 Modifie l'aspect

Browse Source 
* Ajoute une nouvelle police (et retire celui de Google)
Pour #5
This commit is contained in:
cdesmidt 2019-10-07 12:54:03 +02:00
parent a7c8276aff
commit 842cfec0dd
13 changed files with 1664 additions and 60254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10646
public/css/app.css vendored
View File

File diff suppressed because it is too large Load Diff

49516
public/js/app.js vendored
View File

File diff suppressed because it is too large Load Diff

BIN
resources/fonts/SpecialElite-webfont.eot Normal file
View File

Binary file not shown.

1516
resources/fonts/SpecialElite-webfont.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 471 KiB

BIN
resources/fonts/SpecialElite-webfont.ttf Normal file
View File

Binary file not shown.

BIN
resources/fonts/SpecialElite-webfont.woff Normal file
View File

Binary file not shown.

2
resources/js/app.js vendored
View File

@ -6,8 +6,6 @@
require('./bootstrap'); require('./bootstrap');
require('tabler-ui/src/assets/scss/bundle.scss');
window.Vue = require('vue'); window.Vue = require('vue');
/** /**

1
resources/js/components/App.vue
View File

@ -12,3 +12,4 @@
} }
} }
</script> </script>
<style scoped></style>

3
resources/sass/_general.scss vendored Normal file
View File

@ -0,0 +1,3 @@
h1, h2, h3, h4 {
font-family: $font-family-base;
}

2
resources/sass/_variables.scss vendored
View File

@ -2,7 +2,7 @@
$body-bg: #f8fafc; $body-bg: #f8fafc;
// Typography // Typography
$font-family-sans-serif: 'Nunito', sans-serif; $font-family-base: 'special_eliteregular', sans-serif;
$font-size-base: 0.9rem; $font-size-base: 0.9rem;
$line-height-base: 1.6; $line-height-base: 1.6;

19
resources/sass/app.scss vendored
View File

@ -1,8 +1,21 @@
// Fonts // Fonts
@import url('https://fonts.googleapis.com/css?family=Nunito'); @font-face {
font-family: 'special_eliteregular';
src: url('../fonts/SpecialElite-webfont.eot');
src: url('../fonts/SpecialElite-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/SpecialElite-webfont.woff') format('woff'),
url('../fonts/SpecialElite-webfont.ttf') format('truetype'),
url('../fonts/SpecialElite-webfont.svg#special_eliteregular') format('svg');
font-weight: normal;
font-style: normal;
}
// Bootstrap
//@import '~bootstrap/scss/bootstrap';
@import '~tabler-ui/src/assets/scss/bundle.scss';
// Variables // Variables
@import 'variables'; @import 'variables';
// Bootstrap // Surcharge
@import '~bootstrap/scss/bootstrap'; @import 'general';

124
resources/views/layouts/app.blade.php
View File

@ -2,79 +2,117 @@
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"> <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta http-equiv="Content-Language" content="{{ str_replace('_', '-', app()->getLocale()) }}" />
<!-- CSRF Token --> <!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title> <title>{{ config('app.name', 'Journal Intime') }}</title>
<!-- Scripts --> <!-- Scripts -->
<script src="{{ asset('js/app.js') }}" defer></script> <script src="{{ asset('js/app.js') }}" defer></script>
<!-- Fonts -->
<link rel="dns-prefetch" href="//fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css?family=Nunito" rel="stylesheet">
<!-- Styles --> <!-- Styles -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet"> <link href="{{ asset('css/app.css') }}" rel="stylesheet">
</head> </head>
<body> <body>
<div> <div class="page">
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm"> <div class="header py-4">
<div class="container"> <div class="container">
<a class="navbar-brand" href="{{ url('/') }}"> <div class="d-flex">
{{ config('app.name', 'Laravel') }} <a class="header-brand" href="{{ url('/') }}">
{{-- <img src="./demo/brand/tabler.svg" class="header-brand-img" alt="tabler logo"> --}}
{{ config('app.name', 'Journal Intime') }}
</a> </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}"> <div class="d-flex order-lg-2 ml-auto">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<!-- Left Side Of Navbar -->
<ul class="navbar-nav mr-auto">
</ul>
<!-- Right Side Of Navbar -->
<ul class="navbar-nav ml-auto">
<!-- Authentication Links -->
@guest @guest
<li class="nav-item"> <div class="nav-item d-none d-md-flex">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a> <a href="{{ route('login') }}" class="btn btn-sm btn-outline-primary">{{ __('Login') }}</a>
</li> </div>
@if (Route::has('register')) @if (Route::has('register'))
<li class="nav-item"> <div class="nav-item d-none d-md-flex">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a> <a href="{{ route('register') }}" class="btn btn-sm btn-outline-primary">{{ __('Register') }}</a>
</li> </div>
@endif @endif
@else @else
<li class="nav-item dropdown"> <div class="dropdown d-none d-md-flex">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre> <a class="nav-link icon" data-toggle="dropdown">
{{ Auth::user()->name }} <span class="caret"></span> <i class="fe fe-bell"></i>
<span class="nav-unread"></span>
</a> </a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <!--<a href="#" class="dropdown-item d-flex">
<span class="avatar mr-3 align-self-center" style="background-image: url(demo/faces/male/41.jpg)"></span>
<div>
<strong>Nathan</strong> pushed new commit: Fix page load performance issue.
<div class="small text-muted">10 minutes ago</div>
</div>
</a>-->
<div class="dropdown-divider"></div>
<a href="#" class="dropdown-item text-center">Mark all as read</a>
</div>
</div>
<div class="dropdown">
<a href="#" class="nav-link pr-0 leading-none" data-toggle="dropdown">
<span class="avatar">{{ substr(Auth::user()->name, 0, 1) }}</span>
<span class="ml-2 d-none d-lg-block">
<span class="text-default">{{ Auth::user()->name }}</span>
<small class="text-muted d-block mt-1"></small>
</span>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="#">
<i class="dropdown-icon fe fe-user"></i> Profile
</a>
<a class="dropdown-item" href="#">
<i class="dropdown-icon fe fe-settings"></i> Settings
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('logout') }}" <a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault(); onclick="event.preventDefault();
document.getElementById('logout-form').submit();"> document.getElementById('logout-form').submit();">
{{ __('Logout') }} <i class="dropdown-icon fe fe-log-out"></i> {{ __('Logout') }}
</a> </a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;"> <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf @csrf
</form> </form>
</div> </div>
</li> </div>
@endguest @endguest
</ul>
</div>
</div>
</nav>
<main class="py-4"> <a href="#" class="header-toggler d-lg-none ml-3 ml-lg-0" data-toggle="collapse" data-target="#headerMenuCollapse">
<span class="header-toggler-icon"></span>
</a>
</div>
</div>
</div>
</div>
<main class="my-3 my-md-5 flex-fill">
@yield('content') @yield('content')
</main> </main>
<footer class="footer">
<div class="container">
<div class="row align-items-center flex-row-reverse">
<div class="col-auto ml-lg-auto">
<div class="row align-items-center">
<div class="col-auto">
<ul class="list-inline list-inline-dots mb-0">
<li class="list-inline-item"><a href="./docs/index.html">Documentation</a></li>
<li class="list-inline-item"><a href="./faq.html">FAQ</a></li>
</ul>
</div> </div>
<div class="col-auto">
<a href="https://github.com/tabler/tabler" class="btn btn-outline-primary btn-sm">Source code</a>
</div>
</div>
</div>
<div class="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
Copyright © 2019 <a href="{{ config('app.url') }}">{{ config('app.name') }}</a>. Thème par <a href="https://codecalm.net" target="_blank">codecalm.net</a>
</div>
</div>
</div>
</footer>
</div>
</body> </body>
</html> </html>

33
resources/views/welcome.blade.php
View File

@ -1,33 +1,34 @@
@extends('layouts.app') @extends('layouts.app')
@section('content') @section('content')
<div class="container"> <div class="container">
<div class="row justify-content-center"> <div class="page-header">
<div class="col-md-8"> <h1 class="page-title">
<div class="card"> {{ __('Mon journal intime') }}
<div class="card-header">{{ __('Accueil') }}</div> </h1>
<div class="card-body">
@if (session('status'))
<div class="alert alert-success" role="alert">
{{ session('status') }}
</div> </div>
@endif <div class="row flex-fill">
<div class="col-md-12">
<h1>{{ strftime('%B %G', $today->format('U')) }}</h1> <div class="row">
<div class="col-sm-12">
<div class="card">
<div class="card-header">
<h3 class="card-title">{{ strftime('%d %B %G', $today->format('U')) }}</h3>
</div>
<div class="card-body">
<form action="{{ url('store') }}" method="post" accept-charset="utf-8"> <form action="{{ url('store') }}" method="post" accept-charset="utf-8">
@csrf @csrf
<div class="contact-form"> <div class="contact-form">
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-5" for="message">Quoi de neuf aujourd'hui ?</label> <label class="control-label col-sm-5" for="message">Quoi de neuf aujourd'hui ?</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea class="form-control" rows="5" name="message" id="message"></textarea> <div id="app"></div>
<span class="text-danger">{{ $errors->first('message') }}</span> <span class="text-danger">{{ $errors->first('message') }}</span>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<button type="submit" class="btn btn-default">J'enregistre ma journée</button> <button type="submit" class="btn btn-primary ml-auto">J'enregistre ma journée</button>
</div> </div>
</div> </div>
</div> </div>
@ -37,4 +38,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
@endsection @endsection