Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes top level navigation bug that showed "Teach" twice, also style fixes and css cleanup #3191

Merged
merged 12 commits into from
Mar 10, 2015

Conversation

jtamiace
Copy link
Member

@jtamiace jtamiace commented Mar 7, 2015

Pushing these changes now so that it's easier to work with making the second level navigation under teach and manage responsive.

Reference this issue:
#3168 (comment)

@@ -3,7 +3,7 @@
{% load staticfiles %}
{% load include_block %}

{% block facility_active %}facility-active active-tab active-nav{% endblock facility_active %}
{% block facility_active %}active{% endblock facility_active %}

This comment was marked as spam.

@MCGallaspy
Copy link
Contributor

Just noticed some places where we should put {% block i18n_do_not_translate %} tags, so that the css classes aren't inadvertently translated.

@aronasorman aronasorman added this to the 0.13.x milestone Mar 9, 2015
@@ -3,7 +3,9 @@
{% load staticfiles %}
{% load include_block %}

{% block facility_active %}facility-active active-tab active-nav{% endblock facility_active %}
{% block i18n_do_not_translate %}
{% block facility_active %}active{% endblock facility_active %}

This comment was marked as spam.

This comment was marked as spam.

@MCGallaspy
Copy link
Contributor

Groovy.

MCGallaspy added a commit that referenced this pull request Mar 10, 2015
Fixes top level navigation bug that showed "Teach" twice, also style fixes and css cleanup
@MCGallaspy MCGallaspy merged commit e789b09 into learningequality:develop Mar 10, 2015
@MCGallaspy MCGallaspy removed the has PR label Mar 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants