Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7-U4-6425

2016-02-02 15:21:34 +01:00
parent 769b74afef 4812f1d603
commit 741057b7d6
1 changed files with 6 additions and 2 deletions
--- a/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
+++ b/src/Umbraco.Web.UI.Client/src/less/components/overlays.less
@@ -189,7 +189,9 @@

 /*ensures dialogs doesnt have side-by-side labels*/
 .umb-overlay .control-label,
-.umb-overlay .form-horizontal .control-label {
+.umb-overlay .form-horizontal .control-label,
+.form-horizontal .umb-overlay .control-label
+ {
    width: 100%;
    display: block;
    box-sizing: border-box;
@@ -198,6 +200,8 @@
 }


-.umb-overlay .controls-row {
+.umb-overlay .controls-row,
+.umb-overlay .form-horizontal .controls,
+.form-horizontal .umb-overlay .controls {
    margin-left: 0 !important;
 }