Corrected issues with merge of 2.x changes
This commit is contained in:
parent
9693150c8b
commit
1a96d84035
|
@ -23,4 +23,5 @@
|
||||||
|
|
||||||
/*
|
/*
|
||||||
FIXME: Separate the overrides from the rest of the styles, rather than override screen.css entirely.
|
FIXME: Separate the overrides from the rest of the styles, rather than override screen.css entirely.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
|
@ -61,3 +61,5 @@ $(function() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue