From 2545eecd17b3536b8cccacca9be4e6ac2219da96 Mon Sep 17 00:00:00 2001
From: dsc <xmrdsc@protonmail.com>
Date: Sun, 10 Feb 2019 01:21:58 +0100
Subject: [PATCH] Some CSS changes

---
 funding/static/css/{wow.css => wow2.css}      | 124 +++++++++++++++++-
 funding/templates/about.html                  |   4 +-
 funding/templates/api.html                    |   2 +-
 funding/templates/base.html                   |   2 +-
 funding/templates/comments.html               |   2 +-
 funding/templates/donate.html                 |   4 +-
 funding/templates/login.html                  |  13 +-
 funding/templates/navbar.html                 |   3 +-
 funding/templates/proposal/edit.html          |   4 +-
 funding/templates/proposal/macros/table.html  |  95 ++++++++------
 .../proposal/macros/transaction.html          |   8 +-
 funding/templates/proposal/overview.html      |   2 +-
 funding/templates/proposal/proposal.html      |   2 +-
 funding/templates/proposal/proposals.html     |  12 +-
 funding/templates/sidebar.html                |  40 +++---
 15 files changed, 221 insertions(+), 96 deletions(-)
 rename funding/static/css/{wow.css => wow2.css} (85%)

diff --git a/funding/static/css/wow.css b/funding/static/css/wow2.css
similarity index 85%
rename from funding/static/css/wow.css
rename to funding/static/css/wow2.css
index 1ae9d73..d130ee2 100644
--- a/funding/static/css/wow.css
+++ b/funding/static/css/wow2.css
@@ -24,9 +24,8 @@ body {
 
 .navbar .navbar-brand img#text{
     width:235px;
-    height:13px;
-    margin-top: 0px;
-    margin-left:8px;
+    margin-top: -4px;
+    padding-top: 0px;
     display: inline-block;
 }
 
@@ -121,6 +120,10 @@ body {
 .navbar-dark .navbar-brand {
     color: #fff;
     font-size: 18pt;
+    margin-top: 0;
+    padding-top: 0;
+    margin-bottom: 0;
+    padding-bottom: 0;
     text-shadow: 2px 2px #667ff952;
     font-family: "Comic Sans MS", "Comic Sans", cursive;
 }
@@ -296,6 +299,13 @@ border: 1px solid #008926 !important;
 
 .navbar-dark .navbar-nav .nav-link {
     color: white;
+    padding-top: 0.4rem;
+    padding-bottom: 0.4rem;
+    font-size: 15px;
+}
+
+.navbar-nav .nav-item {
+    line-height: 20px;
 }
 
 nav .nav-link{
@@ -310,7 +320,6 @@ nav .nav-link .active{
     border-top: 0;
 }
 
-
 .proposal-info-table td span.badge{
     font-size:20px;
 }
@@ -508,9 +517,18 @@ ul.b {
 }
 
 .sidebar .card-body{
-    padding: 1.0rem;
-    padding-left: 1.25rem;
-    padding-right: 1.25rem;
+    padding-top: 1rem;
+    padding-left: 1rem;
+    padding-right: 1rem;
+    font-size: 14px;
+}
+
+.sidebar .card-body ul.b{
+    margin-bottom:0;
+}
+
+.card-header {
+    border-radius: 10px 0 0 !important;
 }
 
 /* cyrillic-ext */
@@ -662,4 +680,96 @@ ul.b {
     margin-top:10px;
     margin-bottom:10px;
     display: block;
+}
+
+.navbar-brand {
+    margin-top:0
+    margin-bottom:0
+    padding-top:0
+    padding-bottom:0;
+}
+
+.card h5{
+    color: #0000009e;
+    font-size: 14px;
+}
+
+.wowtable{
+    width:100%;
+    display: block;
+    font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace
+}
+.wowtable .trow{
+    width: 100%;
+    height: 34px;
+    display: table;
+}
+.wowtable .trow .item{
+    float:right;
+    width:100px;
+}
+.wowtable .trow .item.one{
+    width:30%;
+    min-width: 200px;
+}
+.wowtable .trow .item.small{
+    max-width:100px;
+    text-align:right;
+}
+.wowtable .trow.header .item span {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+    font-size: 14px;
+    font-weight: 700;
+    padding-top:6px;
+    display: block;
+}
+.wowtable .trow .item.comments{
+    max-width:70px;
+    text-align: center;
+}
+.wowtable .trow .item.big{
+    display: inline-block;
+    text-align: left;
+    float: left;
+    width: auto;
+    max-width: 50%;
+}
+.wowtable .trow.header .item.big span{
+    padding-left:7px;
+    padding-top:3px;
+    font-size:18px;
+    word-break: break-word;
+}
+.trow.divider{
+    height:1px;
+    background: #00000029 !important;
+}
+.wowtable .trow.body .item span {
+    font-size:14px;
+    padding-top:6px;
+    display: block;
+}
+.wowtable .trow.body .item.big a {
+    display: block;
+    padding-left: 7px;
+    color: #006400;
+    padding-top: 6px;
+    font-size: 15px;
+    font-weight: 700;
+    word-break: break-word;
+}
+.wowtable .trow span.alignl{
+    text-align:left;
+    padding-left:7px;
+}
+
+
+@media (max-width: 990px) {
+
+.wowtable .small{
+    display:none
+}
+.wowtable .trow .item.big{
+    max-width: 88%;
+}
 }
\ No newline at end of file
diff --git a/funding/templates/about.html b/funding/templates/about.html
index 8e1451b..9bf4eb6 100644
--- a/funding/templates/about.html
+++ b/funding/templates/about.html
@@ -3,12 +3,12 @@
 
 <div class="container">
     <div class="row">
-        <div class="col-lg-8">
+        <div class="col-lg-9">
             <h3>About</h3>
         </div>
     </div>
     <div class="row">
-        <div class="col-lg-8">
+        <div class="col-lg-9">
             <hr>
             <p>
                 A simple funding system made with:
diff --git a/funding/templates/api.html b/funding/templates/api.html
index 8f81301..f42b322 100644
--- a/funding/templates/api.html
+++ b/funding/templates/api.html
@@ -3,7 +3,7 @@
 
 <div class="container api_documentation">
     <div class="row" style="margin-bottom:4px;">
-        <div class="col-lg-8">
+        <div class="col-lg-9">
             <h2>API documentation</h2>
             <hr>
             <p>
diff --git a/funding/templates/base.html b/funding/templates/base.html
index 0110a1d..6d57fe7 100644
--- a/funding/templates/base.html
+++ b/funding/templates/base.html
@@ -48,7 +48,7 @@
     <link href="/static/css/bootstrap-reboot.min.css" rel="stylesheet">
     <link rel="stylesheet" href="/static/css/simplemde.min.css">
     <script src="/static/js/simplemde.min.js"></script>
-    <link href="/static/css/wow.css" rel="stylesheet">
+    <link href="/static/css/wow2.css" rel="stylesheet">
     <script src="/static/js/app.js"></script>
     <script src="/static/js/jquery-3.2.1.slim.min.js"></script>
     <script src="/static/js/bootstrap.min.js"></script>
diff --git a/funding/templates/comments.html b/funding/templates/comments.html
index a1bd5de..a7a618e 100644
--- a/funding/templates/comments.html
+++ b/funding/templates/comments.html
@@ -3,7 +3,7 @@
 <div class="row">
     <div class="col-md-12">
         <div class="card my-6" id="incoming_txs">
-            <h5 id="comments" class="card-header">Comments</h5>
+            <h5 style="border-radius:0px !important;" id="comments" class="card-header">Comments</h5>
             <div class="card-body comments-panel">
                 {% if logged_in %}
                     <form method="post" action="comment">
diff --git a/funding/templates/donate.html b/funding/templates/donate.html
index 427ea23..f2e61c6 100644
--- a/funding/templates/donate.html
+++ b/funding/templates/donate.html
@@ -3,7 +3,7 @@
 
 <div class="container page_devfund">
     <div class="row">
-        <div class="col-lg-8">
+        <div class="col-lg-9">
             <h2>Development Fund</h2>
             <p>
                 Developer donation address/slush fund (mostly reserved for hookers and blow).
@@ -11,7 +11,7 @@
         </div>
     </div>
     <div class="row content">
-        <div class="col-lg-8">
+        <div class="col-lg-9">
             <hr>
             <h3>Donating Wownero</h3>
             <p>
diff --git a/funding/templates/login.html b/funding/templates/login.html
index e0334fc..8f23a0f 100644
--- a/funding/templates/login.html
+++ b/funding/templates/login.html
@@ -10,12 +10,14 @@
                 float:left;
             }
             #xox>img{
-                height:42px;
-                padding-left:4px;
+                height: 42px;
+                padding-right: 14px;
             }
         </style>
-        <div class="col-lg-8" id="xox">
+        <div class="col-lg-8">
             <h3>Secure login </h3>
+        </div>
+        <div class="col-lg-8" id="xox">
             <img src="/static/nasa.png"/>
             <img src="/static/cyber.png"/>
             <img src="/static/ie9.png"/>
@@ -23,7 +25,7 @@
             <hr>
         </div>
     </div>
-
+    <hr>
     <div class="row">
         <div class="col-lg-3">
             <form class="form-horizontal" action="" method=post>
@@ -46,10 +48,9 @@
                 </div>
             </form>
         </div>
-        <div class="col-lg-5 center">
+        <div class="col-lg-5">
             <a href="/register">Or register here</a>
         </div>
-        {% include 'sidebar.html' %}
     </div>
 </div>
 <br>
diff --git a/funding/templates/navbar.html b/funding/templates/navbar.html
index a231ed9..da44212 100644
--- a/funding/templates/navbar.html
+++ b/funding/templates/navbar.html
@@ -2,8 +2,7 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
     <div class="container">
         <a class="navbar-brand" href="/">
-            <img id="logo" src="/static/wownero.png">
-            <img id="text" src="/static/wfs-navbar.png"
+            <img id="text" src="/static/wfs-navbar.png">
         </a>
         <a class="navbar-brand-mobile" href="/" style="font-family:monospace;display:none;">Wownero Funding System</a>
 
diff --git a/funding/templates/proposal/edit.html b/funding/templates/proposal/edit.html
index 1818207..4de6b75 100644
--- a/funding/templates/proposal/edit.html
+++ b/funding/templates/proposal/edit.html
@@ -24,7 +24,7 @@
 
         <div class="row">
             <!-- Post Content Column -->
-            <div class="col-lg-8">
+            <div class="col-lg-12">
                 <h2 style="padding-top:0">Add proposal</h2>
 
                 <p style="padding-top:0">
@@ -97,8 +97,6 @@
                     </div>
                 </form>
             </div>
-
-            {% include 'sidebar.html' %}
         </div>
     <!-- /.row -->
     {% else %}
diff --git a/funding/templates/proposal/macros/table.html b/funding/templates/proposal/macros/table.html
index 8efc515..357a821 100644
--- a/funding/templates/proposal/macros/table.html
+++ b/funding/templates/proposal/macros/table.html
@@ -1,44 +1,55 @@
 {% macro proposal_table(title, status, _proposals) %}
-    <table class="table table-proposal table-hover" data-status="{{ status }}" style="margin-bottom:6px;">
-        <thead>
-        <tr>
-            <th style="font-size: 18px;">{{title}}</th>
-            <th>Username</th>
-            <th id="date">Date</th>
-            {% if _proposals and _proposals[0].status >= 2 %}
-            <th style="text-align: right;">Funded</th>
-            {% else %}
-            <th></th>
-            {% endif %}
-            <th style="display: table-cell;text-align: center;">
-                <img width="24" src="/static/msg.png">
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-            {% for p in _proposals %}
-            <tr>
-                <td class="id"><b><a href="/proposal/{{ p.id }}">{{ p.headline }}</a></b></td>
-                <td class="user"><a href="/user/{{ p.user.username }}">{{ p.user.username }}</a></td>
-                <td class="date"><small>{{ p.date_added.strftime('%Y-%m-%d %H:%M') }}</small></td>
-                <td class="funds">
-                    <span style="float:right;">
-                    {% if p.funds_progress >= 0.1 and p.status >= 2 %}
-                        {{p.funds_progress|int}}%
-                    {% else %}
-                    -
-                    {% endif %}
-                    </span>
-                </td>
-                <td style="text-align:center;">
-                    {% if p.comment_count %}
-                        {{p.comment_count}}
-                    {% else %}
-                        -
-                    {% endif %}
-                </td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
+    <div class="wowtable" data-status="{{ status }}" style="{% if status == 4 %}opacity: 0.3;{% endif %}">
+      <div class="trow header">
+        <div class="item comments">
+          <img style="padding-top:2px;" width="24" src="/static/msg.png">
+        </div>
+        <div class="item small">
+          <span>Funded</span>
+        </div>
+        <div class="item small">
+          <span class="alignl">Date</span>
+        </div>
+        <div class="item small">
+          <span class="alignl">Username</span>
+        </div>
+        <div class="item big">
+          <span>{{title}}</span>
+        </div>
+      </div>
+      <div class="trow divider"></div>
+
+      {% for p in _proposals %}
+        <div class="trow body">
+          <div class="item comments">
+            <span>
+              {% if p.comment_count %}
+                  {{p.comment_count}}
+              {% else %}
+                  -
+              {% endif %}
+            </span>
+          </div>
+          <div class="item small">
+            <span>
+              {% if p.funds_progress >= 0.1 and p.status >= 2 %}
+                  {{p.funds_progress|int}}%
+              {% else %}
+              -
+              {% endif %}
+            </span>
+          </div>
+          <div class="item small">
+            <span class="alignl">{{ p.date_added.strftime('%Y-%m-%d') }}</span>
+          </div>
+          <div class="item small">
+            <span class="alignl"><a href="/user/{{ p.user.username }}">{{ p.user.username }}</a></span>
+          </div>
+          <div class="item big">
+            <a href="/proposal/{{ p.id }}">{{ p.headline }}</a>
+          </div>
+        </div>
+      {% endfor %}
+    </div>
+
 {% endmacro %}
\ No newline at end of file
diff --git a/funding/templates/proposal/macros/transaction.html b/funding/templates/proposal/macros/transaction.html
index 769be7e..227e264 100644
--- a/funding/templates/proposal/macros/transaction.html
+++ b/funding/templates/proposal/macros/transaction.html
@@ -5,7 +5,13 @@
     </span>
 
     <span class="height">
-        <b>Blockheight</b>: {{tx['height']}}</span>
+        <b>Blockheight</b>:
+      {% if tx['type'] == 'pool' %}
+        soon^tm
+      {% else %}
+      {{tx['height']}}
+      {% endif %}
+    </span>
     <br>
 
     <a target="_blank" href="https://explore.wownero.com/tx/{{tx['txid']}}">{{tx['txid'][:32]}}...</a>
diff --git a/funding/templates/proposal/overview.html b/funding/templates/proposal/overview.html
index a82cff9..725b2bb 100644
--- a/funding/templates/proposal/overview.html
+++ b/funding/templates/proposal/overview.html
@@ -6,7 +6,7 @@
     {% include 'proposal/macros/navbar.html' %}
 
     <div class="row">
-        <div class="col-lg-8">
+        <div class="col-lg-9">
             <div class="row">
                 <div class="col-lg-12">
                     {% if proposals['proposed'] %}
diff --git a/funding/templates/proposal/proposal.html b/funding/templates/proposal/proposal.html
index 1cc2969..6569e64 100644
--- a/funding/templates/proposal/proposal.html
+++ b/funding/templates/proposal/proposal.html
@@ -55,7 +55,7 @@
             <div class="row">
                 <div class="col-md-12">
                     <div class="card my-4">
-                        <h5 class="card-header">Funds</h5>
+                        <h5 class="card-header">Proposal</h5>
                         <div class="card-body">
                             <div class="row the-bar">
                                 <div class="col-lg-4">
diff --git a/funding/templates/proposal/proposals.html b/funding/templates/proposal/proposals.html
index c4b6c17..4e9e3a1 100644
--- a/funding/templates/proposal/proposals.html
+++ b/funding/templates/proposal/proposals.html
@@ -6,12 +6,12 @@
     {% include 'proposal/macros/navbar.html' %}
 
     <div class="row">
-        <div class="col-lg-8">
-            {% if proposals %}
-                {{ proposal_table(title='', status=status, _proposals=proposals) }}
-            {% else %}
-                No proposals here yet.
-            {% endif %}
+        <div class="col-lg-9">
+          {% if proposals %}
+              {{ proposal_table(title='', status=status, _proposals=proposals) }}
+          {% else %}
+              No proposals here yet.
+          {% endif %}
         </div>
         {% include 'sidebar.html' %}
     </div>
diff --git a/funding/templates/sidebar.html b/funding/templates/sidebar.html
index 8e5ad27..7098673 100644
--- a/funding/templates/sidebar.html
+++ b/funding/templates/sidebar.html
@@ -3,7 +3,7 @@
 {% endif %}
 
 <!-- Sidebar Widgets Column -->
-<div class="col-md-4 sidebar">
+<div class="col-md-3 sidebar">
 
     <!-- Search Widget -->
     <div class="card my-4" style="margin-top: 0 !important;">
@@ -20,6 +20,25 @@
         </div>
     </div>
 
+    <!-- Side Widget -->
+    <div class="card my-4">
+        <h5 class="card-header">Recent comments</h5>
+        <div class="card-body">
+            <ul class="b">
+                {% for c in recent_comments %}
+                <a href="/proposal/{{c.proposal.id}}#comment-{{c.id}}">
+                <li>
+                    {{c.user.username}} in #{{c.proposal.id}}
+                    <small>
+                        ({{c.ago}})
+                    </small>
+                </li>
+                </a>
+                {% endfor %}
+            </li>
+        </div>
+    </div>
+
     <!-- Categories Widget -->
     <div class="card my-4">
         <h5 class="card-header">Categories</h5>
@@ -52,25 +71,6 @@
         </div>
     </div>
 
-    <!-- Side Widget -->
-    <div class="card my-4">
-        <h5 class="card-header">Recent comments</h5>
-        <div class="card-body">
-            <ul class="b">
-                {% for c in recent_comments %}
-                <a href="/proposal/{{c.proposal.id}}#comment-{{c.id}}">
-                <li>
-                    {{c.user.username}} in #{{c.proposal.id}}
-                    <small>
-                        ({{c.ago}})
-                    </small>
-                </li>
-                </a>
-                {% endfor %}
-            </li>
-        </div>
-    </div>
-
     <!-- Side Widget -->
     <div class="card my-4">
         <h5 class="card-header">Newest Users</h5>