mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into task/4379/price_without_vat

Browse source
This commit is contained in:
PCoder 2018-04-09 21:20:24 +02:00
commit b9d44b510f
13 changed files with 65 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datacenterlight/migrations/0018_auto_20180403_1930.py
View file

@ -8,8 +8,6 @@ import django.db.models.deletion
class Migration(migrations.Migration):
replaces = [('datacenterlight', '0018_auto_20180403_1930'), ('datacenterlight', '0019_auto_20180403_2054')]
dependencies = [
('datacenterlight', '0017_auto_20180329_0056'),
('sites', '0002_alter_domain_unique'),

5
datacenterlight/static/datacenterlight/css/common.css
View file

@ -74,6 +74,10 @@ a.list-group-item-danger.active:focus {
padding: 10px;
}
.navbar-brand > img {
height: 100%;
}
#logoWhite,
.navbar-transparent #logoBlack {
display: none;
@ -82,7 +86,6 @@ a.list-group-item-danger.active:focus {
#logoBlack,
.navbar-transparent #logoWhite {
display: block;
width: 220px;
}
@media (min-width: 768px) {

4
datacenterlight/static/datacenterlight/css/landing-page.css
View file

@ -89,10 +89,6 @@ textarea {
border-radius: 6px;
}
.navbar-brand > img {
max-height: 30px;
}
@media (max-width: 767px) {
.navbar-default .navbar-nav>li>a{
font-weight: 400;

6
datacenterlight/templates/datacenterlight/includes/_footer.html
View file

@ -4,15 +4,15 @@
<div class="container">
<ul class="list-inline">
<li>
<a class="url-init" href="{% url 'datacenterlight:index' %}">{% trans "Home" %}</a>
<a class="url-init" href="https://{{MULTISITE_CMS_FALLBACK}}">{% trans "Home" %}</a>
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a class="url-init" href="{% url 'datacenterlight:index' %}#contact">{% trans "Contact" %}</a>
<a class="url-init" href="https://{{MULTISITE_CMS_FALLBACK}}#contact">{% trans "Contact" %}</a>
</li>
<li class="footer-menu-divider">&sdot;</li>
<li>
<a class="url-init" href="/cms/terms-of-service">{% trans "Terms of Service" %}</a>
<a class="url-init" href="https://{{MULTISITE_CMS_FALLBACK}}/cms/terms-of-service">{% trans "Terms of Service" %}</a>
</li>
</ul>

2
datacenterlight/urls.py
View file

@ -13,7 +13,7 @@ urlpatterns = [
url(r'^g/$', IndexView.as_view(), name='index_g'),
url(r'^f/$', IndexView.as_view(), name='index_f'),
url(r'^l/$', IndexView.as_view(), name='index_l'),
url(r'^new/$', RedirectView.as_view(url='/cms/datacenterlight/'),
url(r'^new/$', RedirectView.as_view(url='/cms/'),
name='cms_index'),
url(r'^whydatacenterlight/?$', WhyDataCenterLightView.as_view(),
name='whydatacenterlight'),