Merge branch 'master' into edge

This commit is contained in:
Anand Doshi 2013-03-13 16:04:05 +05:30
commit c3dd136ef5

View File

@ -53,11 +53,13 @@ div.outer {
border-radius: 5px; border-radius: 5px;
} }
{% else %} {% else %}
{% if doc.background_color == doc.page_background %}
div.web-footer { div.web-footer {
border-top: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }}; border-top: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }};
padding-top: 10px; padding-top: 10px;
} }
{% endif %} {% endif %}
{% endif %}
/* Bootstrap Navbar */ /* Bootstrap Navbar */
.navbar-inverse .navbar-inner { .navbar-inverse .navbar-inner {
@ -67,6 +69,14 @@ div.web-footer {
background-image: none; background-image: none;
} }
.navbar-inner {
box-shadow: none;
}
{% if doc.top_bar_background == doc.page_background %}.navbar-inner {
border-bottom: 1px solid #{{ get_hex_shade(doc.page_background or "ffffff", 15) }};
}{% endif %}
.navbar-inverse .brand, .navbar-inverse .brand,
.navbar-inverse .brand:hover, .navbar-inverse .brand:hover,
.navbar-inverse .brand:focus, .navbar-inverse .brand:focus,
@ -172,9 +182,22 @@ div.web-footer {
} }
.breadcrumb { .breadcrumb {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }}; background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 10) }};
} }
.breadcrumb > li {
text-shadow: none;
}
.breadcrumb > li > .divider {
color: #{{ doc.page_text }};
}
.breadcrumb > .active {
color: #{{ doc.page_text }};
}
.table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > td,
.table-striped tbody > tr:nth-child(odd) > th { .table-striped tbody > tr:nth-child(odd) > th {
background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }}; background-color: #{{ get_hex_shade(doc.page_background or "ffffff", 5) }};