mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-08-27 21:15:40 +02:00
Merge pull request #5468 from open-sausages/pulls/4.0/generic-fixes
Add page steps styles, btn style enhancement, campaign thumb alignment
This commit is contained in:
commit
b61ca609f4
4
admin/client/dist/styles/bundle.css
vendored
4
admin/client/dist/styles/bundle.css
vendored
File diff suppressed because one or more lines are too long
@ -48,7 +48,7 @@
|
|||||||
display: block;
|
display: block;
|
||||||
background: $gray-lighter;
|
background: $gray-lighter;
|
||||||
float: left;
|
float: left;
|
||||||
margin: -12px 12px 0 - $spacer-y;
|
margin: -12px 12px 0 #{0 - $spacer-y};
|
||||||
}
|
}
|
||||||
|
|
||||||
.list-group-item__info {
|
.list-group-item__info {
|
||||||
|
@ -944,16 +944,14 @@ body.cms {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.cms-add-form {
|
.cms-add-form {
|
||||||
|
.field > label.left {
|
||||||
|
width: auto;
|
||||||
|
}
|
||||||
.step-label {
|
.step-label {
|
||||||
opacity:0.9;
|
opacity:0.9;
|
||||||
.flyout {
|
|
||||||
height: 26px; //centres number within the grey arrow
|
|
||||||
padding-top:5px;
|
|
||||||
}
|
|
||||||
.title {
|
.title {
|
||||||
padding-top:5px; //aligns label with point of arrow
|
|
||||||
font-weight:bold; //to match pagetype label
|
font-weight:bold; //to match pagetype label
|
||||||
text-shadow: 1px 1px 0 $color-text-shadow;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ul.SelectionGroup {
|
ul.SelectionGroup {
|
||||||
@ -1947,9 +1945,10 @@ body.cms-dialog {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.htmleditorfield-linkform {
|
.htmleditorfield-linkform {
|
||||||
.step2 {
|
.step2 {
|
||||||
margin-bottom: $grid-x*2;
|
margin-bottom: $grid-x*2;
|
||||||
}
|
line-height: 18px;
|
||||||
|
}
|
||||||
.ss-uploadfield {
|
.ss-uploadfield {
|
||||||
.middleColumn {
|
.middleColumn {
|
||||||
width: auto;
|
width: auto;
|
||||||
@ -2164,18 +2163,19 @@ body.cms-dialog {
|
|||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
|
||||||
.flyout {
|
.flyout {
|
||||||
height: 26px - 2*4px; // minus padding
|
height: 26px;
|
||||||
font-size: $font-size-root +1;
|
font-size: $font-size-root +1;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
border-top-left-radius: 3px;
|
border-top-left-radius: 3px;
|
||||||
border-bottom-left-radius: 3px;
|
border-bottom-left-radius: 3px;
|
||||||
background-color: #667980; // hardcoding colour since its tied to the sprite
|
background-color: #667980; // hardcoding colour since its tied to the sprite
|
||||||
padding: 4px 3px 4px 6px;
|
padding: 4px 3px 4px 6px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
text-shadow: none;
|
text-shadow: none;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
line-height: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
.arrow {
|
.arrow {
|
||||||
height: 26px;
|
height: 26px;
|
||||||
|
@ -9,6 +9,11 @@
|
|||||||
* and read the jQuery UI theming API: http://jqueryui.com/docs/Theming/API
|
* and read the jQuery UI theming API: http://jqueryui.com/docs/Theming/API
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
.ui-widget {
|
||||||
|
font-family: $font-family-sans-serif;
|
||||||
|
}
|
||||||
|
|
||||||
.ui-widget-content,
|
.ui-widget-content,
|
||||||
.ui-widget {
|
.ui-widget {
|
||||||
color: $color-text;
|
color: $color-text;
|
||||||
|
Loading…
Reference in New Issue
Block a user