Merge pull request #352 from divio/bugfix/fixes-for-1-9

lory87 · web-flow · commit 183a270cccca · 2016-06-22T11:09:47.000+02:00
fixes for django 1-9
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 {
@@ -619,6 +623,7 @@ div.calendar {
     }
     .today a {
         color: $gray-darker;
+        font-weight: normal;
         background-color: $gray-lighter;
     }
 }
@@ -659,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

Original file line number	Diff line number	Diff line change
`@@ -255,10 +255,14 @@ form {`
`255`	`255`	`&.collapse h2 {`
`256`	`256`	`color: $gray-darkest;`
`257`	`257`	`font-size: $font-size-large;`
`258`		`- background-image: none;`
	`258`	`+ background: none;`
`259`	`259`	`}`
`260`	`260`	`&.collapsed {`
`261`	`261`	`margin-bottom: 30px !important;`
	`262`	`+ border: 0;`
	`263`	`+ .collapse-toggle {`
	`264`	`+ color: $color-primary;`
	`265`	`+ }`
`262`	`266`	`}`
`263`	`267`	`}`
`264`	`268`	`label select {`
`@@ -619,6 +623,7 @@ div.calendar {`
`619`	`623`	`}`
`620`	`624`	`.today a {`
`621`	`625`	`color: $gray-darker;`
	`626`	`+ font-weight: normal;`
`622`	`627`	`background-color: $gray-lighter;`
`623`	`628`	`}`
`624`	`629`	`}`
`@@ -659,6 +664,8 @@ div.calendarbox {`
`659`	`664`	`}`
`660`	`665`	`.calendarnav-previous,`
`661`	`666`	`.calendarnav-next {`
	`667`	`+ top: 0;`
	`668`	`+ text-indent: initial;`
`662`	`669`	`color: $color-primary;`
`663`	`670`	`font-size: 0;`
`664`	`671`	`text-decoration: none;`