Merge branch 'master' of github.com:divio/djangocms-admin-style into …

…feature/translations [ci skip] Conflicts: CHANGELOG.rst
django-cms · Jun 22, 2016 · a11f4a3 · a11f4a3
2 parents d884436 + 183a270
commit a11f4a3
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,10 +4,12 @@ CHANGELOG
 Unreleased
 ----------
 
+* Added css regression tests framework
 * Fixed an issue with datetime fields being displayed incorrectly (#347)
 * Fixed a bug with related-widget add/change buttons inside changelist (#348)
-* Fixed an issue with login screen on django 1.9
-* Added css regression tests framework
+* Fixed an issue with login screen on Django 1.9
+* Fixed an issue with calendar display in Django 1.9
+* Fixed inline grouped field with
 * Synced translations with Transifex
 
 1.2.2 (2016-05-25)

diff --git a/djangocms_admin_style/sass/components/_content.scss b/djangocms_admin_style/sass/components/_content.scss
@@ -630,10 +630,12 @@ a.addlink {
 }
 
 // cms language buttons
-#page_form_lang_tabs,
-.parler-language-tabs {
-    margin-bottom: 30px;
-    border-bottom: solid 1px $gray-lighter;
+.djangocms-admin-style {
+    #page_form_lang_tabs,
+    .parler-language-tabs {
+        margin-bottom: 30px;
+        border-bottom: solid 1px $gray-lighter;
+    }
 }
 #page_form_lang_tabs input,
 .parler-language-tabs span {

diff --git a/djangocms_admin_style/sass/components/_forms.scss b/djangocms_admin_style/sass/components/_forms.scss
@@ -255,10 +255,14 @@ form {
         &.collapse h2 {
             color: $gray-darkest;
             font-size: $font-size-large;
-            background-image: none;
+            background: none;
         }
         &.collapsed {
             margin-bottom: 30px !important;
+            border: 0;
+            .collapse-toggle {
+                color: $color-primary;
+            }
         }
     }
     label select {
@@ -440,9 +444,10 @@ form {
 .form-row .select2-container {
     min-width: 250px + 12px;
 } // standard input width + default input padding
+
 .inline-group .form-row input,
 .inline-group .form-row textarea {
-    width: auto;
+    width: auto !important;
 }
 
 // select2
@@ -618,6 +623,7 @@ div.calendar {
     }
     .today a {
         color: $gray-darker;
+        font-weight: normal;
         background-color: $gray-lighter;
     }
 }
@@ -658,6 +664,8 @@ div.calendarbox {
     }
     .calendarnav-previous,
     .calendarnav-next {
+        top: 0;
+        text-indent: initial;
         color: $color-primary;
         font-size: 0;
         text-decoration: none;

diff --git a/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css b/djangocms_admin_style/static/djangocms_admin_style/css/djangocms-admin.css