Skip to content

Commit

Permalink
fixes #116
Browse files Browse the repository at this point in the history
  • Loading branch information
abidibo committed Dec 7, 2020
1 parent 31ebedf commit 4846e9c
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ install:
- pip install python-dotenv
- pip install django-filer
- pip install django-tinymce
- pip install docutils
- django-admin.py --version
- pip install selenium
before_script:
Expand Down
2 changes: 1 addition & 1 deletion baton/static/baton/app/dist/baton.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion baton/static/baton/app/dist/baton.min.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions baton/static/baton/app/src/styles/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@ body:not(.menu-mobile) {
content: '\f108';
font-family: 'Font Awesome\ 5 Free';
}

&[href*=doc] {
&::after {
content: '\f02d' !important;
font-family: 'Font Awesome\ 5 Free';
}
}
}

&.password {
Expand Down
1 change: 1 addition & 0 deletions testapp/app/app/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admindocs',
'easy_thumbnails',
'filer',
'tinymce',
Expand Down
6 changes: 4 additions & 2 deletions testapp/app/app/tests/test_e2e_index_mobile.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,14 @@ def test_navbar(self):
# user dropdown menu
user_dropdown_menu = self.driver.find_elements_by_css_selector(
"#user-tools .dropdown-menu a")
self.assertEqual(len(user_dropdown_menu), 3)
self.assertEqual(len(user_dropdown_menu), 4)
self.assertEqual(user_dropdown_menu[0].get_attribute('innerHTML'),
'View site')
self.assertEqual(user_dropdown_menu[1].get_attribute('innerHTML'),
'Change password')
'Documentation')
self.assertEqual(user_dropdown_menu[2].get_attribute('innerHTML'),
'Change password')
self.assertEqual(user_dropdown_menu[3].get_attribute('innerHTML'),
'Log out')

def test_content(self):
Expand Down
1 change: 1 addition & 0 deletions testapp/app/app/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from django.contrib.staticfiles.views import serve

urlpatterns = [
path('admin/doc/', include('django.contrib.admindocs.urls')),
path('admin/', admin.site.urls),
path('baton/', include('baton.urls')),
path('tinymce/', include('tinymce.urls')),
Expand Down
Binary file modified testapp/app/db.sqlite3
Binary file not shown.

0 comments on commit 4846e9c

Please sign in to comment.