From 5d43512c381eb0c075e4f3c3268069918b222d97 Mon Sep 17 00:00:00 2001 From: Dave Cranwell Date: Tue, 3 Nov 2015 14:36:58 +0000 Subject: [PATCH] fixing rebase confusion --- gulpfile.js/tasks/styles.js | 2 +- .../scss/components/datetimepicker.scss | 2 +- .../wagtailadmin/scss/components/forms.scss | 4 ++-- .../scss/components/main-nav.scss | 7 +++--- .../scss/components/streamfield.scss | 9 +++----- .../wagtailadmin/scss/layouts/login.scss | 2 +- .../scss/layouts/page-editor.scss | 22 +++++-------------- .../wagtailadmin/scss/panels/rich-text.scss | 21 ++++++++++-------- 8 files changed, 28 insertions(+), 41 deletions(-) diff --git a/gulpfile.js/tasks/styles.js b/gulpfile.js/tasks/styles.js index b5eeef15a5..6ea893d26f 100644 --- a/gulpfile.js/tasks/styles.js +++ b/gulpfile.js/tasks/styles.js @@ -45,5 +45,5 @@ gulp.task('styles:sass', function () { ) .replace('/scss/', '/css/'); })) - // .on('error', gutil.log); + .on('error', gutil.log); }); diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/datetimepicker.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/datetimepicker.scss index 755af90cc0..bc36855241 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/datetimepicker.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/datetimepicker.scss @@ -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; diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss index e7532992c1..f6948a97a6 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/forms.scss @@ -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], diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss index 29fcfecfa1..de521b7654 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/main-nav.scss @@ -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); diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/streamfield.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/streamfield.scss index 975825e8f3..a46b9cd4a6 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/streamfield.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/components/streamfield.scss @@ -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; diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss index 0df55475ef..0f89857974 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/login.scss @@ -54,7 +54,7 @@ form { color: $color-white; } - input[type=submit] { + button { font-size: 1.5em; padding: 1.1em 2.4em; height: 3.5em; diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss index 337e79b42a..9c57798c9d 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/layouts/page-editor.scss @@ -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; diff --git a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss index cf4ac527c6..a86041e194 100644 --- a/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss +++ b/wagtail/wagtailadmin/static_src/wagtailadmin/scss/panels/rich-text.scss @@ -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; } }