Use $sidebar-with to calculate right-margin of #main_content (#5887)

guigs · javierjulio · commit 3934c4fc343c · 2019-10-26T18:43:25.000-04:00
* Use $sidebar-with to calculate right-margin of #main_content * Add parenthesis to improve readability Co-Authored-By: Javier Julio <javierjulio@icloud.com> * Add changelog entry for #5887 * Add definition of user and PR to changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Fix error when routing with array containing symbol. [#5870] by [@jwesorick]
 * Fix error when there is a model named `Tag` and `meta_tags` have been configured. [#5893] by [@micred], [@FabioRos] and [@deivid-rodriguez]
 * Allow specifying custom input_html for DateRangeInput [#5867] by [@mirelon]
+* Adjust `#main_content` right margin to take into account possible custom values of `$sidebar-width` and `$section-padding` [#5887] by [@guigs]
 
 ### Removals
 
@@ -532,6 +533,7 @@ Please check [0-6-stable] for previous changes.
 [#5870]: https://github.com/activeadmin/activeadmin/pull/5870
 [#5893]: https://github.com/activeadmin/activeadmin/pull/5893
 [#5867]: https://github.com/activeadmin/activeadmin/pull/5867
+[#5887]: https://github.com/activeadmin/activeadmin/pull/5887
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -562,6 +564,7 @@ Please check [0-6-stable] for previous changes.
 [@Fivell]: https://github.com/Fivell
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
+[@guigs]: https://github.com/guigs
 [@HappyKadaver]: https://github.com/HappyKadaver
 [@innparusu95]: https://github.com/innparusu95
 [@ionut998]: https://github.com/ionut998
diff --git a/app/assets/stylesheets/active_admin/structure/_main_structure.scss b/app/assets/stylesheets/active_admin/structure/_main_structure.scss
@@ -15,7 +15,7 @@
     width: 100%;
 
     #main_content{
-      margin-right: 300px;
+      margin-right: $sidebar-width + ($section-padding * 2);
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`width: 100%;`
`16`	`16`
`17`	`17`	`#main_content{`
`18`		`- margin-right: 300px;`
	`18`	`+ margin-right: $sidebar-width + ($section-padding * 2);`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`