Browse Source

💄 Modifie l'aspect

* Ajoute une nouvelle police (et retire celui de Google)
Pour #5
e2e
cdesmidt 2 years ago
parent
commit
842cfec0dd
  1. 10646
      public/css/app.css
  2. 49516
      public/js/app.js
  3. BIN
      resources/fonts/SpecialElite-webfont.eot
  4. 1516
      resources/fonts/SpecialElite-webfont.svg
  5. BIN
      resources/fonts/SpecialElite-webfont.ttf
  6. BIN
      resources/fonts/SpecialElite-webfont.woff
  7. 2
      resources/js/app.js
  8. 1
      resources/js/components/App.vue
  9. 3
      resources/sass/_general.scss
  10. 2
      resources/sass/_variables.scss
  11. 19
      resources/sass/app.scss
  12. 152
      resources/views/layouts/app.blade.php
  13. 59
      resources/views/welcome.blade.php

10646
public/css/app.css

File diff suppressed because it is too large

49516
public/js/app.js

File diff suppressed because it is too large

BIN
resources/fonts/SpecialElite-webfont.eot

Binary file not shown.

1516
resources/fonts/SpecialElite-webfont.svg

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 471 KiB

BIN
resources/fonts/SpecialElite-webfont.ttf

Binary file not shown.

BIN
resources/fonts/SpecialElite-webfont.woff

Binary file not shown.

2
resources/js/app.js

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

1
resources/js/components/App.vue

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

3
resources/sass/_general.scss

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

2
resources/sass/_variables.scss

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

19
resources/sass/app.scss

@ -1,8 +1,21 @@
// 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
@import 'variables';
// Bootstrap
@import '~bootstrap/scss/bootstrap';
// Surcharge
@import 'general';

152
resources/views/layouts/app.blade.php

@ -2,79 +2,117 @@
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<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 -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title>
<title>{{ config('app.name', 'Journal Intime') }}</title>
<!-- Scripts -->
<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 -->
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
</head>
<body>
<div>
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
<div class="container">
<a class="navbar-brand" href="{{ url('/') }}">
{{ config('app.name', 'Laravel') }}
<div class="page">
<div class="header py-4">
<div class="container">
<div class="d-flex">
<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>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
<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
<li class="nav-item">
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
</li>
@if (Route::has('register'))
<li class="nav-item">
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
</li>
@endif
@else
<li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
<div class="d-flex order-lg-2 ml-auto">
@guest
<div class="nav-item d-none d-md-flex">
<a href="{{ route('login') }}" class="btn btn-sm btn-outline-primary">{{ __('Login') }}</a>
</div>
@if (Route::has('register'))
<div class="nav-item d-none d-md-flex">
<a href="{{ route('register') }}" class="btn btn-sm btn-outline-primary">{{ __('Register') }}</a>
</div>
@endif
@else
<div class="dropdown d-none d-md-flex">
<a class="nav-link icon" data-toggle="dropdown">
<i class="fe fe-bell"></i>
<span class="nav-unread"></span>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<!--<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') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
<i class="dropdown-icon fe fe-log-out"></i> {{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</div>
@endguest
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault();
document.getElementById('logout-form').submit();">
{{ __('Logout') }}
</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
@endguest
</ul>
<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>
</nav>
<main class="py-4">
@yield('content')
</main>
</div>
</div>
<main class="my-3 my-md-5 flex-fill">
@yield('content')
</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 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>
</html>

59
resources/views/welcome.blade.php

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

Loading…
Cancel
Save