Merge pull request #1867 from umbraco/temp-U4-9722

fixes: U4-9722 7.6 RC layout issues
This commit is contained in:
Sebastiaan Janssen
2017-04-11 21:51:24 +02:00
committed by GitHub
5 changed files with 20 additions and 7 deletions

View File

@@ -11,7 +11,7 @@
margin-bottom: @baseLineHeight;
background-color: @warningBackground;
border: 1px solid @warningBorder;
.border-radius(@baseBorderRadius);
.border-radius(@alertBorderRadius);
}
.alert,
.alert h4,

View File

@@ -65,7 +65,10 @@
-webkit-box-shadow:none;
}
.btn-group .btn.dropdown-toggle {
border-left-width: 1px;
border-left-style: solid;
}
// Button Sizes
// --------------------------------------------------

View File

@@ -1,7 +1,6 @@
.umb-button-group__toggle {
padding-left: 8px;
padding-right: 8px;
margin-left: -1px;
}
.umb-button-group__sub-buttons.-align-right {
@@ -35,6 +34,9 @@
padding-right: 10px;
padding-left: 10px;
border-radius: 0 3px 3px 0;
border-left-style: solid;
border-left-width: 1px;
border-left-color: rgba(0,0,0,0.1);
}
.umb-era-button.umb-button-group__toggle .caret {

View File

@@ -3,7 +3,7 @@
.umb-panel-header {
padding: 20px;
background: @gray-10;
border-bottom: 1px solid @gray-8;
border-bottom: 1px solid @purple-l3;
height: 59px;
.umb-headline {
@@ -25,9 +25,14 @@
.umb-panel-footer {
background: @gray-10;
border-top: 1px solid @gray-8;
height: 51px;
border-top: 1px solid @purple-l3;
height: 52px;
padding: 0 20px;
}
// Hacks to fix editors inside the mini editors
.umb-editor-sub-header {
margin-top: 0;
}
}

View File

@@ -58,6 +58,7 @@
@red-l3: #FFB2B0;
@red-washed: #FFECEB;
@yellow-d2: #F0AC00;
@yellow-d1: #FFC011;
@yellow: #FFCE38;
@yellow-l1: #FFD861;
@@ -312,7 +313,7 @@
// alerts
// -------------------------
@warningText: @white;
@warningBackground: @orange;
@warningBackground: @yellow-d2;
@warningBorder: transparent;
@errorText: @white;
@@ -327,6 +328,8 @@
@infoBackground: @turquoise-d1;
@infoBorder: transparent;
@alertBorderRadius: 0;
// SD: Had to duplicate the above but prefix with 'form' inversed colors
// because we cannot share the above alert colors with forms otherwise we end up with white
// text and giant red backgrounds.