Commit 5ad16b1e authored by Davide Silvestri's avatar Davide Silvestri

fixed examples/layout for bootstrap v3

parent 129e9a28
...@@ -5,16 +5,14 @@ body { ...@@ -5,16 +5,14 @@ body {
#content { #content {
background: white; background: white;
border: 1px solid #CCC; border: 1px solid #CCC;
padding: 12px; padding: 5px 20px 30px 35px;
overflow: scroll;
} }
#brand { html, body, .container, .row, .col-md-2, .col-md-10, #content {
float: left; height: 100%;
font-weight: 300;
margin: 0;
} }
.search-form { .search-form {
margin: 0 5px; margin: 0 5px;
} }
...@@ -30,7 +28,8 @@ body { ...@@ -30,7 +28,8 @@ body {
.btn-menu a, .btn-menu input { .btn-menu a, .btn-menu input {
padding: 7px 16px !important; padding: 7px 16px !important;
border-radius: 0 !important; border-radius: 1px !important;
border-color: #ccc;
} }
.btn, textarea, input[type], button, .model-list { .btn, textarea, input[type], button, .model-list {
...@@ -47,4 +46,8 @@ body { ...@@ -47,4 +46,8 @@ body {
.select2-container .select2-choice { .select2-container .select2-choice {
border-radius: 0; border-radius: 0;
}
a.dropdown-toggle b.caret {
margin-left: 5px;
} }
\ No newline at end of file
{% extends 'admin/master.html' %} {% extends 'admin/master.html' %}
{% block body %} {% block body %}
{{ super() }} {{ super() }}
<div class="row-fluid"> <div class="row">
<h1>Flask-Admin example</h1> <h1>Flask-Admin example</h1>
<p class="lead"> <p class="lead">
Customize the layout Customize the layout
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
</p> </p>
<a class="btn btn-primary" href="/"><i class="icon-arrow-left icon-white"></i> Back</a> <a class="btn btn-primary" href="/"><i class="icon-arrow-left icon-white"></i> Back</a>
</div> </div>
{% endblock body %} {% endblock body %}
\ No newline at end of file
...@@ -9,22 +9,21 @@ ...@@ -9,22 +9,21 @@
{% block page_body %} {% block page_body %}
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class="span2"> <div class="col-md-2" role="navigation">
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
{{ layout.menu() }} {{ layout.menu() }}
{{ layout.menu_links() }} {{ layout.menu_links() }}
</ul> </ul>
</div> </div>
<div class="span10"> <div class="col-md-10">
<div id="content"> <div id="content" class="row">
{% block brand %} {% block brand %}
<h2 id="brand">{{ admin_view.name|capitalize }}</h2> <h2 id="brand">{{ admin_view.name|capitalize }}</h2>
<div class="clearfix"></div> {% endblock %}
{% endblock %} {{ layout.messages() }}
{{ layout.messages() }} {% block body %}{% endblock %}
{% block body %}{% endblock %}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment