Another change to button style. Renamed header_submit, header_submit_highlight and button classes, correct all references to these

This commit is contained in:
Jef van Schendel 2011-11-20 01:43:48 +01:00
parent 5bd523eb23
commit 13423daae2
15 changed files with 40 additions and 39 deletions

View File

@ -98,24 +98,6 @@ a.mediagoblin_logo{
font-weight: bold; font-weight: bold;
} }
.header_submit, .header_submit_highlight{
color: #c3c3c3;
background-color: #2d2d2d;
border: 1px solid;
border-color: #323232 #232323 #1F1F1F;
border-radius: 4px;
margin: 8px;
padding: 3px 8px;
text-decoration: none;
font-style: normal;
font-weight: bold;
font-size: 1em;
}
.header_submit_highlight{
background-image: -moz-linear-gradient(center top , rgb(134, 212, 177), rgb(109, 173, 144));
}
.mediagoblin_footer { .mediagoblin_footer {
height: 30px; height: 30px;
border-top: 1px solid #333; border-top: 1px solid #333;
@ -135,7 +117,26 @@ background-image: -moz-linear-gradient(center top , rgb(134, 212, 177), rgb(109,
/* common website elements */ /* common website elements */
.button, .cancel_link { .button_action, .button_action_highlight{
color: #c3c3c3;
background-color: #363636;
border: 1px solid;
border-color: #464646 #2B2B2B #252525;
border-radius: 4px;
margin: 8px;
padding: 3px 8px;
text-decoration: none;
font-style: normal;
font-weight: bold;
font-size: 1em;
}
.button_action_highlight{
background-image: -moz-linear-gradient(center top , rgb(134, 212, 177), rgb(109, 173, 144));
}
.button_form, .cancel_link {
height: 32px; height: 32px;
min-width: 99px; min-width: 99px;
background-color: #86d4b1; background-color: #86d4b1;

View File

@ -30,7 +30,7 @@
{{ wtforms_util.render_divs(cp_form) }} {{ wtforms_util.render_divs(cp_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="submit" class="button"/> <input type="submit" value="submit" class="button_form"/>
</div> </div>
</div> </div>

View File

@ -27,7 +27,7 @@
<h1>{% trans %}Recover password{% endtrans %}</h1> <h1>{% trans %}Recover password{% endtrans %}</h1>
{{ wtforms_util.render_divs(fp_form) }} {{ wtforms_util.render_divs(fp_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button"/> <input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button_form"/>
</div> </div>
</div> </div>
</form> </form>

View File

@ -42,10 +42,10 @@
{% trans %}Forgot your password?{% endtrans %}</a> {% trans %}Forgot your password?{% endtrans %}</a>
</p> </p>
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/> <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button_form"/>
</div> </div>
{% if next %} {% if next %}
<input type="hidden" name="next" value="{{ next }}" class="button" <input type="hidden" name="next" value="{{ next }}" class="button_form"
style="display: none;"/> style="display: none;"/>
{% endif %} {% endif %}
</div> </div>

View File

@ -29,7 +29,7 @@
{{ csrf_token }} {{ csrf_token }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="{% trans %}Create{% endtrans %}" <input type="submit" value="{% trans %}Create{% endtrans %}"
class="button" /> class="button_form" />
</div> </div>
</div> </div>
</form> </form>

View File

@ -47,7 +47,7 @@
alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a> alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a>
{% endblock %} {% endblock %}
{% if request.user and request.user['status'] == 'active' %} {% if request.user and request.user['status'] == 'active' %}
<a class="header_submit" <a class="button_action"
href="{{ request.urlgen('mediagoblin.submit.start') }}"> href="{{ request.urlgen('mediagoblin.submit.start') }}">
{% trans %}Submit media{% endtrans %} {% trans %}Submit media{% endtrans %}
</a> </a>
@ -59,8 +59,8 @@
{% if request.user.status == "needs_email_verification" %} {% if request.user.status == "needs_email_verification" %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user=request.user['username']) }}" user=request.user['username']) }}"
class="header_submit"> class="button_action_highlight">
{% trans %}verify your email!{% endtrans %}</a> {% trans %}Verify your email!{% endtrans %}</a>
{% endif %} {% endif %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',

View File

@ -48,7 +48,7 @@
{{ wtforms_util.render_divs(form) }} {{ wtforms_util.render_divs(form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a> <a href="{{ media.url_for_self(request.urlgen) }}">Cancel</a>
<input type="submit" value="Save changes" class="button" /> <input type="submit" value="Save changes" class="button_form" />
{{ csrf_token }} {{ csrf_token }}
</div> </div>
</div> </div>

View File

@ -34,7 +34,7 @@
{{ wtforms_util.render_divs(form) }} {{ wtforms_util.render_divs(form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<a href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a> <a href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
<input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" /> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
{{ csrf_token }} {{ csrf_token }}
</div> </div>
</div> </div>

View File

@ -32,7 +32,7 @@
</h1> </h1>
{{ wtforms_util.render_divs(form) }} {{ wtforms_util.render_divs(form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button" /> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
{{ csrf_token }} {{ csrf_token }}
</div> </div>
</div> </div>

View File

@ -30,9 +30,9 @@
{% if allow_registration %} {% if allow_registration %}
<p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p> <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
{% trans register_url=request.urlgen('mediagoblin.auth.register') -%} {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
<a class="header_submit_highlight" href="{{ register_url }}">Create an account at this site</a> <a class="button_action_highlight" href="{{ register_url }}">Create an account at this site</a>
or or
<a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a> <a class="button_action" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
{%- endtrans %} {%- endtrans %}
{% endif %} {% endif %}
</div> </div>

View File

@ -27,7 +27,7 @@
{{ wtforms_util.render_divs(submit_form) }} {{ wtforms_util.render_divs(submit_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
{{ csrf_token }} {{ csrf_token }}
<input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" /> <input type="submit" value="{% trans %}Submit{% endtrans %}" class="button_form" />
</div> </div>
</div> </div>
</form> </form>

View File

@ -25,7 +25,7 @@
{{ wtforms_util.render_table(image_form) }} {{ wtforms_util.render_table(image_form) }}
<tr> <tr>
<td></td> <td></td>
<td><input type="submit" value="submit" class="button" /></td> <td><input type="submit" value="submit" class="button_form" /></td>
{{ csrf_token }} {{ csrf_token }}
</tr> </tr>
</table> </table>

View File

@ -98,7 +98,7 @@
media=media._id) }}" method="POST"> media=media._id) }}" method="POST">
{{ wtforms_util.render_divs(comment_form) }} {{ wtforms_util.render_divs(comment_form) }}
<div class="form_submit_buttons"> <div class="form_submit_buttons">
<input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" /> <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button_form" />
{{ csrf_token }} {{ csrf_token }}
</div> </div>
</form> </form>

View File

@ -47,7 +47,7 @@
<div class="form_submit_buttons"> <div class="form_submit_buttons">
{# TODO: This isn't a button really... might do unexpected things :) #} {# TODO: This isn't a button really... might do unexpected things :) #}
<a class="cancel_link" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a> <a class="cancel_link" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
<input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button" /> <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button_form" />
{{ csrf_token }} {{ csrf_token }}
</div> </div>
</div> </div>

View File

@ -62,7 +62,7 @@
<p>{% trans %}In case it doesn't:{% endtrans %}</p> <p>{% trans %}In case it doesn't:{% endtrans %}</p>
<a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}" <a href="{{ request.urlgen('mediagoblin.auth.resend_verification') }}"
class="button">{% trans %}Resend verification email{% endtrans %}</a> class="button_form">{% trans %}Resend verification email{% endtrans %}</a>
</div> </div>
{% else %} {% else %}
{# if the user is not you, but still needs to verify their email #} {# if the user is not you, but still needs to verify their email #}
@ -97,7 +97,7 @@
</p> </p>
<a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
user.username }}" user.username }}"
class="header_submit"> class="button_action">
{%- trans %}Edit profile{% endtrans -%} {%- trans %}Edit profile{% endtrans -%}
</a> </a>
</div> </div>
@ -147,7 +147,7 @@
This is where your media will appear, but you don't seem to have added anything yet. This is where your media will appear, but you don't seem to have added anything yet.
{%- endtrans %} {%- endtrans %}
</p> </p>
<a class="header_submit" <a class="button_action"
href="{{ request.urlgen('mediagoblin.submit.start') }}"> href="{{ request.urlgen('mediagoblin.submit.start') }}">
{%- trans %}Add media{% endtrans -%} {%- trans %}Add media{% endtrans -%}
</a> </a>