Skip to content

Update proposal writeup styling #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kracekumar merged 2 commits into from
Apr 20, 2015
Merged

Update proposal writeup styling #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15c470c
Update proposal writeup styling
Apr 16, 2015
34bc1d2
Change the order of social share button to look better
Apr 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion junction/static/css/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8636,7 +8636,11 @@ a.status:focus {
padding: 0;
}
.proposal-meta table td {
padding: 3px;
padding: 3px !important;
}
.proposal-writeup .heading {
border-bottom: 1px solid #eee;
padding-bottom: 5px;
}
.comments-and-reviews-panel {
margin-bottom: 20px;
Expand Down
2 changes: 1 addition & 1 deletion junction/static/css/details.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
.porsal-title-section .col-sm-12{
height:100px;
}
}
}
6 changes: 5 additions & 1 deletion junction/static/less/proposals.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,14 @@

table {
td {
padding: 3px;
padding: 3px !important;
}
}
}
.proposal-writeup .heading {
border-bottom: 1px solid #eee;
padding-bottom: 5px;
}

.comments-and-reviews-panel {
margin-bottom: 20px;
Expand Down
1 change: 0 additions & 1 deletion junction/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,5 +172,4 @@
{% endif %}

</body>

</html>
73 changes: 31 additions & 42 deletions junction/templates/proposals/detail/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,52 +94,41 @@ <h1 class="clear-margin text-muted proposal-vote-count">
</div>
</div>

<div class="col-sm-8">
<h4>
Description :
</h4>
<p>
{{ proposal.description|markdown }}
</p>
<section class="col-sm-8 proposal-writeup">
<div class="proposal-writeup--section">
<p>{{ proposal.description|markdown }}</p>
</div>

{% if proposal.prerequisites %}
<h4>
Prerequisites :
</h4>
<p>
{{ proposal.prerequisites|markdown }}
</p>
{% endif %}
{% if proposal.prerequisites %}
<div class="proposal-writeup--section">
<h4 class='heading'>Prerequisites:</h4>
<p>{{ proposal.prerequisites|markdown }}</p>
</div>
{% endif %}

{% if proposal.content_urls %}
<h4>
Content URLs :
</h4>
<p>
{{ proposal.content_urls|markdown }}
</p>
{% endif %}
{% if proposal.content_urls %}
<div class="proposal-writeup--section">
<h4 class='heading'>Content URLs:</h4>
<p>{{ proposal.content_urls|markdown }}</p>
</div>
{% endif %}

{% if proposal.speaker_info %}
<h4>
Speaker Info :
</h4>
<p>
{{ proposal.speaker_info|markdown }}
</p>
{% endif %}
{% if proposal.speaker_info %}
<div class="proposal-writeup--section">
<h4 class='heading'>Speaker Info:</h4>
<p>{{ proposal.speaker_info|markdown }}</p>
</div>
{% endif %}

{% if proposal.speaker_links %}
<h4>
Speaker Links :
</h4>
<p>
{{ proposal.speaker_links|markdown }}
</p>
{% endif %}
</div>
{% if proposal.speaker_links %}
<div class="proposal-writeup--section">
<h4 class='heading'>Speaker Links:</h4>
<p>{{ proposal.speaker_links|markdown }}</p>
</div>
{% endif %}
</section>

<div class="col-sm-3 proposal-meta">
<section class="col-sm-3 proposal-meta">
<table class="table table-borderless">
<tr>
<td class="text-muted text-right"><small>Section:</small></td>
Expand Down Expand Up @@ -169,7 +158,7 @@ <h4>
</tr>
</table>
{% include "social_shares.html" %}
</div>
</section>
</div>

<hr>
Expand Down
48 changes: 19 additions & 29 deletions junction/templates/social_shares.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,33 +29,23 @@
</script>
<script src="https://apis.google.com/js/platform.js" async defer></script>

<ul class="list-unstyled">
<li>
<p>
<a href="https://twitter.com/share"
class="twitter-share-button"
data-via="pyconindia"
data-related="pyconindia"
data-hashtags="pyconindia">
Tweet</a>
</p>
</li>
<li>
<p>
<div
class="fb-like"
data-layout="button_count"
data-action="like"
data-show-faces="true"
data-share="true">
</div>
</p>
</li>
<li>
<p>
<!-- Place this tag where you want the +1 button to render. -->
<div class="g-plusone" data-size="medium"></div>
</p>
</li>
</ul>
<p class='google'>
<div class="g-plusone" data-size="medium"></div>
</p>
<p class='twitter'>
<a href="https://twitter.com/share"
class="twitter-share-button"
data-via="pyconindia"
data-related="pyconindia"
data-hashtags="pyconindia">
Tweet</a>
</p>
<p class='facebook'>
<div class="fb-like"
data-layout="button_count"
data-action="like"
data-show-faces="true"
data-share="true">
</div>
</p>
</div>