Commit 6eda14e7 by Brian Jacobel Committed by GitHub

Merge pull request #14629 from edx/bjacobel/bourbon-warnings

Quiet Bourbon deprecation warnings, UXPL upgrade 0.18.1
parents ee68726b b9abeab7
...@@ -28,25 +28,25 @@ h1.top-header { ...@@ -28,25 +28,25 @@ h1.top-header {
.light-button, a.light-button, // only used in askbot as classes .light-button, a.light-button, // only used in askbot as classes
.gray-button { .gray-button {
@include button(simple, $gray-l5); @include simple($gray-l5);
@extend .button-reset; @extend .button-reset;
font-size: em(13); font-size: em(13);
} }
.blue-button { .blue-button {
@include button(simple, $blue); @include simple($blue);
@extend .button-reset; @extend .button-reset;
font-size: em(13); font-size: em(13);
} }
.pink-button { .pink-button {
@include button(simple, $pink); @include simple($pink);
@extend .button-reset; @extend .button-reset;
font-size: em(13); font-size: em(13);
} }
.content { .content {
@include box-sizing(border-box); box-sizing: border-box;
display: table-cell; display: table-cell;
padding: 2em 2.5em; padding: 2em 2.5em;
vertical-align: top; vertical-align: top;
...@@ -58,7 +58,7 @@ h1.top-header { ...@@ -58,7 +58,7 @@ h1.top-header {
} }
.sidebar { .sidebar {
@include box-sizing(border-box); box-sizing: border-box;
display: table-cell; display: table-cell;
font-family: $sans-serif; font-family: $sans-serif;
font-size: 14px; font-size: 14px;
...@@ -120,7 +120,7 @@ h1.top-header { ...@@ -120,7 +120,7 @@ h1.top-header {
display: block; display: block;
line-height: lh(); line-height: lh();
font-size: 1em; font-size: 1em;
@include box-sizing(border-box); box-sizing: border-box;
padding: lh(.25) lh(0.5) lh(.25) 0; padding: lh(.25) lh(0.5) lh(.25) 0;
&:hover, &:focus { &:hover, &:focus {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"backbone": "~1.3.2", "backbone": "~1.3.2",
"backbone.paginator": "~2.0.3", "backbone.paginator": "~2.0.3",
"coffee-script": "1.6.1", "coffee-script": "1.6.1",
"edx-pattern-library": "0.18.0", "edx-pattern-library": "0.18.1",
"edx-ui-toolkit": "1.5.1", "edx-ui-toolkit": "1.5.1",
"jquery": "~2.2.0", "jquery": "~2.2.0",
"jquery-migrate": "^1.4.1", "jquery-migrate": "^1.4.1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment