diff --git a/HISTORY.rst b/HISTORY.rst index 337608e5b1..be4f639ccf 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,7 @@ - Update Celery broker environment variable in the docker installer. - Add preparestatic command to documentation. GitLab issue #692. Thanks to Christopher S. Meiklejohn (@cmeiklejohn2) for the report. +- Fix username color on mobile screens. 3.3 (2019-12-03) ================ diff --git a/mayan/apps/appearance/static/appearance/css/base.css b/mayan/apps/appearance/static/appearance/css/base.css index efc80af7d1..1022e92a32 100644 --- a/mayan/apps/appearance/static/appearance/css/base.css +++ b/mayan/apps/appearance/static/appearance/css/base.css @@ -472,12 +472,20 @@ a i { margin: 0 10px 0 -15px; } +.menu-user-name { + color: white; +} + @media (min-width: 768px) { #menu-main { display: block; left: 0; } + .menu-user-name { + color: inherit; + } + #menu-main-button-close { display: none; } diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index 3099fcb8f6..9f7bcad288 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -866,6 +866,7 @@ class Text(Link): Menu text. Renders to a plain
  • tag """ def __init__(self, *args, **kwargs): + self.html_extra_classes = kwargs.get('html_extra_classes') self.icon = None self.text = kwargs.get('text') self.view = None diff --git a/mayan/apps/navigation/templates/navigation/generic_link_instance.html b/mayan/apps/navigation/templates/navigation/generic_link_instance.html index 3edb92be59..a4ef2cd048 100644 --- a/mayan/apps/navigation/templates/navigation/generic_link_instance.html +++ b/mayan/apps/navigation/templates/navigation/generic_link_instance.html @@ -1,7 +1,7 @@ {% if link.separator %}
  • {% elif link.text_span %} - + {% else %} {% if link.disabled %} {% if link.icon_class %}{{ link.icon_class.render }}{% endif %} {{ link.text }}{% if link.error %} - {{ link.error }}{% endif %}{% if horizontal %}{% if not forloop.last %} {% endif %}{% endif %} diff --git a/mayan/apps/user_management/links.py b/mayan/apps/user_management/links.py index 9f6153d4bc..db62ff0b02 100644 --- a/mayan/apps/user_management/links.py +++ b/mayan/apps/user_management/links.py @@ -97,4 +97,6 @@ link_user_setup = Link( view='user_management:user_list' ) separator_user_label = Separator() -text_user_label = Text(text=get_user_label_text) +text_user_label = Text( + html_extra_classes='menu-user-name', text=get_user_label_text +)