--- a/design/_includes/nav.html Thu Jun 08 11:13:41 2017 +0200
+++ b/design/_includes/nav.html Thu Jun 08 12:39:08 2017 +0200
@@ -2,15 +2,29 @@
<a class="navbar-brand" href="#">IRI notes</a>
<div class="collapse navbar-collapse" id="navbarNavDropdown">
- <ul class="navbar-nav ml-auto">
+ <!-- <span class="navbar-text">/ <i class="fa fa-refresh" aria-hidden="true"></i> dernière synchro : il y a 3 jours</span> -->
+
+ <ul class="navbar-nav ml-auto">
+ <li class="nav-item"><a class="nav-link">Paul-Émile</a></li>
+ <li class="nav-item"><a class="nav-link">CRC</a></li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-bars" aria-hidden="true"></i>
</a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownMenuLink">
- <a class="dropdown-item" href="#">Action</a>
- <a class="dropdown-item" href="#">Another action</a>
- <a class="dropdown-item" href="#">Something else here</a>
+ <h6 class="dropdown-header small">groupe actuel</h6>
+ <a class="dropdown-item" href="#">CRC</a>
+
+ <div class="dropdown-divider"></div>
+
+ <h6 class="dropdown-header small">autres groupes</h6>
+ <a class="dropdown-item" href="#">NextLEAP</a>
+
+ <div class="dropdown-divider"></div>
+
+ <a class="dropdown-item" href="#">Synchroniser les notes</a>
+ <a class="dropdown-item" href="#">Se déconnecter</a>
+
</div>
</li>
</ul>
--- a/design/_includes/notes.list.html Thu Jun 08 11:13:41 2017 +0200
+++ b/design/_includes/notes.list.html Thu Jun 08 12:39:08 2017 +0200
@@ -1,6 +1,8 @@
<div class="card">
- <div class="card-header">
+ <div class="card-header d-flex flex-row">
session
+
+ <span class="ml-auto text-muted"><i class="fa fa-plus-square" aria-hidden="true"></i></span>
</div>
<ul class="list-group list-group-flush">
{% for note in site.data.bacon %}
--- a/design/_includes/zone.edit.html Thu Jun 08 11:13:41 2017 +0200
+++ b/design/_includes/zone.edit.html Thu Jun 08 12:39:08 2017 +0200
@@ -1,11 +1,42 @@
-<div class="row">
- <div class="col col-3"></div>
- <div class="col col-6">
- <p class="mb-3">wisiwig</p>
- <textarea class="form-control main" row="1" class="mt-2"></textarea>
+<div class="controls row">
+ <div class="metadata col col-3">
</div>
- <div class="col col-3 pt-3">
- <h6 class="small text-muted">marge</h6>
- <textarea class="form-control margin" row="1"></textarea>
+ <div class="col col-6 d-flex flex-row pt-1 pb-1">
+ <div class="btn-group btn-group-sm">
+ <a class="btn btn-secondary"><i class="fa fa-bold" aria-hidden="true"></i></a>
+ <a class="btn btn-secondary"><i class="fa fa-italic" aria-hidden="true"></i></a>
+ <a class="btn btn-secondary"><i class="fa fa-underline" aria-hidden="true"></i></a>
+ </div>
+
+ <div class="btn-group btn-group-sm ml-2">
+ <a class="btn btn-secondary"><i class="fa fa-list" aria-hidden="true"></i></a>
+ <a class="btn btn-secondary"><i class="fa fa-list-ol" aria-hidden="true"></i></a>
+ </div>
+
+ <span class="ml-auto d-flex flex-row">
+ <div class="text-muted form-check mr-2 mb-0">
+ <label class="form-check-label">
+ <input type="checkbox" class="form-check-input">
+ <small><kbd>Entrée</kbd> = ajouter note</small>
+ </label>
+ </div>
+ <a class="btn btn-sm btn-primary"><i class="fa fa-arrow-circle-up fa-inverse" aria-hidden="true"></i></a>
+ </span>
+
+ </div>
+ <div class="col col-3">
</div>
</div>
+
+<div class="edit row">
+ <div class="metadata col col-3 small text-muted">
+ <div>10:09</div>
+ <div>10:21</div>
+ </div>
+ <div class="col col-6">
+ <textarea class="form-control main" row="1" class=""></textarea>
+ </div>
+ <div class="col col-3">
+ <textarea class="form-control margin small" row="1"></textarea>
+ </div>
+</div>
--- a/design/css/main.scss Thu Jun 08 11:13:41 2017 +0200
+++ b/design/css/main.scss Thu Jun 08 12:39:08 2017 +0200
@@ -37,7 +37,8 @@
#editor {
width: 100%;
background: white;
- height: 7em;
+ // height: 7em;
+ padding-bottom: 0.5em;
border-top: 1px solid $grey-light;
@@ -46,5 +47,9 @@
// with: 100%;
// height: 2em;
}
+
+ .metadata {
+ text-align: right;
+ }
}