Merge branch 'master' into open639

2016-02-23 10:46:33 -08:00
parent 626cc502fb f379db55e7
commit 77a2e0a70b
68 changed files with 340 additions and 17567 deletions
--- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss
+++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss
@@ -27,7 +27,7 @@
    .overlay > .holder {
        //@include test(orange); // This works!
        $m: 0;
-        @include border-radius($m);
+        border-radius: $m;
        top: $m;
        right: $m;
        bottom: $m;