Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #16448 from edx/douglashall/ENT-749

Browse Source 
Fixed enterprise tagline styling.
This commit is contained in:
Douglas Hall
2017-11-03 14:41:23 -04:00
committed by GitHub
parent e63cf7ff98 174302c191
commit 6cd33d6848
4 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/static/sass/views/_login-register.scss
View File

@@ -37,14 +37,13 @@
font-size: 14px;
text-align: left;
display: inline-block;
vertical-align: middle;
line-height: normal;
margin-left: -30px;
padding: 15px 0 0 10px;
}
@media (max-width: $bp-screen-sm) {
@include media-breakpoint-down(md) {
.enterprise-tagline {
width: 200px
display: none;
}
}

16
lms/templates/header/brand.html
View File

@@ -19,14 +19,6 @@ from branding import api as branding_api
<img class="logo-image" src="${static.url("images/logo.png")}" alt="${_("{platform_name} Home Page").format(platform_name=static.get_platform_name())}" itemprop="logo" />
</a>
</div>
% if enable_enterprise_sidebar:
<span class="enterprise-tagline">
<% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %>
% if tagline:
${tagline}
% endif
</span>
% endif
% if course and not disable_courseware_header:
<div class="course-header">
<span class="provider">${course.display_org_with_default}:</span>
@@ -35,3 +27,11 @@ from branding import api as branding_api
</div>
% endif
</h1>
% if enable_enterprise_sidebar:
<div class="enterprise-tagline">
<% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %>
% if tagline:
${tagline}
% endif
</div>
% endif

16
lms/templates/header/navbar-logo-header.html
View File

@@ -19,14 +19,6 @@ from branding import api as branding_api
<img class="logo" src="${branding_api.get_logo_url(is_secure)}" alt="${_("{platform_name} Home Page").format(platform_name=static.get_platform_name())}"/>
</%block>
</a>
% if enable_enterprise_sidebar:
<span class="enterprise-tagline">
<% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %>
% if tagline:
${tagline}
% endif
</span>
% endif
% if course:
<div class="course-header">
<span class="provider">${course.display_org_with_default}:</span>
@@ -42,3 +34,11 @@ from branding import api as branding_api
</div>
% endif
</h1>
% if enable_enterprise_sidebar:
<div class="enterprise-tagline">
<% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %>
% if tagline:
${tagline}
% endif
</div>
% endif

16
lms/templates/navigation/navbar-logo-header.html
View File

@@ -21,14 +21,6 @@ from branding import api as branding_api
</%block>
</a>
</div>
% if enable_enterprise_sidebar:
<span class="enterprise-tagline">
<% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %>
% if tagline:
${tagline}
% endif
</span>
% endif
% if course:
<div class="course-header">
<span class="provider">${course.display_org_with_default}:</span>
@@ -44,3 +36,11 @@ from branding import api as branding_api
</div>
% endif
</h1>
% if enable_enterprise_sidebar:
<div class="enterprise-tagline">
<% tagline = configuration_helpers.get_value('ENTERPRISE_TAGLINE', settings.ENTERPRISE_TAGLINE) %>
% if tagline:
${tagline}
% endif
</div>
% endif