Merge branch 'release-1.5.2'

otto-torino · May 15, 2019 · 3ed4882 · 3ed4882
2 parents 095ca38 + eb6fb47
commit 3ed4882
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 9 deletions.
diff --git a/baton/static/admin/css/responsive.css b/baton/static/admin/css/responsive.css
@@ -0,0 +1 @@
+/* empty */
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.5.1",
+  "version": "1.5.2",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/styles/_changeform.scss b/baton/static/baton/app/src/styles/_changeform.scss
@@ -57,3 +57,16 @@
     font-weight: bold;
   }
 }
+
+// tabs
+.nav-tabs {
+  .nav-link {
+    background: #fafafa;
+    border: 1px solid #dee2e6;
+    font-weight: bold;
+  }
+}
+
+.tab-content {
+  padding-top: 1rem;
+}
diff --git a/baton/static/baton/app/src/styles/_changelist.scss b/baton/static/baton/app/src/styles/_changelist.scss
@@ -62,6 +62,14 @@
     }
   }
 
+  .action-counter {
+    display: block;
+
+    @include media-breakpoint-up(sm) {
+      display: inline;
+    }
+  }
+
   .changelist-filter-toggler {
     align-items: center;
     color: $filter-toggler-color !important;

diff --git a/baton/static/baton/app/src/styles/_dashboard.scss b/baton/static/baton/app/src/styles/_dashboard.scss
@@ -101,6 +101,7 @@
   }
 
   .addlink,
+  .viewlink,
   .changelink {
     &::before {
       @extend %font-awesome;
@@ -122,4 +123,10 @@
     }
   }
 
+  .viewlink {
+    &::before {
+      content: '\f26c';
+    }
+  }
+
 }
diff --git a/baton/static/baton/app/src/styles/_navbar.scss b/baton/static/baton/app/src/styles/_navbar.scss
@@ -27,6 +27,7 @@
 
     &:hover {
       color: $navbar-link-color-hover;
+      text-decoration: none;
     }
 
     &.dropdown-item {

diff --git a/baton/static/baton/app/src/styles/_placeholders.scss b/baton/static/baton/app/src/styles/_placeholders.scss
@@ -93,8 +93,7 @@
       flex-direction: row;
       flex-grow: 1;
 
-      + p,
-      + .help /* django 1.11 */ {
+      + p /* django 1.11 */ {
         flex-basis: 100%;
         margin-left: 0 !important;
 
@@ -329,7 +328,21 @@
     @extend .form-text;
     @extend .text-muted;
     @extend .ml-3;
-    font-style: italic;
+    flex-basis: 100% !important;
+    font-size: .9rem;
+    margin-left: 0 !important;
+
+    @include media-breakpoint-up(md) {
+      margin-left: 20% !important;
+    }
+
+    @include media-breakpoint-up(lg) {
+      margin-left: 10% !important;
+    }
+
+    > ul {
+      padding-left: 1.2rem;
+    }
   }
 
   div.help {

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.5.1'
+version = u'1.5.2'
 # The full version, including alpha/beta/rc tags.
-release = u'1.5.1'
+release = u'1.5.2'
 
 # 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.5.1',
+    version='1.5.2',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',