tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5468 from open-sausages/pulls/4.0/generic-fixes

Browse Source 
Add page steps styles,  btn style enhancement, campaign thumb alignment
This commit is contained in:
Ingo Schommer 2016-05-09 12:53:19 +12:00
commit b61ca609f4
4 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/client/dist/styles/bundle.css vendored
View File

File diff suppressed because one or more lines are too long

2
admin/client/src/components/ListGroup/ListGroup.scss
View File

@ -48,7 +48,7 @@
display: block;
background: $gray-lighter;
float: left;
margin: -12px 12px 0 - $spacer-y;
margin: -12px 12px 0 #{0 - $spacer-y};
}
.list-group-item__info {

42
admin/client/src/styles/legacy/_style.scss
View File

@ -944,16 +944,14 @@ body.cms {
}
.cms-add-form {
.field > label.left {
width: auto;
}
.step-label {
opacity:0.9;
.flyout {
height: 26px; //centres number within the grey arrow
padding-top:5px;
}
.title {
padding-top:5px; //aligns label with point of arrow
font-weight:bold; //to match pagetype label
text-shadow: 1px 1px 0 $color-text-shadow;
}
}
ul.SelectionGroup {
@ -1947,9 +1945,10 @@ body.cms-dialog {
}
.htmleditorfield-linkform {
.step2 {
margin-bottom: $grid-x*2;
}
.step2 {
margin-bottom: $grid-x*2;
line-height: 18px;
}
.ss-uploadfield {
.middleColumn {
width: auto;
@ -2164,18 +2163,19 @@ body.cms-dialog {
vertical-align: top;
}
.flyout {
height: 26px - 2*4px; // minus padding
font-size: $font-size-root +1;
font-weight: bold;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
background-color: #667980; // hardcoding colour since its tied to the sprite
padding: 4px 3px 4px 6px;
text-align: center;
text-shadow: none;
color: #fff;
}
.flyout {
height: 26px;
font-size: $font-size-root +1;
font-weight: bold;
border-top-left-radius: 3px;
border-bottom-left-radius: 3px;
background-color: #667980; // hardcoding colour since its tied to the sprite
padding: 4px 3px 4px 6px;
text-align: center;
text-shadow: none;
color: #fff;
line-height: 18px;
}
.arrow {
height: 26px;

5
admin/client/src/styles/legacy/_uitheme.scss
View File

@ -9,6 +9,11 @@
* 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 {
color: $color-text;