Full-width.

This commit is contained in:
Julien Palard 2018-05-13 00:22:02 +02:00
parent 96ecfc4bf1
commit 3c94782adf
5 changed files with 36 additions and 37 deletions

View File

@ -1,10 +1,6 @@
body {
padding-top: 60px;
}
pre { pre {
font-family: "Bitstream Vera Sans Mono", "monospace"; font-family: "Bitstream Vera Sans Mono", "monospace";
color: #000; zcolor: #000;
font-size: 14px; font-size: 14px;
} }
@ -31,7 +27,7 @@ list-style-type: none;
} }
textarea#id_content { textarea#id_content {
width: 1155px; width: 100%;
height: 320px; height: 320px;
} }
@ -47,7 +43,7 @@ width: 505px;
} }
.container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container { .container, .navbar-static-top .container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
width: 1170px; width: 100%;
} }
.input-prepend .add-on { .input-prepend .add-on {
@ -68,25 +64,31 @@ padding: 5px;
[class*="span"] { [class*="span"] {
float: left; float: left;
min-height: 1px; min-height: 1px;
margin-left: 25px; padding-left: 25px;
margin-left: 0px;
box-sizing: border-box;
} }
.span3 { .span3 {
width: 270px; width: 25%;
} }
.span6 { .span6 {
width: 570px; width: 50%;
} }
.span12 { .span12 {
width: 1165px; width: 100%;
} }
.navbar a { .navbar a {
color: #777; color: #777;
} }
.navbar {
margin-bottom: 0px
}
#unlock, #expired { #unlock, #expired {
margin-top: 30px; margin-top: 30px;
} }

View File

@ -13,7 +13,7 @@
{% endcompress %} {% endcompress %}
</head> </head>
<body> <body>
<div class="navbar navbar-fixed-top"> <nav class="navbar navbar-default">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container-fluid"> <div class="container-fluid">
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@ -27,13 +27,15 @@
{% trans 'powered by' %} <a href="https://github.com/setsuna-/pasteque"><b>{{ APP_NAME }}</b></a> {% trans 'powered by' %} <a href="https://github.com/setsuna-/pasteque"><b>{{ APP_NAME }}</b></a>
</p> </p>
<ul class="nav"> <ul class="nav">
{% block nav %}
<li class="{% if menu == 'index'%}active{% endif %}"><a href="{% url 'index' %}">{% trans 'Paste something' %}</a></li> <li class="{% if menu == 'index'%}active{% endif %}"><a href="{% url 'index' %}">{% trans 'Paste something' %}</a></li>
<li class="{% if menu == 'history'%}active{% endif %}"><a href="{% url 'history' %}">{% trans 'Lasts pastes' %}</a></li> <li class="{% if menu == 'history'%}active{% endif %}"><a href="{% url 'history' %}">{% trans 'Lasts pastes' %}</a></li>
{% endblock %}
</ul> </ul>
</div><!--/.nav-collapse --> </div><!--/.nav-collapse -->
</div> </div>
</div> </div>
</div> </nav>
<div class="container"> <div class="container">
{% block content %}{% endblock %} {% block content %}{% endblock %}
</div> </div>

View File

@ -6,9 +6,19 @@
{% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %} {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %}
<form method="post" action="{% url 'index' %}"> <form method="post" action="{% url 'index' %}">
{{ form.non_field_errors }} {{ form.non_field_errors }}
<div class="row">
<div class="span12">
{% if PASTE.show_char_left %}
<span id="charsleft"><b id="charsleft_counter">...</b>&nbsp;{% trans 'characters left' %}</span>
{% endif %}
<label for="id_content">{% trans 'Content' %}</label>
{{ form.content }}
{{ form.content.errors }}
</div>
</div>
<div class="row"> <div class="row">
{% if PASTE.has_title %} {% if PASTE.has_title %}
<div class="span6"> <div class="span3">
<label for="id_title">{% trans 'Title' %}</label> <label for="id_title">{% trans 'Title' %}</label>
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on"><i class="icon-tag"></i></span> <span class="add-on"><i class="icon-tag"></i></span>
@ -30,18 +40,6 @@
{{ form.private }} {{ form.private }}
{{ form.private.errors }} {{ form.private.errors }}
</div> </div>
</div>
<div class="row">
<div class="span12">
{% if PASTE.show_char_left %}
<span id="charsleft"><b id="charsleft_counter">...</b>&nbsp;{% trans 'characters left' %}</span>
{% endif %}
<label for="id_content">{% trans 'Content' %}</label>
{{ form.content }}
{{ form.content.errors }}
</div>
</div>
<div class="row">
<div class="span3"> <div class="span3">
<label for="id_lifetime">{% trans 'Expire time' %}</label> <label for="id_lifetime">{% trans 'Expire time' %}</label>
<div class="input-prepend"> <div class="input-prepend">
@ -60,7 +58,7 @@
{{ form.lifecount.errors }} {{ form.lifecount.errors }}
</div> </div>
{% endif %} {% endif %}
<div class="span6"> <div class="span3">
<label for="id_password">{% trans 'Password protected' %}</label> <label for="id_password">{% trans 'Password protected' %}</label>
<div class="input-prepend"> <div class="input-prepend">
<span class="add-on"><i class="icon-lock"></i></span> <span class="add-on"><i class="icon-lock"></i></span>

View File

@ -33,12 +33,6 @@
{% endif %} {% endif %}
</div> </div>
<div class="span3"> <div class="span3">
<ul class="nav nav-pills pull-right"> <a href="{% url 'paste' slug=slug renderer='raw' %}">View raw</a>
{% for renderer in renderers %}
<li class="{% if renderer == current_renderer %}active{% endif %}">
<a href="{% url 'paste' slug=slug renderer=renderer %}">{{ renderer|capfirst }}</a>
</li>
{% endfor %}
</ul>
</div> </div>
</div> </div>

View File

@ -1,7 +1,10 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %} {{ title }}{% endblock %} {% block title %} {{ title }}{% endblock %}
{% block content %} {% block nav %}
{% include "paste/paste-meta.html" %} <li><a href="{% url 'paste' slug=slug renderer='raw' %}">View raw</a></li>
{{ highlighted|safe }} {% endblock %}
{% block content %}
{{ highlighted|safe }}
{% include "paste/paste-meta.html" %}
{% endblock %} {% endblock %}