Get rid of all inline styles

Some of these should be replaced with proper responsive tables for
example at some point, but this is a quick-fix.

diff --git a/media/css/admin_pgweb.css b/media/css/admin_pgweb.css
index 15996fa705cefea2ae81022731e35b8aae88792d..66c0a448012709c5b606b7ce8b033586a46248ab 100644 (file)
--- a/media/css/admin_pgweb.css
+++ b/media/css/admin_pgweb.css
@@ -2,3 +2,7 @@ ul.selectable-deck li.selectable-deck-item a.selectable-deck-remove {
    float: none;
    margin-left: 10px;
 }
+
+#new_notification {
+    width: 400px;
+}

diff --git a/media/css/main.css b/media/css/main.css
index 5fc26e34aa06f01070831b1586ff8d814e907539..44cc4e3fe94b06ce448876e87121c73f567bb039 100644 (file)
--- a/media/css/main.css
+++ b/media/css/main.css
@@ -1069,6 +1069,10 @@ hr.eventseparator {
   cursor: pointer;
 }
 
+.btn-inline-block {
+    display: inline-block;
+}
+
 .form-row .btn-primary {
   margin: 0.5em 0;
 }
@@ -1231,6 +1235,41 @@ td.fm_unk {
     background-color: #ffffaa !important;
 }
 
+/* Contributors */
+table.contributor-table thead tr th {
+    width: 50%;
+}
+
+/* Downloads/products */
+table.product-table thead tr th:nth-child(1) {
+    width: 60%;
+}
+table.product-table thead tr th:nth-child(2) {
+    width: 10%;
+}
+table.product-table thead tr th:nth-child(3) {
+    width: 10%;
+}
+table.product-table thead tr th:nth-child(4) {
+    width: 20%;
+}
+
+/* Professional servies */
+table.profserv-table tbody tr th {
+    width: 20%;
+}
+
+/* Sponsors */
+table.sponsor-table tbody tr th {
+    width: 20%;
+}
+table.sponsor-table tbody tr td:nth-child(2) {
+    width: 50%;
+}
+table.sponsor-table tbody tr td:nth-child(3) {
+    width: 30%;
+}
+
 
 /** ALL RESPONSIVE QUERIES HERE */
 /* Small devices (landscape phones, 576px and up)*/

diff --git a/templates/account/login.html b/templates/account/login.html
index a844b81aadb67de84ad38267fcbd62801924343f..6a25e99972843a12b9b2cad1a287d1000d0b87d9 100644 (file)
--- a/templates/account/login.html
+++ b/templates/account/login.html
@@ -27,7 +27,7 @@ password, you can use the <a href="/account/reset/">password reset</a> form.
 
 {%if form.non_field_errors%}
 {%for err in form.non_field_errors %}
-<div style="color:red;">{{err}}</div>
+<div class="alert alert-danger">{{err}}</div>
 {%endfor%}
 {%endif%}
 <form action="." method="post" id="login-form">{% csrf_token %}

diff --git a/templates/admin/change_form_pgweb.html b/templates/admin/change_form_pgweb.html
index 614b5ad070ec404abd2474aeda87bf5c91953b95..c891f7b4a2df3a79f1d5011d5d22e821ed63c3c2 100644 (file)
--- a/templates/admin/change_form_pgweb.html
+++ b/templates/admin/change_form_pgweb.html
@@ -26,7 +26,7 @@ Note that the summary field can use
 </ul>
 <p>
 {%if original.org.email%}
-New notification: <input type="text" name="new_notification" style="width:400px;" /> (<strong>Note!</strong> This comment is emailed to the organisation!)<br/>
+New notification: <input type="text" name="new_notification" id="new_notification" /> (<strong>Note!</strong> This comment is emailed to the organisation!)<br/>
 To send a notification on rejection, first add the notification above and hit
 "Save and continue editing". Then as a separate step, delete the record.
 {%else%}

diff --git a/templates/contributors/list.html b/templates/contributors/list.html
index 27058c3440c4a895dae263fd4441f4b592f608fb..5fec31cdb420c5c8769ed326c2b3242d6fa84981 100644 (file)
--- a/templates/contributors/list.html
+++ b/templates/contributors/list.html
@@ -9,12 +9,12 @@
 <h2>{{t.typename}}</h2>
 {%if t.extrainfo%}<p>{{t.extrainfo|safe}}</p>{%endif%}
 
-<table class="table table-striped">
+<table class="table table-striped contributor-table">
   <thead class="thead-light">
     {%if t.detailed%}
     <tr>
-     <th scope="col" style="width: 50%">Contributor</th>
-     <th scope="col" style="width: 50%">Contribution</th>
+     <th scope="col">Contributor</th>
+     <th scope="col">Contribution</th>
     </tr>
     {%endif%}
   </thead>

diff --git a/templates/downloads/productlist.html b/templates/downloads/productlist.html
index 02439d7b5ed029a8fa2da317f6d4d02182b75bf3..5db8fd02f69fc5ac1f68dc59f6f2d56092e3f572 100644 (file)
--- a/templates/downloads/productlist.html
+++ b/templates/downloads/productlist.html
@@ -10,13 +10,13 @@
 
 {% for product in products %}
   <h2 class="news"><a href="{{product.url}}" target="_blank">{{product.name}}</a></h2>
-  <table class="table table-striped">
+  <table class="table table-striped product-table">
     <thead class="thead-light">
       <tr>
-        <th scope="col" style="width: 60%">Description</th>
-        <th scope="col" style="width: 10%">License</th>
-        <th scope="col" style="width: 10%">Pricing</th>
-        <th scope="col" style="width: 20%">Publisher</th>
+        <th scope="col">Description</th>
+        <th scope="col">License</th>
+        <th scope="col">Pricing</th>
+        <th scope="col">Publisher</th>
         <th scope="col">&nbsp;</th>
       </tr>
     </thead>

diff --git a/templates/index.html b/templates/index.html
index 33c12c602c56277207b49f337046563e5fe4a6ca..c22dd6b84dd5cc8d69225edf3307f007970a661a 100644 (file)
--- a/templates/index.html
+++ b/templates/index.html
@@ -66,8 +66,8 @@
         </ul>
       </div>
       <a href="{{link_root}}/download/" title="Download"><button type="button" class="btn btn-center btn-primary">Download</button></a>
-      <a href="{{link_root}}/support/versioning/" title="Why Upgrade?"><button type="button" class="btn btn-center btn-outline-secondary" style="display: inline-block;">Why Upgrade?</button></a>
-      <a href="{{link_root}}/support/security/" title="Security"><button type="button" class="btn btn-center btn-outline-secondary" style="display: inline-block;">Security</button></a>
+      <a href="{{link_root}}/support/versioning/" title="Why Upgrade?"><button type="button" class="btn btn-center btn-outline-secondary btn-inline-block">Why Upgrade?</button></a>
+      <a href="{{link_root}}/support/security/" title="Security"><button type="button" class="btn btn-center btn-outline-secondary btn-inline-block">Security</button></a>
     </div>
     <!-- END Feature -->
 
@@ -95,8 +95,8 @@
           indicates that an event is recognised under the <a href="/community/recognition/#conferences">community event guidelines</a> and is directly helping the PostgreSQL community.
         </p>
       </div>
-      <a href="/about/events/" title="Check Schedule"><button type="button" class="btn btn-center btn-primary" style="display: inline-block;">Check Schedule</button></a>
-      <a href="/account/events/new/" title="Add Your Event"><button type="button" class="btn btn-center btn-primary" style="display: inline-block;">Add Your Event</button></a>
+      <a href="/about/events/" title="Check Schedule"><button type="button" class="btn btn-center btn-primary btn-inline-block">Check Schedule</button></a>
+      <a href="/account/events/new/" title="Add Your Event"><button type="button" class="btn btn-center btn-primary btn-inline-block">Add Your Event</button></a>
     </div>
     <!-- END Feature -->
     <!-- Feature -->
@@ -164,8 +164,8 @@
           <li><a href="/docs/11/release-11-1.html">PostgreSQL 11 Release Notes</a></li>
           <li><a href="/download/">Download</a></li>
         </ul>
-        <a href="/about/newsarchive/" title="Archives"><button type="button" class="btn btn-primary btn-center" style="display: inline-block;">Browse Archives</button></a>
-        <a href="/account/news/new/" title="Submit News"><button type="button" class="btn btn-primary btn-center" style="display: inline-block;">Submit News</button></a>
+        <a href="/about/newsarchive/" title="Archives"><button type="button" class="btn btn-primary btn-center btn-inline-block">Browse Archives</button></a>
+        <a href="/account/news/new/" title="Submit News"><button type="button" class="btn btn-primary btn-center btn-inline-block">Submit News</button></a>
     </div>
     <div class="col-lg-5">
       <div class="sidebar">

diff --git a/templates/profserv/list.html b/templates/profserv/list.html
index 21f6d6c5d99af90880ebd784416e43881f0a3a8f..aa7e70f9f560ad2260c6ae06eeb4194cb93c0cef 100644 (file)
--- a/templates/profserv/list.html
+++ b/templates/profserv/list.html
@@ -8,7 +8,7 @@
   <h2 class="news">
     <a href="{{s.url}}" target="_blank">{{ s.org.name }}</a>
   </h2>
-  <table class="table table-striped">
+  <table class="table table-striped profserv-table">
     <tbody>
       {% if s.url %}
          <tr>
@@ -17,7 +17,7 @@
          </tr>
       {% endif %}
       <tr>
-        <th scope="row" style="width: 20%">Description</th>
+        <th scope="row">Description</th>
         <td>{{s.description}}</td>
       </tr>
       {% if s.provides_hosting and s.provides_support %}

diff --git a/templates/sponsors/sponsors.html b/templates/sponsors/sponsors.html
index ccf90900fad5fca7818a59193f2eda1b18656225..b3886a85be67076e411ca955c4294dab3f654324 100644 (file)
--- a/templates/sponsors/sponsors.html
+++ b/templates/sponsors/sponsors.html
@@ -15,19 +15,19 @@ for each company shown.</p>
         </table>
     {% endif %}
     <h2>{{ sponsor.sponsortype.typename }}</h2>
-    <table class="table table-striped">
+    <table class="table table-striped sponsor-table">
       <tbody>
         {% endifchanged%}
           <tr>
-            <th scope="row" style="width: 20%">
+            <th scope="row">
               <a href="{{ sponsor.url }}" target="_blank">
                 <img width="150" src="/media/img/about/sponsors/{{ sponsor.logoname }}" alt="{{ sponsor.name }}" />
               </a>
             </th>
-            <td style="width: 50%">
+            <td>
               <a href="{{ sponsor.url }}" target="_blank">{{ sponsor.name }}</a>
             </td>
-            <td style="width: 30%">{{ sponsor.country }}</td>
+            <td>{{ sponsor.country }}</td>
           </tr>
         {% endfor %}
     </tbody>