From 619798df41c3749c1ae712f7d4c6afda8d7fd2e8 Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 22 Jan 2015 15:13:16 +0100
Subject: [PATCH] Centralize stylesheets

Instead of having inline stylesheets, put them all in a separate CSS
file. This really should've been done from the beginning, but was
clearly forgotten before deployment.
---
 .../static/commitfest/css/commitfest.css      | 62 +++++++++++++++++++
 pgcommitfest/commitfest/templates/base.html   |  1 +
 .../commitfest/templates/base_form.html       | 39 ------------
 pgcommitfest/commitfest/templates/patch.html  |  6 --
 .../commitfest/templates/thread_attach.inc    | 13 ----
 .../templates/userprofileform.html            | 39 ------------
 6 files changed, 63 insertions(+), 97 deletions(-)
 create mode 100644 pgcommitfest/commitfest/static/commitfest/css/commitfest.css

diff --git a/pgcommitfest/commitfest/static/commitfest/css/commitfest.css b/pgcommitfest/commitfest/static/commitfest/css/commitfest.css
new file mode 100644
index 0000000..74cb018
--- /dev/null
+++ b/pgcommitfest/commitfest/static/commitfest/css/commitfest.css
@@ -0,0 +1,62 @@
+/*
+ * commitfest.postgresql.org specific styles
+ */
+
+/* For close button with float disabled */
+.close-nofloat {
+   float: none !important;
+}
+
+/* General form styling */
+.form-horizontal div.form-group {
+   margin-bottom: 10px;
+}
+div.form-group div.controls ul {
+   list-style-type: none;
+   margin: 0px;
+   padding: 0px;
+}
+div.form-group div.controls ul li {
+   display: inline;
+}
+div.form-group div.controls ul li label {
+   display: inline;
+   font-weight: normal;
+   vertical-align:middle;
+}
+div.form-group div.controls ul li label input {
+   display: inline;
+   vertical-align:middle;
+}
+div.form-group div.controls input[type='checkbox'] {
+   width: 10px;
+}
+
+div.controls ul.selectable-deck li.selectable-deck-item {
+   display: block;
+}
+
+div.controls ul.selectable-deck li.selectable-deck-item a.selectable-deck-remove {
+   float: none;
+   margin-left: 10px;
+}
+
+div.form-group div.controls input.threadpick-input {
+   width: 80%;
+   display: inline;
+}
+
+
+/*
+ * Attach thread dialog
+ */
+#attachThreadListWrap.loading {
+    display: block;
+    background: url('/static/commitfest/spinner.gif') no-repeat center;
+    width: 124px;
+    height: 124px;
+    margin: 0 auto;
+}
+#attachThreadListWrap.loading * {
+    display: none;
+}
diff --git a/pgcommitfest/commitfest/templates/base.html b/pgcommitfest/commitfest/templates/base.html
index a22b1ee..6c8756c 100644
--- a/pgcommitfest/commitfest/templates/base.html
+++ b/pgcommitfest/commitfest/templates/base.html
@@ -7,6 +7,7 @@
   <link rel="stylesheet" href="/static/selectable/css/dj.selectable.css" type="text/css" media="all">
   <link rel="stylesheet" href="/static/commitfest/css/bootstrap.css" />
   <link rel="stylesheet" href="/static/commitfest/css/bootstrap-theme.min.css" />
+  <link rel="stylesheet" href="/static/commitfest/css/commitfest.css" />
   <link rel="shortcut icon" href="/static/commitfest/favicon.ico" />
 {%if rss_alternate%}  <link rel="alternate" type="application/rss+xml" title="{{rss_alternate_title}}" href="{{rss_alternate}}" />{%endif%}
 </head>
diff --git a/pgcommitfest/commitfest/templates/base_form.html b/pgcommitfest/commitfest/templates/base_form.html
index c6cf605..6a2addd 100644
--- a/pgcommitfest/commitfest/templates/base_form.html
+++ b/pgcommitfest/commitfest/templates/base_form.html
@@ -3,45 +3,6 @@
 {%load commitfest%}
 
 {%block contents%}
-<style>
-.form-horizontal div.form-group {
-   margin-bottom: 10px;
-}
-div.form-group div.controls ul {
-   list-style-type: none;
-   margin: 0px;
-   padding: 0px;
-}
-div.form-group div.controls ul li {
-   display: inline;
-}
-div.form-group div.controls ul li label {
-   display: inline;
-   font-weight: normal;
-   vertical-align:middle;
-}
-div.form-group div.controls ul li label input {
-   display: inline;
-   vertical-align:middle;
-}
-div.form-group div.controls input[type='checkbox'] {
-   width: 10px;
-}
-
-div.controls ul.selectable-deck li.selectable-deck-item {
-   display: block;
-}
-
-div.controls ul.selectable-deck li.selectable-deck-item a.selectable-deck-remove {
-   float: none;
-   margin-left: 10px;
-}
-
-div.form-group div.controls input.threadpick-input {
-   width: 80%;
-   display: inline;
-}
-</style>
 <form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
 {%if form.errors%}
  <div class="alert">Please correct the errors below, and re-submit the form.</div>
diff --git a/pgcommitfest/commitfest/templates/patch.html b/pgcommitfest/commitfest/templates/patch.html
index 4bfb6ab..d09a175 100644
--- a/pgcommitfest/commitfest/templates/patch.html
+++ b/pgcommitfest/commitfest/templates/patch.html
@@ -1,12 +1,6 @@
 {%extends "base.html"%}
 {%load commitfest%}
 {%block contents%}
-<style>
-.close-nofloat {
-   float: none !important;
-}
-</style>
-
 {%include "patch_commands.inc"%}
 <table class="table table-bordered">
   <tbody>
diff --git a/pgcommitfest/commitfest/templates/thread_attach.inc b/pgcommitfest/commitfest/templates/thread_attach.inc
index 44c4316..4e538cc 100644
--- a/pgcommitfest/commitfest/templates/thread_attach.inc
+++ b/pgcommitfest/commitfest/templates/thread_attach.inc
@@ -1,17 +1,4 @@
 {%comment%}Modal dialog for attach thread{%endcomment%}
-<style>
-#attachThreadListWrap.loading {
-    display: block;
-    background: url('/static/commitfest/spinner.gif') no-repeat center;
-    width: 124px;
-    height: 124px;
-    margin: 0 auto;
-}
-#attachThreadListWrap.loading * {
-    display: none;
-}
-</style>
-
 <div class="modal fade" id="attachModal" role="dialog">
  <div class="modal-dialog modal-lg"><div class="modal-content">
  <div class="modal-header">
diff --git a/pgcommitfest/userprofile/templates/userprofileform.html b/pgcommitfest/userprofile/templates/userprofileform.html
index 4764fad..9e6db7f 100644
--- a/pgcommitfest/userprofile/templates/userprofileform.html
+++ b/pgcommitfest/userprofile/templates/userprofileform.html
@@ -2,45 +2,6 @@
 {%load commitfest%}
 
 {%block contents%}
-<style>
-.form-horizontal div.form-group {
-   margin-bottom: 10px;
-}
-div.form-group div.controls ul {
-   list-style-type: none;
-   margin: 0px;
-   padding: 0px;
-}
-div.form-group div.controls ul li {
-   display: inline;
-}
-div.form-group div.controls ul li label {
-   display: inline;
-   font-weight: normal;
-   vertical-align:middle;
-}
-div.form-group div.controls ul li label input {
-   display: inline;
-   vertical-align:middle;
-}
-div.form-group div.controls input[type='checkbox'] {
-   width: 10px;
-}
-
-div.controls ul.selectable-deck li.selectable-deck-item {
-   display: block;
-}
-
-div.controls ul.selectable-deck li.selectable-deck-item a.selectable-deck-remove {
-   float: none;
-   margin-left: 10px;
-}
-
-div.form-group div.controls input.threadpick-input {
-   width: 80%;
-   display: inline;
-}
-</style>
 <form class="form-horizontal {{extraformclass}}" method="POST" action=".">{%csrf_token%}
 {%if form.errors%}
  <div class="alert">Please correct the errors below, and re-submit the form.</div>
-- 
2.39.5