Changeset - 774e2c625dd5
[Not reviewed]
6 3 0
Joshua Simmons - 5 years ago 2017-08-10 23:23:24
i@joshuasimmons.name
move inline styles to custom.scss, remove unused pinax templates
9 files changed with 21 insertions and 127 deletions:
0 comments (0 inline, 0 general)
pinaxcon/templates/_account_bar.html
Show inline comments
 
{% load i18n %}
 
{% load account_tags %}
 

	
 

	
 
<ul class="nav navbar-nav pull-right">
 
    {% if request.user.is_authenticated %}
 
        <span class="navbar-text">
 
            <i class="fa fa-user"></i> {% user_display request.user %}
 
        </span>
 
        <li>
 
            <a href="{% url "dashboard" %}"><i class="fa fa-tasks"></i> {% trans "Dashboard" %}</a>
 
        </li>
 
        <li>
 
            <a id="account_logout" href="{% url 'account_logout' %}"><i class="fa fa-power-off"></i> {% trans "Log out" %}</a>
 
        </li>
 
    {% else %}
 
        <li><a href="{% url 'account_login' %}">{% trans "Log in" %}</a></li>
 
        {% if ACCOUNT_OPEN_SIGNUP %}
 
            <li><a href="{% url 'account_signup' %}">{% trans "Sign up" %}</a></li>
 
        {% endif %}
 
    {% endif %}
 
</ul>
 

	
 
<form id="accountLogOutForm" style="display: none;" action="{% url 'account_logout' %}" method="POST">
 
<form id="accountLogOutForm" action="{% url 'account_logout' %}" method="POST">
 
    {% csrf_token %}
 
</form>
pinaxcon/templates/_default_sidebar.html
Show inline comments
 
{% load sponsorship_tags %}
 
{% load thumbnail %}
 
{% load pinax_boxes_tags %}
 

	
 
{% sponsor_levels as levels %}
 

	
 
<h4>Sponsors</h4>
 

	
 
<div class="sponsor-list">
 
    {% for level in levels %}
 
        {% if level.sponsors %}
 
            <h3 style="margin-top: 3em;">{{ level.name }}</h3>
 
            <h3>{{ level.name }}</h3>
 

	
 
            {% for sponsor in level.sponsors %}
 
                <div style="margin: 10px 0;">
 
                <div>
 
                    {% if sponsor.website_logo %}
 
                        <a href="{{ sponsor.external_url }}">
 
                            <img src="{% thumbnail sponsor.website_logo '100x60' %}" alt="{{ sponsor.name }}" />
 
                        </a>
 
                    {% else %}
 
                        <a href="{{ sponsor.external_url }}">{{ sponsor.name }}</a>
 
                    {% endif %}
 
                </div>
 
            {% endfor %}
 
        {% endif %}
 
    {% endfor %}
 
</div>
 

	
 

	
pinaxcon/templates/pinax/boxes/_box.html
Show inline comments
 
deleted file
pinaxcon/templates/pinax/boxes/_box_body.html
Show inline comments
 
deleted file
pinaxcon/templates/pinax/pages/file_create.html
Show inline comments
 
deleted file
pinaxcon/templates/pinax/pages/file_list.html
Show inline comments
 
deleted file
pinaxcon/templates/pinax/pages/page_detail.html
Show inline comments
 
deleted file
pinaxcon/templates/pinax/pages/page_edit.html
Show inline comments
 
deleted file
static/scss/custom.scss
Show inline comments
...
 
@@ -7,48 +7,64 @@ section {
 
}
 
.modal form {
 
  margin-bottom: 0px;
 
}
 
footer {
 
    padding-bottom: 20px;
 
}
 
p.login-signup {
 
    margin-top: 20px;
 
}
 

	
 
.feature-columns {
 
    @include make-row();
 

	
 
    > div {
 
        i.fa {
 
            margin-bottom: 0.2em;
 
        }
 
        @include make-sm-column(4);
 
        /*.text-center;
 
        margin: 2em 0;*/
 
    }
 
}
 

	
 
body.reviews.review-list .review-list,
 
body.reviews.voting-status .voting-status,
 
body.reviews.review-results .review-results {
 
    z-index: 2; // Place active items above their siblings for proper border styling
 
    color: $list-group-active-color;
 
    background-color: $list-group-active-bg;
 
    border-color: $list-group-active-border;
 
}
 

	
 
body.reviews.voting-status {
 
    &.positive a.positive,
 
    &.negative a.negative,
 
    &.indifferent a.indifferent,
 
    &.controversial a.controversial,
 
    &.too_few a.too_few {
 
        z-index: 2;
 
        color: #333;
 
        background-color: #e6e6e6;
 
        border-color: #adadad;
 
        outline: 0;
 
        background-image: none;
 
        box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
 
    }
 
}
 

	
 
#accountLogOutForm {
 
    display: none;
 
}
 

	
 
.sponsor-list h3 {
 
    margin-top: 3em;
 
}
 

	
 
.sponsor-list > div {
 
    margin: 10px 0;
 
}
 

	
 

	
 

	
 

	
0 comments (0 inline, 0 general)