kopia lustrzana https://github.com/wagtail/wagtail
fixing rebase confusion
Dave Cranwell
Matt Westcott
rodzic
7e40b131e8
commit
5d43512c38
|
|
@ -45,5 +45,5 @@ gulp.task('styles:sass', function () {
|
|||
)
|
||||
.replace('/scss/', '/css/');
|
||||
}))
|
||||
// .on('error', gutil.log);
|
||||
.on('error', gutil.log);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
padding-left: 0;
|
||||
padding-top: 2px;
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
z-index: 5;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
display: none;
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ select,
|
|||
&:disabled:hover,
|
||||
&[disabled]:hover {
|
||||
background-color: inherit;
|
||||
cursor: not-allowed;
|
||||
cursor: default;
|
||||
color: $color-grey-4;
|
||||
}
|
||||
}
|
||||
|
|
@ -365,7 +365,7 @@ button {
|
|||
background-color: $color-grey-3 !important;
|
||||
border-color: $color-grey-3 !important;
|
||||
color: lighten($color-grey-2, 15%) !important;
|
||||
cursor: not-allowed;
|
||||
cursor: default;
|
||||
}
|
||||
&.button-secondary:disabled,
|
||||
&.button-secondary[disabled],
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ $submenu-color: darken($color-grey-1, 5%);
|
|||
background: $color-grey-1;
|
||||
|
||||
.inner {
|
||||
background: $color-grey-1;
|
||||
background: $color-grey-1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -291,7 +291,6 @@ body.explorer-open {
|
|||
|
||||
.footer {
|
||||
padding-top: 1em;
|
||||
background-color: $color-grey-1;
|
||||
position: fixed;
|
||||
width: $menu-width - 7;
|
||||
bottom: 0;
|
||||
|
|
@ -422,8 +421,8 @@ body.explorer-open {
|
|||
}
|
||||
}
|
||||
|
||||
/* Media query hacks to detect IE10+ which doesn't support 3d transform of static elements and needs a fallback */
|
||||
@media all and (-ms-high-contrast: none),
|
||||
// Media query hacks to detect IE10+ which doesn't support 3d transform of static elements and needs a fallback
|
||||
@media all and (-ms-high-contrast: none),
|
||||
all and (-ms-high-contrast: active) {
|
||||
.wrapper {
|
||||
@include transition(left 0.2s ease);
|
||||
|
|
|
|||
|
|
@ -6,15 +6,12 @@ ul.sequence {
|
|||
li.sequence-member {
|
||||
@include clearfix;
|
||||
position:relative;
|
||||
border-style: solid;
|
||||
border-color: transparent;
|
||||
border: 1px solid transparent;
|
||||
border-width: 1px 0;
|
||||
|
||||
&:hover{
|
||||
background-color:$color-input-focus;
|
||||
border-color: darken($color-input-focus, 10%);
|
||||
border: 1px solid darken($color-input-focus, 10%);
|
||||
border-width: 1px 0;
|
||||
|
||||
.sequence-member-inner {
|
||||
> .struct-block > label,
|
||||
|
|
@ -51,7 +48,7 @@ li.sequence-member {
|
|||
position: relative;
|
||||
padding: 1.5em 50px;
|
||||
|
||||
.sequence-member:hover {
|
||||
.sequence-member {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
|
|
@ -138,7 +135,7 @@ li.sequence-member {
|
|||
|
||||
// Controls for ordering and deletion of items in a sequence
|
||||
.sequence-controls {
|
||||
@include border-radius(2px 0 0 0);
|
||||
@include border-radius(2px 0 0);
|
||||
@include transition(opacity 0.2s ease);
|
||||
border: 1px solid darken($color-input-focus, 10%);
|
||||
border-width: 1px 1px 0;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ form {
|
|||
color: $color-white;
|
||||
}
|
||||
|
||||
input[type=submit] {
|
||||
button {
|
||||
font-size: 1.5em;
|
||||
padding: 1.1em 2.4em;
|
||||
height: 3.5em;
|
||||
|
|
|
|||
|
|
@ -136,9 +136,9 @@
|
|||
padding-top: 1em; // to provide space for editor buttons
|
||||
padding-bottom: 1em;
|
||||
|
||||
&.expanded{
|
||||
padding-top:5em; /* to provide space for editor buttons */
|
||||
padding-bottom:2em;
|
||||
&.expanded {
|
||||
padding-top: 5em; // to provide space for editor buttons
|
||||
padding-bottom: 2em;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -175,8 +175,8 @@
|
|||
padding-bottom: 3em;
|
||||
|
||||
&.expanded{
|
||||
padding-top:5em; /* to provide space for editor buttons */
|
||||
padding-bottom:5em;
|
||||
padding-top: 5em; // to provide space for editor buttons
|
||||
padding-bottom: 5em;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -305,12 +305,7 @@
|
|||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> finished linting
|
||||
&.collapsed {
|
||||
h2 {
|
||||
&:before,
|
||||
|
|
@ -322,17 +317,10 @@
|
|||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
/* Custom styles that make some fields look more important */
|
||||
.full input,
|
||||
.full textarea,
|
||||
.full .richtext{
|
||||
=======
|
||||
// Custom styles that make some fields look more important
|
||||
.full input,
|
||||
.full textarea,
|
||||
.full .richtext {
|
||||
>>>>>>> finished linting
|
||||
@include nice-padding();
|
||||
@include border-radius(0);
|
||||
padding-top: 2em;
|
||||
|
|
|
|||
|
|
@ -30,18 +30,21 @@
|
|||
}
|
||||
|
||||
.hallotoolbar button{
|
||||
/* Some of this is copied from the jQuery UI style, forcing those styles to apply to this selector. Without it, if your cursor is placed above a button while it's appearing, the CSS from jQuery UI won't immediately be applied. */
|
||||
// Some of this is copied from the jQuery UI style, forcing those styles to apply to
|
||||
// this selector. Without it, if your cursor is placed above a button while it's
|
||||
// appearing, the CSS from jQuery UI won't immediately be applied.
|
||||
@include border-radius(0);
|
||||
height:2.4em;
|
||||
height: 2.4em;
|
||||
border: 1px solid $color-grey-3;
|
||||
background: white;
|
||||
font-weight: normal;
|
||||
color: $color-grey-1-1;
|
||||
background: $color-white;
|
||||
font-weight: normal;
|
||||
color: $color-grey-1-1;
|
||||
|
||||
&:hover {
|
||||
border: 1px solid #49c0c1;
|
||||
background: $color-teal;
|
||||
font-weight: normal;
|
||||
color: white;
|
||||
border: 1px solid $color-teal;
|
||||
background: $color-teal;
|
||||
font-weight: normal;
|
||||
color: $color-white;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue