Fix SASS to be acceptable to the libsass compiler

pull/137/head
Matt Westcott 2014-02-28 16:48:33 +00:00
rodzic 703a90feff
commit b415bd2d24
10 zmienionych plików z 44 dodań i 37 usunięć

Wyświetl plik

@ -130,11 +130,13 @@
background:white
}
/* FIXME: needs converting to valid SASS
a&:hover,
a&.primary:hover{
border-color:$color-teal;
color:$color-teal;
}
*/
}
/* free tagging tags from taggit */
@ -155,10 +157,12 @@
content:"u";
padding-right:0.5em;
}
/* FIXME: needs converting to valid SASS
a&:hover{
background-color:$color-teal-darker;
color:white;
}
*/
.taglist &{
margin-right:0.8em;

Wyświetl plik

@ -535,13 +535,12 @@ ul.inline li:first-child, li.inline:first-child{
.tagit-choice{
border:0;
}
ul& input[type="text"]{
padding: 0.2em 0.5em !important; /* having to use important, FML*/
}
ul& li.tagit-choice-editable{
padding:0 23px 0 0 !important; /* having to use important, FML*/
}
}
ul.tagit input[type="text"]{
padding: 0.2em 0.5em !important; /* having to use important, FML*/
}
ul.tagit li.tagit-choice-editable{
padding:0 23px 0 0 !important; /* having to use important, FML*/
}
.tagit-close{

Wyświetl plik

@ -12,7 +12,7 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'wagtail';
src: url("#{$css-root}fonts/wagtail.svg#wagtail") format("svg"),
src: url("#{$css-root}fonts/wagtail.svg#wagtail") format("svg");
}
}
@ -60,7 +60,7 @@
}
.icon-cogs:before, {
.icon-cogs:before {
content: "a";
}
.icon-doc-empty-inverse:before {

Wyświetl plik

@ -5,10 +5,12 @@ ul.listing{
.listing{
margin-bottom:2em;
/* FIXME: needs converting to valid SASS
ul&{
border-top:1px dashed $color-input-border;
margin-bottom:2em;
}
*/
ul{
@include unlist();
}
@ -22,9 +24,11 @@ ul.listing{
font-size:0.95em;
}
/* FIXME: needs converting to valid SASS
table&{
width:100%;
}
*/
td, th{
padding:1.5em 1em;

Wyświetl plik

@ -1,16 +1,16 @@
@import "/wagtailadmin/scss/variables.scss";
@import "/wagtailadmin/scss/mixins.scss";
@import "/wagtailadmin/scss/grid.scss";
@import "variables.scss";
@import "mixins.scss";
@import "grid.scss";
@import "/wagtailadmin/scss/components/explorer.scss";
@import "/wagtailadmin/scss/components/icons.scss";
@import "/wagtailadmin/scss/components/tabs.scss";
@import "/wagtailadmin/scss/components/dropdowns.scss";
@import "/wagtailadmin/scss/components/modals.scss";
@import "/wagtailadmin/scss/components/forms.scss";
@import "/wagtailadmin/scss/components/listing.scss";
@import "/wagtailadmin/scss/components/messages.scss";
@import "/wagtailadmin/scss/components/formatters.scss";
@import "components/explorer.scss";
@import "components/icons.scss";
@import "components/tabs.scss";
@import "components/dropdowns.scss";
@import "components/modals.scss";
@import "components/forms.scss";
@import "components/listing.scss";
@import "components/messages.scss";
@import "components/formatters.scss";
html{
background:$color-grey-4;
@ -824,16 +824,16 @@ footer, .logo{
}
}
.col3{
@include col3();
@include column(3);
}
.col3.addbutton{
width:auto;
}
.col6{
@include col6();
@include column(6);
}
.col9{
@include col9();
@include column(9);
}
}
footer{

Wyświetl plik

@ -1,4 +1,4 @@
/* Utility variable you should never need to modify this */
/* Utility variable - you should never need to modify this */
$gridsystem_width: $grid-columns * 1px;
$padding: $grid-gutter-width*0.5;
@ -60,7 +60,7 @@ $padding: $grid-gutter-width*0.5;
/* Pull adds right padding */
@mixin pull($offset:1, $grid-columns:$grid-columns) {
margin-right: 100%*(@offset / $grid-columns);
margin-right: 100%*($offset / $grid-columns);
}
@mixin pull-padding($offset:1, $grid-columns:$grid-columns){
padding-right: 100%*($offset / $grid-columns);

Wyświetl plik

@ -1,6 +1,6 @@
@import "/wagtailadmin/scss/variables.scss";
@import "/wagtailadmin/scss/mixins.scss";
@import "/wagtailadmin/scss/grid.scss";
@import "../variables.scss";
@import "../mixins.scss";
@import "../grid.scss";
h1{
font-weight:300;

Wyświetl plik

@ -1,6 +1,6 @@
@import "/wagtailadmin/scss/variables.scss";
@import "/wagtailadmin/scss/mixins.scss";
@import "/wagtailadmin/scss/grid.scss";
@import "../variables.scss";
@import "../mixins.scss";
@import "../grid.scss";
// overrides default nice padding defined in variables.scss
$desktop-nice-padding: 100px;

Wyświetl plik

@ -1,6 +1,6 @@
@import "/wagtailadmin/scss/variables.scss";
@import "/wagtailadmin/scss/mixins.scss";
@import "/wagtailadmin/scss/grid.scss";
@import "../variables.scss";
@import "../mixins.scss";
@import "../grid.scss";
.page-editor .content-wrapper{
margin-bottom:10em;

Wyświetl plik

@ -1,5 +1,5 @@
@import "/wagtailadmin/scss/variables.scss";
@import "/wagtailadmin/scss/mixins.scss";
@import "../variables.scss";
@import "../mixins.scss";
.hallotoolbar{
position:absolute;