Commit fac68a77 authored by Paul Brown's avatar Paul Brown

bs3 - remove unnecessary css, prevent styling all horizontal forms, overlap...

bs3 - remove unnecessary css, prevent styling all horizontal forms, overlap table and actions border
parent 8237af19
...@@ -17,6 +17,7 @@ form.icon button { ...@@ -17,6 +17,7 @@ form.icon button {
line-height: normal; line-height: normal;
} }
/* fix delete icon color */
a.icon, button span.glyphicon { a.icon, button span.glyphicon {
text-decoration: none; text-decoration: none;
margin-left: 10px; margin-left: 10px;
...@@ -56,10 +57,6 @@ table.filters tr td { ...@@ -56,10 +57,6 @@ table.filters tr td {
padding-bottom: 3px; padding-bottom: 3px;
} }
table.flters tr td:nth-child(2){
width: 60%;
}
.filters a.remove-filter { .filters a.remove-filter {
margin-bottom: 0; margin-bottom: 0;
display: block; display: block;
...@@ -123,7 +120,7 @@ table.flters tr td:nth-child(2){ ...@@ -123,7 +120,7 @@ table.flters tr td:nth-child(2){
} }
/* Forms */ /* Forms */
.form-horizontal { .admin-form {
margin-top: 35px; margin-top: 35px;
} }
...@@ -178,3 +175,10 @@ ul.has-error { ...@@ -178,3 +175,10 @@ ul.has-error {
.list-checkbox-column { .list-checkbox-column {
width: 14px; width: 14px;
} }
/* fix overlapping border between actions and table */
.model-list {
position: relative;
margin-top: -1px;
z-index: 999;
}
\ No newline at end of file
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{% block body %} {% block body %}
{% block model_menu_bar %} {% block model_menu_bar %}
<ul class="nav nav-tabs"> <ul class="nav nav-tabs actions-nav">
<li class="active"> <li class="active">
<a href="javascript:void(0)">{{ _gettext('List') }} ({{ count }})</a> <a href="javascript:void(0)">{{ _gettext('List') }} ({{ count }})</a>
</li> </li>
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
{% endmacro %} {% endmacro %}
{% macro form_tag(form=None, action=None) %} {% macro form_tag(form=None, action=None) %}
<form action="{{ action or '' }}" method="POST" role="form" class="form-horizontal" enctype="multipart/form-data"> <form action="{{ action or '' }}" method="POST" role="form" class="admin-form form-horizontal" enctype="multipart/form-data">
{{ caller() }} {{ caller() }}
</form> </form>
{% endmacro %} {% endmacro %}
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
{% block body %} {% block body %}
{% block model_menu_bar %} {% block model_menu_bar %}
<ul class="nav nav-tabs"> <ul class="nav nav-tabs actions-nav">
<li class="active"> <li class="active">
<a href="javascript:void(0)">{{ _gettext('List') }} ({{ count }})</a> <a href="javascript:void(0)">{{ _gettext('List') }} ({{ count }})</a>
</li> </li>
......
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