Merge branch 'hotfix-1.3.4'

otto-torino · Mar 1, 2019 · 544065c · 544065c
2 parents 59ff19d + 8a4650c
commit 544065c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/dist/baton.min.js.map b/baton/static/baton/app/dist/baton.min.js.map
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/core/Navbar.js b/baton/static/baton/app/src/core/Navbar.js
@@ -24,7 +24,7 @@ let Navbar = {
       }).remove()
     // dropdown
     let dropdown = $('<div/>', { 'class': 'dropdown' }).appendTo($('#user-tools'))
-    let dropdownMenu = $('<div/>', { 'class': 'dropdown-menu' }).appendTo(dropdown)
+    let dropdownMenu = $('<div/>', { 'class': 'dropdown-menu dropdown-menu-right' }).appendTo(dropdown)
     $('#user-tools strong')
       .addClass('dropdown-toggle btn btn-default')
       .attr('data-toggle', 'dropdown')

diff --git a/baton/static/baton/app/src/styles/_content.scss b/baton/static/baton/app/src/styles/_content.scss
@@ -1,8 +1,9 @@
 // scss-lint:disable IdSelector PlaceholderInExtend NestingDepth
 #content {
   background: $content-bg;
-  padding-left: 0;
-  padding-right: 0;
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+  padding-top: 0 !important;
 
   > h1 {
     @extend .mb-0;

diff --git a/baton/static/baton/app/src/styles/_navbar.scss b/baton/static/baton/app/src/styles/_navbar.scss
@@ -8,6 +8,7 @@
   align-items: center;
   background: $navbar-bg;
   color: $navbar-color;
+  flex-direction: row !important;
 
   strong {
     color: $navbar-color;
@@ -42,8 +43,6 @@
     }
 
     .dropdown-menu {
-      left: 0;
-
       @include media-breakpoint-up(md) {
         left: auto;
         right: 0;

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.3.3'
+version = u'1.3.4'
 # The full version, including alpha/beta/rc tags.
-release = u'1.3.3'
+release = u'1.3.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name='django-baton',
-    version='1.3.3',
+    version='1.3.4',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',