uploading all recent changes ahead of sys upgrade

11 files changed, 532 insertions, 53 deletions

diff --git a/design/sass/_forms.scss b/design/sass/_forms.scss
index d6b0931..5923e1f 100644
--- a/design/sass/_forms.scss
+++ b/design/sass/_forms.scss
@@ -101,6 +101,40 @@ table {
         color: $link_color !important;
     }
 }
+.btn-hollow {
+    @include fontsize(17);
+    padding: 6px 8px;
+    border: none; //1px solid $body_font_light;
+    color: $link_color !important;
+    outline: $link_color !important;
+    background: white;
+    border: 1px solid $link_color;
+    &:hover {
+        background: white;
+        color: $link_color !important;
+    }
+}
+.btn-link {
+    @include fontsize(15);
+    padding: 0;
+    border: none; //1px solid $body_font_light;
+    color: lighten($body_font_color, 15) !important;
+    background: white;
+    border: none;
+    &:hover {
+        background: white;
+        color: $body_font_color !important;
+    }
+}
+.save {
+    color: white !important;
+    background: $link_color !important;
+    &:hover {
+        background: $link_color;
+        color: white !important;
+    }
+
+}
 .btn-accent {
     padding: 3px 5px;
     border: 1px solid $text_accent;
diff --git a/design/sass/_global.scss b/design/sass/_global.scss
index d394042..c242ace 100644
--- a/design/sass/_global.scss
+++ b/design/sass/_global.scss
@@ -152,7 +152,7 @@ h3 {
     }
 }
 .wrapper {
-    @include constrain_wide;
+    @include constrain(1440px);
     //margin-top: 5rem;
 }
 //**************  Universals ************************
@@ -186,6 +186,21 @@ h3 {
 .left-margin-2 {
     margin-left: 2px;
 }
+.right-padding-0 {
+    padding-right: 0 !important;
+}
+.center {
+    text-align: center;
+    margin-right: auto;
+    margin-left: auto;
+}
+.list-style-none {
+    list-style-type: none;
+    padding: 0;
+}
+.vertical li {
+    display: block;
+}
 //**************  other global classes ************************
 .sans {
     @include generic_sans;
diff --git a/design/sass/_header.scss b/design/sass/_header.scss
index 7f98419..487f1fc 100644
--- a/design/sass/_header.scss
+++ b/design/sass/_header.scss
@@ -54,3 +54,47 @@ nav {
         }
     }
 }
+.dropmenu {
+    outline: white;
+    position: absolute;
+    z-index: 10;
+    margin-top: 4px;
+    margin-left: 2rem;
+    background: #fff;
+    color: #60516E;
+    padding: 10px;
+    border-radius: 4px;
+    border: 1px solid rgba(0,0,0,0.05);
+    filter: drop-shadow(0 0px 4px rgba(0,0,0,0.08));
+    &:after {
+        top: unset;
+        left: unset;
+        margin-left: unset;
+        border-top-color: unset;
+        content: "";
+        position: absolute;
+        border: 10px solid transparent;
+        bottom: 100%;
+        left: 50%;
+        margin-left: -10px;
+        border-bottom-color: white;
+    }
+    a, a:visited {
+        color: lighten($body_font_color, 15);
+    }
+    a:hover {
+        color: $body_font_color;
+    }
+    .menu-divider {
+        border-top: 1px solid #e7e2ee;
+        padding: 8px 16px 0;
+        margin: 8px -10px 0;
+    }
+    li {
+        margin-top: 4px;
+        margin-bottom: 4px;
+    }
+}
+#user-menu {
+    margin-left: 4rem;
+}
diff --git a/design/sass/_notes.scss b/design/sass/_notes.scss
index 09d234a..cd10e39 100644
--- a/design/sass/_notes.scss
+++ b/design/sass/_notes.scss
@@ -1,25 +1,163 @@
+main {
+    width: 100%;
+    display: flex ;
+    align-items: stretch ;
+    flex-flow: row wrap ;
+    margin: 0;
+}
+.svg-icon-arrow {
+    display: block;
+    z-index: 2;
+    width: 18px;
+    height: 18px;
+    &:hover {
+        -moz-transform: scaleX(-1);
+        -o-transform: scaleX(-1);
+        -webkit-transform: scaleX(-1);
+        transform: scaleX(-1);
+        filter: FlipH;
+        -ms-filter: "FlipH";
+        transition: 0.5s;
+    }
+}
+.note-list-container, .balance-container {
+    position: relative;
+    order: 1;
+    z-index: 1;
+    visibility: hidden;
+    //background: #fbfafa;
+    padding: 4px;
+    border-left: 1px #f9f9f9 solid;
+    max-width: 320px;
+    .list-note-preview {
+        li {
+            height: 4.5rem;
+        }
+        h4 {
+            @include fontsize(15);
+        }
+    }
+    .note-preview {
+        overflow: hidden;
+        white-space: nowrap;
+    }
+}
+.balance-container {
+    order: 3;
+    min-width: 320px;
+}
+.list-notebook {
+
+}
+.icon-notebook {
+    display: inline-block;
+    content: " ";
+    width: 24px;
+    height: 24px;
+    background: url('/media/moleskine.svg'); 
+}
+.list-note-preview {
+    padding: 0;
+    margin: 0;
+    list-style-type: none;
+    li {
+        @include fontsize(13);
+        min-height: 4.5rem;
+        box-shadow: 0 -1px 0 #e7e2ee inset;
+        margin: 0;
+        padding: 6px 12px;
+        &:hover {
+            background: #f1f1f1;
+        }
+        a {
+            color: lighten($body_font_color, 15);
+            text-decoration: none;
+        }
+    }
+    h4 {
+        @include fontsize(16);
+        margin: 0;
+        padding: 8px 0 8px 6px;
+        font-weight: normal;
+        overflow: hidden;
+        white-space: nowrap;
+    }
+    .note-preview {
+        padding-left: 6px;
+        margin-bottom: 16px;
+        margin-right: 6px;
+    }
+}
 .note-title {
-    @include fontsize(22);
+    @include fontsize(26);
 }
 .note-header {
     @extend %clearfix;
 }
-.note-header-float {
-    width: 30%;
-    float: right;
+.note-header-right {
     text-align: right;
+    float: right;
+    width: 50%;
 }
 .note-time, .note-url {
     text-align: right;
     @include fancy-sans;
+    @include fontsize(12);
+    margin-bottom: 0;
+    text-transform: uppercase;
+}
+.note-url {
+    margin-top: 0;
+}
+.note-header {
+    margin-top: 1rem;
+    margin-bottom: 3rem;
+}
+.edit-btn-wrapper{
+    text-align: right;
+}
+.note-header-left {
+    @include fancy-sans;
     @include fontsize(13);
+    float: left;
+    width: 50%;
+    .label {
+        text-transform: uppercase;
+        @include fontsize(11);
+        color: $body_font_light;
+        margin-right: 4px;
+    }
+    ul {
+        display: inline-block;
+        padding: 0;
+        margin-bottom: 0;
+    }
+    li { 
+        margin-right: 4px;
+        display: inline-block;
+    }
+    a {
+        text-decoration: none;
+        color: darken($body_font_light, 5);;
+        &:hover {
+            color: darken($body_font_light, 25);
+        }
+    }
+}
+.notebook {
+    display: block;
 }
 .note-container {
-    @include constrain(80%);
+    max-width: 60%;
+    position: relative;
+    flex:1;
+    order: 2;
+    background: #fff;
+    z-index: 4;
 }
 #note-body {
     @include fancy-sans;
-    @include fontsize(15);
+    @include fontsize(14);
 }
 .inactive {
     .ql-editor {
@@ -39,33 +177,94 @@
         font-size:inherit;
     }
 }
-.note-list-container {
-    max-width: 300px;
-    ul {
-        padding: 0;
-        list-style-type: none;
-    }
-    li {
-        @include fontsize(13);
-        height: 4.5rem;
-        box-shadow: 0 -1px 0 #e7e2ee inset;
-        margin: 0;
-        a {
-            color: lighten($body_font_color, 15);
-            text-decoration: none;
-        }
-    }
-    h4 {
-        @include fontsize(15);
-        margin: 0;
-        padding: 8px 0 8px 6px;
-        font-weight: normal;
-        overflow: hidden;
-        white-space: nowrap;
-    }
-    .note-preview {
-        padding-left: 6px;
-        overflow: hidden;
-        white-space: nowrap;
-    }
+#user-menu, #notebooks-menu {
+    display: none;
+}
+.active {
+    display: block !important;
+}
+
+/*
+
+Orginal Style from ethanschoonover.com/solarized (c) Jeremy Hull <sourdrums@gmail.com>
+
+*/
+
+.hljs, pre.ql-syntax {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #002b36 !important;
+  color: #839496;
+}
+
+.hljs-comment,
+.hljs-quote {
+  color: #586e75;
+}
+
+/* Solarized Green */
+.hljs-keyword,
+.hljs-selector-tag,
+.hljs-addition {
+  color: #859900;
+}
+
+/* Solarized Cyan */
+.hljs-number,
+.hljs-string,
+.hljs-meta .hljs-meta-string,
+.hljs-literal,
+.hljs-doctag,
+.hljs-regexp {
+  color: #2aa198;
+}
+
+/* Solarized Blue */
+.hljs-title,
+.hljs-section,
+.hljs-name,
+.hljs-selector-id,
+.hljs-selector-class {
+  color: #268bd2;
+}
+
+/* Solarized Yellow */
+.hljs-attribute,
+.hljs-attr,
+.hljs-variable,
+.hljs-template-variable,
+.hljs-class .hljs-title,
+.hljs-type {
+  color: #b58900;
+}
+
+/* Solarized Orange */
+.hljs-symbol,
+.hljs-bullet,
+.hljs-subst,
+.hljs-meta,
+.hljs-meta .hljs-keyword,
+.hljs-selector-attr,
+.hljs-selector-pseudo,
+.hljs-link {
+  color: #cb4b16;
+}
+
+/* Solarized Red */
+.hljs-built_in,
+.hljs-deletion {
+  color: #dc322f;
+}
+
+.hljs-formula {
+  background: #073642;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
 }
diff --git a/design/templates/base.html b/design/templates/base.html
index f14e5df..bb54717 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -20,8 +20,16 @@
     <div class="head-wrapper">
     <header>
     <nav class="left">
-        <ul>
-            <li><a href="/" title="">Home</a></li>
+        <ul>{% if not request.user.is_anonymous %}
+            <li><a href="{%url 'notes:note-list' user.username %}">Notes</a></li>
+            <li><a id="notebook-menu-link" href="{%url 'notes:notebook-list' user.username %}" title="view notebooks">Notebooks</a>
+                <div id="notebooks-menu" class="dropmenu">
+                    <ul id="notebooks-menu-list" class="list-style-none vertical">{% for obj in user.profile.get_notebook_list %}
+                        <li><a href="{{obj.get_absolute_url}}">{{obj}}</a></li>
+                        {% endfor %}</ul>
+                </div>
+            </li>{%else%}
+            <li><a href="/" title="">Home</a></li>{%endif%}
         </ul>
     </nav>
     <div class="logo"></div>
@@ -29,8 +37,23 @@
         <ul>
             <li><a href="{% url 'pages' slug='tour' %}" title="">Tour</a></li>
             <li><a href="{% url 'pages' slug='howto' %}" title="">How to</a></li>{% if not request.user.is_anonymous %}
-            <li><a href="{% url 'settings' %}" title="">Account</a></li>
-            <li><a href="{% url 'logout' %}" title="">Log out</a></li>{% else %}
+            <li><a id="account-menu" href="{% url 'settings' %}" title="">Account</a>
+            <div id="user-menu" class="dropmenu" tabindex="-1">
+                    <ul id="user-menu-list" class="list-style-none vertical">
+                        <li><a href="/users/luxagraf/" class="">Your Notes</a></li>
+                        <li><a href="/settings/" class="">Account settings</a></li>
+                        <li><a href="/plans/" class="">Subscription plans</a></li>
+                    </ul>
+                    <ul class="menu-divider list-style-none">
+                        <li>
+                            <form action="/logout/" method="post">
+                                <input type="hidden" name="a" value="3">
+                                <button type="submit" value="Log out" class="btn-link">Log out</button>
+                            </form>
+                        </li>
+                    </ul>
+                </div>
+            </li>{% else %}
             <li><a href="{% url 'login' %}" title="" id="overlay-trigger" data-element="#js-overlay-content">Login</a></li>
             <li><a href="{% url 'django_registration_register' %}" title="" class="btn">Get Started</a></li>{% endif %}
         </ul>
@@ -38,12 +61,12 @@
     </header>
     </div>
     <div class="wrapper">
-        <ul class="breadcrumb" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
+        {%comment%}<ul class="breadcrumb" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
             <li>
                 <a href="/" title="home" itemprop="url"><span itemprop="title">Home</span></a>
             </li>
             {% block breadcrumbs %}{% endblock %}
-    </ul>
+        </ul>{%endcomment%}
 {% block content %}
 {% endblock %}
     </div>
@@ -65,9 +88,11 @@
 <script async src="/media/js/package.min.js"></script>
 {% block jsinclude %}{%endblock%}
 <script>
-// Waiting for the DOM to load
+
+
 document.addEventListener("DOMContentLoaded", function () {
     {% block jsdomready %}{%endblock%}
+    // Notebook menu
 });
 </script>
 </body>
diff --git a/design/templates/notes/notebook_create.html b/design/templates/notes/notebook_create.html
new file mode 100644
index 0000000..8ffc94a
--- /dev/null
+++ b/design/templates/notes/notebook_create.html
@@ -0,0 +1,46 @@
+{% extends 'base.html' %}
+
+{% block extrastyles %}
+<link rel="stylesheet" href="/media/quill.snow.css" />
+{% endblock %}
+{% block content %}
+<main>
+    <article class="note-container">
+    <form id="new-notebook-form" action="{% url 'notebook-api-list' %}" method="post">
+{% csrf_token %}
+{{ form.non_field_errors }}
+{% for field in form %}
+<fieldset class="{% if field.errors %}error {%endif%}{% if field.name == 'body_qjson' or field.name == 'body_html' %}hide {%endif%}" id="fs-{{field.name}}" >
+{{field.label_tag}}
+{{field}}
+{% if field.errors %}{{field.errors}}{% endif %}
+</fieldset>
+{% endfor %}
+<p><input class="btn btn-inline" value="create" type="submit" /></p>
+</form>
+    <ul>{% for object in notebook_list %}
+        <li>
+            <a href="{% url 'notes:notebook-detail' user.username object.slug %}"><i class="icon-notebook"> </i>{{object.name}}</a>
+        </li>
+        {%endfor%}</ul>
+    </article>
+    <aside class="note-list-container">
+        <div class="svg-wrapper"><svg class="svg-icon-arrow">
+            <svg viewBox="0 0 16 13" id="shape-double-arrow" width="100%" height="100%"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square"><g id="Showing-post-info" transform="translate(-297.000000, -105.000000)" stroke="currentColor"><g transform="translate(305.000000, 111.500000) scale(-1, 1) rotate(-180.000000) translate(-305.000000, -111.500000) translate(297.000000, 105.000000)"><path d="M2.20710678,6.5 L6.85355339,1.85355339 L7.20710678,1.5 L6.5,0.792893219 L6.14644661,1.14644661 L1.14644661,6.14644661 L1.05805826,6.23483496 L0.792893219,6.5 L1.14644661,6.85355339 L6.14644661,11.8535534 L6.5,12.2071068 L7.20710678,11.5 L6.85355339,11.1464466 L2.20710678,6.5 Z" id="Combined-Shape"></path><path d="M10.2071068,6.5 L14.8535534,1.85355339 L15.2071068,1.5 L14.5,0.792893219 L14.1464466,1.14644661 L9.14644661,6.14644661 L9.05805826,6.23483496 L8.79289322,6.5 L9.14644661,6.85355339 L14.1464466,11.8535534 L14.5,12.2071068 L15.2071068,11.5 L14.8535534,11.1464466 L10.2071068,6.5 Z" id="Combined-Shape"></path></g></g></g></svg>
+            </svg></div>
+        <div class="">
+            <ul class="list-note-preview">{% for obj in notes_list %}
+                <li>
+                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
+                        <h4>{{obj.title}}</h4>
+                        <div class="note-preview">{{obj.body_text|truncatewords:12}}</div>
+                    </a>
+                </li>
+            {% endfor %}</ul>
+        </div>
+    </aside>
+    <div class="balance-container">
+    </div>
+</main>
+{% endblock %}
+
diff --git a/design/templates/notes/notebook_detail.html b/design/templates/notes/notebook_detail.html
new file mode 100644
index 0000000..36873e1
--- /dev/null
+++ b/design/templates/notes/notebook_detail.html
@@ -0,0 +1,49 @@
+{% extends 'base.html' %}
+
+{% block content %}
+<main>
+    <article class="note-container">
+        {%comment%}
+        <form id="new-note-form" action="{% url 'notebook-api-list' %}" method="post">
+            <label>Create a new notebook</label>
+            {% csrf_token %}
+            {{ form.non_field_errors }}
+            {% for field in form %}
+            <fieldset class="{% if field.errors %}error {%endif%}{% if field.name == 'body_qjson' or field.name == 'body_html' %}hide {%endif%}" id="fs-{{field.name}}" >
+                {{field.label_tag}}
+                {{field}}
+                {% if field.errors %}{{field.errors}}{% endif %}
+            </fieldset>
+                {% endfor %}
+                <p><input class="btn btn-inline" value="create" type="submit" /></p>
+        </form>
+        {%endcomment%}
+{{object}}
+            <ul class="list-note-preview">{% for obj in object.note_set.all %}
+                <li>
+                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
+                        <h4>{{obj.title}}</h4>
+                        <div class="note-preview">{{obj.body_text|truncatewords:36}}</div>
+                    </a>
+                </li>
+            {% endfor %}</ul>
+    </article>
+    <aside class="note-list-container">
+        <div class="svg-wrapper"><svg class="svg-icon-arrow">
+            <svg viewBox="0 0 16 13" id="shape-double-arrow" width="100%" height="100%"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square"><g id="Showing-post-info" transform="translate(-297.000000, -105.000000)" stroke="currentColor"><g transform="translate(305.000000, 111.500000) scale(-1, 1) rotate(-180.000000) translate(-305.000000, -111.500000) translate(297.000000, 105.000000)"><path d="M2.20710678,6.5 L6.85355339,1.85355339 L7.20710678,1.5 L6.5,0.792893219 L6.14644661,1.14644661 L1.14644661,6.14644661 L1.05805826,6.23483496 L0.792893219,6.5 L1.14644661,6.85355339 L6.14644661,11.8535534 L6.5,12.2071068 L7.20710678,11.5 L6.85355339,11.1464466 L2.20710678,6.5 Z" id="Combined-Shape"></path><path d="M10.2071068,6.5 L14.8535534,1.85355339 L15.2071068,1.5 L14.5,0.792893219 L14.1464466,1.14644661 L9.14644661,6.14644661 L9.05805826,6.23483496 L8.79289322,6.5 L9.14644661,6.85355339 L14.1464466,11.8535534 L14.5,12.2071068 L15.2071068,11.5 L14.8535534,11.1464466 L10.2071068,6.5 Z" id="Combined-Shape"></path></g></g></g></svg>
+            </svg></div>
+        <div class="">
+            <ul class="list-note-preview">{% for obj in notes_list %}
+                <li>
+                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
+                        <h4>{{obj.title}}</h4>
+                        <div class="note-preview">{{obj.body_text|truncatewords:12}}</div>
+                    </a>
+                </li>
+            {% endfor %}</ul>
+        </div>
+    </aside>
+    <div class="balance-container">
+    </div>
+</main>
+{% endblock %}
diff --git a/design/templates/notes/notes_detail.html b/design/templates/notes/notes_detail.html
index bf46ab8..95583bd 100644
--- a/design/templates/notes/notes_detail.html
+++ b/design/templates/notes/notes_detail.html
@@ -10,12 +10,24 @@
 <main>
     <article class="note-container">
         <header class="note-header">
-            <button class="hide btn btn-accent" id="edit-toggle-btn">Edit</button>
-            <div class="note-header-float">
+            <div class="note-header-left">
+                <span class="label">tags:</span>
+                <ul>{% for tag in object.tags.all %}
+                    <li>
+                        <a href="{% url 'notes:note-tag' user.username tag.slug %}">{{tag}}</a>
+                    </li>
+                    {%endfor%}</ul>
+                <div class="notebook">
+                    <span class="label">notebook:</span>
+                    <a href="">{{object.notebook.name}}</a>
+                </div>
+            </div>
+            <div class="note-header-right">
                 <h2 class="note-time">{{object.date_created|date:"M d, Y"}}</h2>
-                {% if object.url %}<h3 class="note-url"><a class="btn btn-small btn-subtle" href="{{object.url}}">Source</a><a class="btn btn-small btn-subtle left-margin-2" href="object.cache">Archive</a></h3>{% endif %}
+                {% if object.url %}<h3 class="note-url"><a class="btn btn-small btn-subtle" href="{{object.url}}">Source</a><a class="btn btn-small btn-subtle right-padding-0 left-margin-2" href="object.cache">Archive</a></h3>{% endif %}
             </div>
         </header>
+        <div class="edit-btn-wrapper"><button class="hide btn btn-hollow" id="edit-toggle-btn">Edit</button></div>
         <h1 id="note-title" class="note-title">{{object.title}}</h1>
         <div id="q-container" class="inactive"><div id="note-body">{% if object.body_html %}{{object.body_html|safe}}{%else%}{{object.body_text}}{%endif%}</div></div>
         <form action="" method="post" id="note-edit-form">{% csrf_token %}
@@ -26,8 +38,11 @@
         </form>
     </article>
     <aside class="note-list-container">
+        <div class="svg-wrapper"><svg class="svg-icon-arrow">
+            <svg viewBox="0 0 16 13" id="shape-double-arrow" width="100%" height="100%"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square"><g id="Showing-post-info" transform="translate(-297.000000, -105.000000)" stroke="currentColor"><g transform="translate(305.000000, 111.500000) scale(-1, 1) rotate(-180.000000) translate(-305.000000, -111.500000) translate(297.000000, 105.000000)"><path d="M2.20710678,6.5 L6.85355339,1.85355339 L7.20710678,1.5 L6.5,0.792893219 L6.14644661,1.14644661 L1.14644661,6.14644661 L1.05805826,6.23483496 L0.792893219,6.5 L1.14644661,6.85355339 L6.14644661,11.8535534 L6.5,12.2071068 L7.20710678,11.5 L6.85355339,11.1464466 L2.20710678,6.5 Z" id="Combined-Shape"></path><path d="M10.2071068,6.5 L14.8535534,1.85355339 L15.2071068,1.5 L14.5,0.792893219 L14.1464466,1.14644661 L9.14644661,6.14644661 L9.05805826,6.23483496 L8.79289322,6.5 L9.14644661,6.85355339 L14.1464466,11.8535534 L14.5,12.2071068 L15.2071068,11.5 L14.8535534,11.1464466 L10.2071068,6.5 Z" id="Combined-Shape"></path></g></g></g></svg>
+            </svg></div>
         <div class="">
-            <ul>{% for obj in notes_list %}
+            <ul class="list-note-preview">{% for obj in notes_list %}
                 <li>
                     <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
                         <h4>{{obj.title}}</h4>
@@ -37,12 +52,24 @@
             {% endfor %}</ul>
         </div>
     </aside>
+    <div class="balance-container">
+    </div>
 </main>
 {% endblock %}
 
 {% block jsinclude %}
 <script src="/media/js/highlight.pack.js"></script>
 <script src="/media/js/quill.min.js"></script>
+<script>
+document.addEventListener('readystatechange', event => {
+  if (event.target.readyState === "interactive") {
+    //initLoader();
+  }
+  else if (event.target.readyState === "complete") {
+    initQuill("#note-body");
+  }
+});
+</script>
 {% endblock %}
     <script>
 {% block jsdomready %}
@@ -56,8 +83,8 @@
     window.editing = false;
     window.quillchange = false;
 
+    hljs.initHighlightingOnLoad();
     btn.classList.remove('hide');
-    initQuill("#note-body");
     note_html.setAttribute('name', 'body_html');
     note_html.setAttribute('class', 'hide');
     note_html.setAttribute('id', 'id_body_html');
@@ -68,7 +95,6 @@
     form.appendChild(note_qjson);
     document.getElementById("btn-js-hide").classList.add("hide");
     btn.addEventListener('click', function(){edit_note(this, title, qcontainer, window.quill, "{% url 'notes-api-detail' object.pk %}" )}, false)
-
 {%endblock%}
     </script>
 
diff --git a/design/templates/notes/notes_list.html b/design/templates/notes/notes_list.html
index 8066369..b1c1700 100644
--- a/design/templates/notes/notes_list.html
+++ b/design/templates/notes/notes_list.html
@@ -1,9 +1,35 @@
 {% extends 'base.html' %}
+
 {% block content %}
 <main>
-    <h1> Notes</h1>
-    <ul>{% for obj in object_list %}
-        <li><a href="{% url 'notes:note-detail' user.username obj.slug %}">{{obj}}</a></li>
-    {% endfor %}</ul>
+    <article class="note-container">
+        <h1>Notes {% if tags|length == 1%} tagged {% for tag in tags%}{{tag}}{%endfor%}{%endif%}</h1>
+        <div>Tagged with: {% for tag in tags%}<a href="{{tag|slugify}}">{{tag}}</a>{%endfor%}</div>
+            <ul class="list-note-preview">{% for obj in object_list %}
+                <li>
+                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
+                        <h4>{{obj.title}}</h4>
+                        <div class="note-preview">{{obj.body_text|truncatewords:36}}</div>
+                    </a>
+                </li>
+            {% endfor %}</ul>
+    </article>
+    <aside class="note-list-container">
+        <div class="svg-wrapper"><svg class="svg-icon-arrow">
+            <svg viewBox="0 0 16 13" id="shape-double-arrow" width="100%" height="100%"><g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="square"><g id="Showing-post-info" transform="translate(-297.000000, -105.000000)" stroke="currentColor"><g transform="translate(305.000000, 111.500000) scale(-1, 1) rotate(-180.000000) translate(-305.000000, -111.500000) translate(297.000000, 105.000000)"><path d="M2.20710678,6.5 L6.85355339,1.85355339 L7.20710678,1.5 L6.5,0.792893219 L6.14644661,1.14644661 L1.14644661,6.14644661 L1.05805826,6.23483496 L0.792893219,6.5 L1.14644661,6.85355339 L6.14644661,11.8535534 L6.5,12.2071068 L7.20710678,11.5 L6.85355339,11.1464466 L2.20710678,6.5 Z" id="Combined-Shape"></path><path d="M10.2071068,6.5 L14.8535534,1.85355339 L15.2071068,1.5 L14.5,0.792893219 L14.1464466,1.14644661 L9.14644661,6.14644661 L9.05805826,6.23483496 L8.79289322,6.5 L9.14644661,6.85355339 L14.1464466,11.8535534 L14.5,12.2071068 L15.2071068,11.5 L14.8535534,11.1464466 L10.2071068,6.5 Z" id="Combined-Shape"></path></g></g></g></svg>
+            </svg></div>
+        <div class="">
+            <ul class="list-note-preview">{% for obj in notes_list %}
+                <li>
+                    <a href="{% url 'notes:note-detail' user.username  obj.slug %}">
+                        <h4>{{obj.title}}</h4>
+                        <div class="note-preview">{{obj.body_text|truncatewords:12}}</div>
+                    </a>
+                </li>
+            {% endfor %}</ul>
+        </div>
+    </aside>
+    <div class="balance-container">
+    </div>
 </main>
 {% endblock %}
diff --git a/design/templates/notes/notes_listold.html b/design/templates/notes/notes_listold.html
new file mode 100644
index 0000000..8066369
--- /dev/null
+++ b/design/templates/notes/notes_listold.html
@@ -0,0 +1,9 @@
+{% extends 'base.html' %}
+{% block content %}
+<main>
+    <h1> Notes</h1>
+    <ul>{% for obj in object_list %}
+        <li><a href="{% url 'notes:note-detail' user.username obj.slug %}">{{obj}}</a></li>
+    {% endfor %}</ul>
+</main>
+{% endblock %}
diff --git a/design/templates/sell.html b/design/templates/sell.html
new file mode 100644
index 0000000..001823b
--- /dev/null
+++ b/design/templates/sell.html
@@ -0,0 +1,6 @@
+{% extends 'base.html' %}
+{% block content %}
+<main>
+    <h1> TK Notes</h1>
+</main>
+{% endblock %}