Skip to content

Show correct line numbers. #70

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
meshy merged 3 commits into from
Jun 13, 2013
Merged

Show correct line numbers. #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3163267
Fix line numbers formatting
Jun 5, 2013
de6e440
CSS is Best. Thing. Ever.
Jun 5, 2013
74704f5
Fix table width
Jun 6, 2013
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
20 changes: 19 additions & 1 deletion cbv/static/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,26 @@ html {overflow-y: scroll;}
background-color: transparent;
border: none;
}
.highlight {
.highlighttable {
margin-top: 10px;
width: 100%;
}
.highlighttable td {
padding: 0;
}
.highlighttable td.linenos {
width: 50px;
text-align: right;
}
.highlighttable td:nth-of-type(1) pre {
background-color: #eee;
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.highlighttable td:nth-of-type(2) pre {
border-left: none;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.page-header .docstring {
margin-bottom: 0;
Expand Down
4 changes: 2 additions & 2 deletions cbv/templates/cbv/klass_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% load pygmentify %}
{% load pygmy %}
{% load cbv_tags %}
{% load url from future %}
{% load i18n %}
Expand Down Expand Up @@ -150,7 +150,7 @@ <h4 class="accordion-toggle">{{ namesake.klass }}</h4>
<div class="accordion-inner">
{% endif %}
{% if namesake.docstring %}<pre class="docstring">{{ namesake.docstring }}</pre>{% endif %}
{% pygment %}<pre lang="python" class="code">{{ namesake.code }}</pre>{% endpygment %}
{% pygmy namesake.code linenos='True' linenostart=namesake.line_number lexer='python' %}
{% if namesakes|length != 1 %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion inspector/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ def get_cache():
INSTALLED_APPS = (
'cbv',

'django_pygments',
'django_extensions',
'gunicorn',
'django_pygmy',
'raven.contrib.django',
'south',

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ boto==2.9.4
django==1.5.1
dj-database-url==0.2.1
django-extensions==1.1.1
git+git://github.com/refreshoxford/django-pygments@master#egg=django_pygments
django-pygmy==0.1.2
django-pylibmc-sasl==0.2.4
django-storages==1.1.8
gunicorn==0.17.4
Expand Down