From 15c470c28006a4fe24b385641634ece6ed38ccaf Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Thu, 16 Apr 2015 11:05:36 +0530 Subject: [PATCH 1/2] Update proposal writeup styling closes #180 --- junction/static/css/app.css | 4 + junction/static/css/details.css | 2 +- junction/static/less/proposals.less | 4 + junction/templates/base.html | 1 - junction/templates/proposals/detail/base.html | 73 ++++++++----------- 5 files changed, 40 insertions(+), 44 deletions(-) diff --git a/junction/static/css/app.css b/junction/static/css/app.css index d4127f71..d8c4cd0e 100644 --- a/junction/static/css/app.css +++ b/junction/static/css/app.css @@ -8638,6 +8638,10 @@ a.status:focus { .proposal-meta table td { padding: 3px; } +.proposal-writeup .heading { + border-bottom: 1px solid #eee; + padding-bottom: 5px; +} .comments-and-reviews-panel { margin-bottom: 20px; } diff --git a/junction/static/css/details.css b/junction/static/css/details.css index 90d8eeaa..d6600093 100644 --- a/junction/static/css/details.css +++ b/junction/static/css/details.css @@ -70,4 +70,4 @@ .porsal-title-section .col-sm-12{ height:100px; } -} \ No newline at end of file +} diff --git a/junction/static/less/proposals.less b/junction/static/less/proposals.less index 6601fd59..c0ebe5d7 100644 --- a/junction/static/less/proposals.less +++ b/junction/static/less/proposals.less @@ -43,6 +43,10 @@ } } } +.proposal-writeup .heading { + border-bottom: 1px solid #eee; + padding-bottom: 5px; +} .comments-and-reviews-panel { margin-bottom: 20px; diff --git a/junction/templates/base.html b/junction/templates/base.html index 27a89778..9862a6d1 100644 --- a/junction/templates/base.html +++ b/junction/templates/base.html @@ -172,5 +172,4 @@ {% endif %} - diff --git a/junction/templates/proposals/detail/base.html b/junction/templates/proposals/detail/base.html index 72af34a6..fc8126c1 100644 --- a/junction/templates/proposals/detail/base.html +++ b/junction/templates/proposals/detail/base.html @@ -94,52 +94,41 @@

-
-

- Description : -

-

- {{ proposal.description|markdown }} -

+
+
+

{{ proposal.description|markdown }}

+
- {% if proposal.prerequisites %} -

- Prerequisites : -

-

- {{ proposal.prerequisites|markdown }} -

- {% endif %} + {% if proposal.prerequisites %} +
+

Prerequisites:

+

{{ proposal.prerequisites|markdown }}

+
+ {% endif %} - {% if proposal.content_urls %} -

- Content URLs : -

-

- {{ proposal.content_urls|markdown }} -

- {% endif %} + {% if proposal.content_urls %} +
+

Content URLs:

+

{{ proposal.content_urls|markdown }}

+
+ {% endif %} - {% if proposal.speaker_info %} -

- Speaker Info : -

-

- {{ proposal.speaker_info|markdown }} -

- {% endif %} + {% if proposal.speaker_info %} +
+

Speaker Info:

+

{{ proposal.speaker_info|markdown }}

+
+ {% endif %} - {% if proposal.speaker_links %} -

- Speaker Links : -

-

- {{ proposal.speaker_links|markdown }} -

- {% endif %} -
+ {% if proposal.speaker_links %} +
+

Speaker Links:

+

{{ proposal.speaker_links|markdown }}

+
+ {% endif %} + -
+
@@ -169,7 +158,7 @@

Section:
{% include "social_shares.html" %} -
+
From 34bc1d2c34540ae0a4ef8062f1256389d7213ce9 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Thu, 16 Apr 2015 11:54:55 +0530 Subject: [PATCH 2/2] Change the order of social share button to look better --- junction/static/css/app.css | 2 +- junction/static/less/proposals.less | 2 +- junction/templates/social_shares.html | 48 +++++++++++---------------- 3 files changed, 21 insertions(+), 31 deletions(-) diff --git a/junction/static/css/app.css b/junction/static/css/app.css index d8c4cd0e..3fb539b5 100644 --- a/junction/static/css/app.css +++ b/junction/static/css/app.css @@ -8636,7 +8636,7 @@ a.status:focus { padding: 0; } .proposal-meta table td { - padding: 3px; + padding: 3px !important; } .proposal-writeup .heading { border-bottom: 1px solid #eee; diff --git a/junction/static/less/proposals.less b/junction/static/less/proposals.less index c0ebe5d7..82d594b9 100644 --- a/junction/static/less/proposals.less +++ b/junction/static/less/proposals.less @@ -39,7 +39,7 @@ table { td { - padding: 3px; + padding: 3px !important; } } } diff --git a/junction/templates/social_shares.html b/junction/templates/social_shares.html index 2465b945..aa4283b1 100644 --- a/junction/templates/social_shares.html +++ b/junction/templates/social_shares.html @@ -29,33 +29,23 @@ -
    -
  • -

    - -

    -
    • -
  • -

    -

    -
    -

    -
    • -
  • -

    - -

    -

    -
    • -
+

+

+

+ +
+
+