From 5d95f53842230b7e3024593b832e6cfa7f2b25f2 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Fri, 19 Dec 2014 18:58:26 -0500 Subject: [PATCH] Modded CSS + add JQuery magic for rendering the LP15 log and Date-Place the way Zak wants. Also, common JS used by all pages are now at /server/2015/common_js.html. All pages under /2015/ now, except the pages under /2015/scholarships/ includ /server/2015/common_js.html. modified: 2015/anti-harassment/index.html modified: 2015/assets/css/custom.css modified: 2015/call_for_sessions/confirmation.html modified: 2015/call_for_sessions/index.html modified: 2015/confirmation.html modified: 2015/discussion_list/index.html modified: 2015/exhibit/confirmation.html modified: 2015/exhibit/index.html modified: 2015/exhibit/payment_confirmation.html modified: 2015/fixed.html modified: 2015/getting_around/index.html modified: 2015/index.html modified: 2015/mailing-list/index.html modified: 2015/mailing_list.html modified: 2015/volunteer/confirmation.html modified: 2015/volunteer/index.html modified: server/2015/ahp_js.html modified: server/2015/banner.html modified: server/2015/cfs_js.html new file: server/2015/common_js.html modified: server/2015/exhibit_js.html modified: server/2015/getting_around_js.html modified: server/2015/home_js.html modified: server/2015/mailing_list_js.html modified: server/2015/volunteer_js.html --- 2015/anti-harassment/index.html | 1 + 2015/assets/css/custom.css | 25 +++++++++++++++++------- 2015/call_for_sessions/confirmation.html | 1 + 2015/call_for_sessions/index.html | 1 + 2015/confirmation.html | 1 + 2015/discussion_list/index.html | 5 +++-- 2015/exhibit/confirmation.html | 1 + 2015/exhibit/index.html | 1 + 2015/exhibit/payment_confirmation.html | 1 + 2015/fixed.html | 1 + 2015/getting_around/index.html | 1 + 2015/index.html | 1 + 2015/mailing-list/index.html | 1 + 2015/mailing_list.html | 5 +++-- 2015/volunteer/confirmation.html | 1 + 2015/volunteer/index.html | 1 + server/2015/ahp_js.html | 6 ------ server/2015/banner.html | 6 +++--- server/2015/cfs_js.html | 4 ---- server/2015/common_js.html | 22 +++++++++++++++++++++ server/2015/exhibit_js.html | 6 ------ server/2015/getting_around_js.html | 6 ------ server/2015/home_js.html | 5 ----- server/2015/mailing_list_js.html | 9 --------- server/2015/volunteer_js.html | 6 ------ 25 files changed, 62 insertions(+), 56 deletions(-) create mode 100644 server/2015/common_js.html diff --git a/2015/anti-harassment/index.html b/2015/anti-harassment/index.html index dbd86bcf..0ecbd644 100755 --- a/2015/anti-harassment/index.html +++ b/2015/anti-harassment/index.html @@ -30,5 +30,6 @@

This policy is based on several other policies, including the OLF anti-harassment policy, written by Esther Filderman and Beth Lynn Eicher, and the Con Anti-Harassment Project. Mary Gardiner, Valerie Aurora, Sarah Smith, and Donna Benjamin generalized the policies and added supporting material. Many members of LinuxChix, Geek Feminism and other groups contributed to this work.

+ diff --git a/2015/assets/css/custom.css b/2015/assets/css/custom.css index 00e84ea3..1fe98554 100644 --- a/2015/assets/css/custom.css +++ b/2015/assets/css/custom.css @@ -32,7 +32,7 @@ h3 { } .lp-head p { - margin: -0.7em 0 0.001em -4.0em; + margin: -1.40em 0 0.001em -4em; } #lp-panel { @@ -55,14 +55,25 @@ h3 { margin-left: 0.3em; } -@media (max-width:767px) { +@media (max-width:551px) { + .lp-head p { + margin: 0 0 0.2em 0; + text-align: center; + } + .lp-head img { + margin: 1.5em auto 0.5em auto; + } +} + +@media (min-width: 552px) and (max-width:767px) { + .lp-head img { - margin: 1.5em auto 0.001em auto; + margin: 1.5em auto 0.5em auto; } .lp-head p { - margin: 0.0em 0 0.7em; - text-align: center; + margin: -0.4em 0 0 -3.6em; } + #lp-panel { max-width: 100%; margin-left: 0; @@ -93,13 +104,13 @@ h3 { margin-top: 1.0em; } .lp-head p { - margin: -0.7em 0 0.001em -3.6em; + margin: -1.0em 0 0.001em -3.6em; } } @media (min-width:1200px) { .lp-head p { - margin: -0.7em 0 0.001em -7em; + margin: -1.45em 0 0.001em -7em; } } diff --git a/2015/call_for_sessions/confirmation.html b/2015/call_for_sessions/confirmation.html index 5f688490..e6c02b88 100755 --- a/2015/call_for_sessions/confirmation.html +++ b/2015/call_for_sessions/confirmation.html @@ -23,5 +23,6 @@

+ diff --git a/2015/call_for_sessions/index.html b/2015/call_for_sessions/index.html index bc5c2279..21c04611 100755 --- a/2015/call_for_sessions/index.html +++ b/2015/call_for_sessions/index.html @@ -742,5 +742,6 @@ + diff --git a/2015/confirmation.html b/2015/confirmation.html index c271c163..49cf0c75 100755 --- a/2015/confirmation.html +++ b/2015/confirmation.html @@ -23,5 +23,6 @@

+ diff --git a/2015/discussion_list/index.html b/2015/discussion_list/index.html index a654c16c..2fd47568 100755 --- a/2015/discussion_list/index.html +++ b/2015/discussion_list/index.html @@ -13,6 +13,7 @@

- + + - \ No newline at end of file + diff --git a/2015/exhibit/confirmation.html b/2015/exhibit/confirmation.html index 9f63b65d..7272d3ef 100755 --- a/2015/exhibit/confirmation.html +++ b/2015/exhibit/confirmation.html @@ -22,5 +22,6 @@

+ diff --git a/2015/exhibit/index.html b/2015/exhibit/index.html index b861a984..9542d8bb 100755 --- a/2015/exhibit/index.html +++ b/2015/exhibit/index.html @@ -571,5 +571,6 @@ + diff --git a/2015/exhibit/payment_confirmation.html b/2015/exhibit/payment_confirmation.html index 13579ae7..6e3d5d07 100755 --- a/2015/exhibit/payment_confirmation.html +++ b/2015/exhibit/payment_confirmation.html @@ -15,5 +15,6 @@ Thank you for being an exhibitor at LibrePlanet 2015! You will receive a payment

+ diff --git a/2015/fixed.html b/2015/fixed.html index b7cb7dd5..e4a63c61 100755 --- a/2015/fixed.html +++ b/2015/fixed.html @@ -245,5 +245,6 @@

FSF members and students attend LibrePlanet at no cost! Become a member now. Registration opens in October--sign up above to receive updates.

+ diff --git a/2015/getting_around/index.html b/2015/getting_around/index.html index 524e905f..1da8abb9 100755 --- a/2015/getting_around/index.html +++ b/2015/getting_around/index.html @@ -178,5 +178,6 @@ + diff --git a/2015/index.html b/2015/index.html index 28c53715..7c990475 100755 --- a/2015/index.html +++ b/2015/index.html @@ -164,5 +164,6 @@ and be part of LibrePlanet 2014!

FSF members and students attend LibrePlanet at no cost! Become a member now.

+ diff --git a/2015/mailing-list/index.html b/2015/mailing-list/index.html index d664fb65..c27e0124 100755 --- a/2015/mailing-list/index.html +++ b/2015/mailing-list/index.html @@ -66,5 +66,6 @@ + diff --git a/2015/mailing_list.html b/2015/mailing_list.html index a654c16c..2fd47568 100755 --- a/2015/mailing_list.html +++ b/2015/mailing_list.html @@ -13,6 +13,7 @@

- + + - \ No newline at end of file + diff --git a/2015/volunteer/confirmation.html b/2015/volunteer/confirmation.html index 9b81a572..5c5fad66 100755 --- a/2015/volunteer/confirmation.html +++ b/2015/volunteer/confirmation.html @@ -22,5 +22,6 @@

+ diff --git a/2015/volunteer/index.html b/2015/volunteer/index.html index ce2390e2..233f04ea 100755 --- a/2015/volunteer/index.html +++ b/2015/volunteer/index.html @@ -553,5 +553,6 @@ + diff --git a/server/2015/ahp_js.html b/server/2015/ahp_js.html index 37aa5ef4..9ca7e87d 100644 --- a/server/2015/ahp_js.html +++ b/server/2015/ahp_js.html @@ -1,9 +1,3 @@ - - - diff --git a/server/2015/banner.html b/server/2015/banner.html index 726b8a3d..7e3ff560 100644 --- a/server/2015/banner.html +++ b/server/2015/banner.html @@ -5,14 +5,14 @@
-
+ -
+


March 21-22
MIT Stata Center
@@ -80,7 +80,7 @@ -

+
diff --git a/server/2015/cfs_js.html b/server/2015/cfs_js.html index 17066ed4..f687fdf3 100644 --- a/server/2015/cfs_js.html +++ b/server/2015/cfs_js.html @@ -1,9 +1,5 @@ - - diff --git a/server/2015/common_js.html b/server/2015/common_js.html new file mode 100644 index 00000000..70c472ff --- /dev/null +++ b/server/2015/common_js.html @@ -0,0 +1,22 @@ + + + + + diff --git a/server/2015/exhibit_js.html b/server/2015/exhibit_js.html index eabe390f..e028a55e 100644 --- a/server/2015/exhibit_js.html +++ b/server/2015/exhibit_js.html @@ -1,7 +1,3 @@ - - @@ -23,5 +19,3 @@ - diff --git a/server/2015/getting_around_js.html b/server/2015/getting_around_js.html index a7d359e8..509dbfba 100644 --- a/server/2015/getting_around_js.html +++ b/server/2015/getting_around_js.html @@ -1,9 +1,3 @@ - - - diff --git a/server/2015/home_js.html b/server/2015/home_js.html index aa95ab0b..81817a3b 100644 --- a/server/2015/home_js.html +++ b/server/2015/home_js.html @@ -1,10 +1,5 @@ - - - - @@ -14,11 +10,6 @@ src="/2015/assets/js/civicrm-4.4.Common.js"> - - - - diff --git a/server/2015/volunteer_js.html b/server/2015/volunteer_js.html index 5f1d1a2f..2fcc1e01 100644 --- a/server/2015/volunteer_js.html +++ b/server/2015/volunteer_js.html @@ -1,7 +1,3 @@ - - @@ -24,5 +20,3 @@ - -- 2.25.1