bike/BikeBikeBike
1
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

[merge]

Browse Source
This commit is contained in:
Godwin
2016-01-17 11:48:23 -08:00
parent 76bd8e78cc
commit 5dbe43f42d
581 changed files with 1077 additions and 125423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/stylesheets/translations/and_uc-9.9.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: UC Browser for Android 9.9 (approximately 8.11% of all users)
=======
* Browser: UC Browser for Android 9.9 (approximately 7.68% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-2.1.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-2.2.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-2.3.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Android Browser 2.3 (approximately 0.03% of all users)
=======
* Browser: Android Browser 2.3 (approximately 0.06% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-3.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-4.1.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Android Browser 4.1 (approximately 0.48% of all users)
=======
* Browser: Android Browser 4.1 (approximately 0.61% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-4.2-4.3.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Android Browser 4.2 (approximately 1.05% of all users)
=======
* Browser: Android Browser 4.2-4.3 (approximately 1.28% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-4.4.3-4.4.4.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Android Browser 4.4 (approximately 1.05% of all users)
=======
* Browser: Android Browser 4.4.3-4.4.4 (approximately 1.24% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-4.4.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Android Browser 4.4 (approximately 2.03% of all users)
=======
* Browser: Android Browser 4.4 (approximately 2.39% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/android-4.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Android Browser 4.0 (approximately 0.1% of all users)
=======
* Browser: Android Browser 4 (approximately 0.17% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/bb-10.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/bb-7.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Blackberry Browser 7.0 (approximately 0.09% of all users)
=======
* Browser: Blackberry Browser 7 (approximately 0.09% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-10.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-11.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-12.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-13.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-14.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-15.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-16.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 16.0 (approximately 0.01% of all users)
=======
* Browser: Chrome 16 (approximately 0.01% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-17.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-18.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-19.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-20.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-21.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 21.0 (approximately 0.02% of all users)
=======
* Browser: Chrome 21 (approximately 0.02% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-22.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-23.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-24.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 24.0 (approximately 0.02% of all users)
=======
* Browser: Chrome 24 (approximately 0.03% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-25.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-26.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-27.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 27.0 (approximately 0.03% of all users)
=======
* Browser: Chrome 27 (approximately 0.02% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-28.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-29.scss
+8
View File
@@ -315,7 +315,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-30.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 30.0 (approximately 0.03% of all users)
=======
* Browser: Chrome 30 (approximately 0.03% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-31.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 31.0 (approximately 0.43% of all users)
=======
* Browser: Chrome 31 (approximately 0.42% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-32.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 32.0 (approximately 0.05% of all users)
=======
* Browser: Chrome 32 (approximately 0.04% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-33.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 33.0 (approximately 0.1% of all users)
=======
* Browser: Chrome 33 (approximately 0.11% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": a,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-34.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 34.0 (approximately 0.07% of all users)
=======
* Browser: Chrome 34 (approximately 0.07% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": y,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-35.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 35.0 (approximately 0.1% of all users)
=======
* Browser: Chrome 35 (approximately 0.1% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": y,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-36.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 36.0 (approximately 0.11% of all users)
=======
* Browser: Chrome 36 (approximately 0.12% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": y,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-37.scss
+12
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 37.0 (approximately 0.08% of all users)
=======
* Browser: Chrome 37 (approximately 0.09% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -315,7 +319,11 @@ $browser_capabilities: (
"setimmediate": n,
"es6-number": y,
"maxlength": y,
<<<<<<< HEAD
"proxy": nd,
=======
"proxy": n,
>>>>>>> 8687c10... Removed compiled files
"keyboardevent-which": y,
"keyboardevent-charcode": y,
"keyboardevent-code": n,
@@ -328,9 +336,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-38.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 38.0 (approximately 0.09% of all users)
=======
* Browser: Chrome 38 (approximately 0.11% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-39.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 39.0 (approximately 0.16% of all users)
=======
* Browser: Chrome 39 (approximately 0.21% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-4.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 4.0 (approximately 0.02% of all users)
=======
* Browser: Chrome 4 (approximately 0.01% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-40.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 40.0 (approximately 0.3% of all users)
=======
* Browser: Chrome 40 (approximately 0.27% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-41.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 41.0 (approximately 0.26% of all users)
=======
* Browser: Chrome 41 (approximately 0.2% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": nd,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-42.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 42.0 (approximately 0.26% of all users)
=======
* Browser: Chrome 42 (approximately 0.31% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": nd,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-43.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 43.0 (approximately 0.46% of all users)
=======
* Browser: Chrome 43 (approximately 0.74% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": nd,
"css-scroll-behavior": nd,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-44.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 44.0 (approximately 0.41% of all users)
=======
* Browser: Chrome 44 (approximately 0.7% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": nd,
"css-scroll-behavior": nd,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": a,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-45.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 45.0 (approximately 0.61% of all users)
=======
* Browser: Chrome 45 (approximately 13.45% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": nd,
"css-scroll-behavior": nd,
<<<<<<< HEAD
"subresource-integrity": y,
"push-api": a,
"background-position-x-y": y
=======
"subresource-integrity": y
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-46.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 46.0 (approximately 5.77% of all users)
=======
* Browser: Chrome 46 (approximately 13.07% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": y,
"css-scroll-behavior": nd,
<<<<<<< HEAD
"subresource-integrity": y,
"push-api": a,
"background-position-x-y": y
=======
"subresource-integrity": y
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-47.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Chrome 47.0 (approximately 20.46% of all users)
=======
* Browser: Chrome 47 (approximately 0.13% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": y,
"css-scroll-behavior": nd,
<<<<<<< HEAD
"subresource-integrity": y,
"push-api": a,
"background-position-x-y": y
=======
"subresource-integrity": y
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-5.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-6.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-7.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-8.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/chrome-9.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": u,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-10.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-11.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-12.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 12.0 (approximately 0.03% of all users)
=======
* Browser: Firefox 12 (approximately 0.03% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-13.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-14.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-15.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-16.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-17.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-18.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-19.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-2.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": n,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-20.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-21.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-22.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-23.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-24.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 24.0 (approximately 0.03% of all users)
=======
* Browser: Firefox 24 (approximately 0.03% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-25.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 25.0 (approximately 0.06% of all users)
=======
* Browser: Firefox 25 (approximately 0.04% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-26.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 26.0 (approximately 0.02% of all users)
=======
* Browser: Firefox 26 (approximately 0.02% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-27.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 27.0 (approximately 0.03% of all users)
=======
* Browser: Firefox 27 (approximately 0.02% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-28.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-29.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-3.5.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": n,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-3.6.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": n,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-3.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": n,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-30.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 30.0 (approximately 0.04% of all users)
=======
* Browser: Firefox 30 (approximately 0.04% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-31.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 31.0 (approximately 0.09% of all users)
=======
* Browser: Firefox 31 (approximately 0.08% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-32.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 32.0 (approximately 0.03% of all users)
=======
* Browser: Firefox 32 (approximately 0.04% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-33.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-34.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-35.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 35.0 (approximately 0.08% of all users)
=======
* Browser: Firefox 35 (approximately 0.09% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-36.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 36.0 (approximately 0.08% of all users)
=======
* Browser: Firefox 36 (approximately 0.08% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": y,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-37.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 37.0 (approximately 0.14% of all users)
=======
* Browser: Firefox 37 (approximately 0.12% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": y,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-38.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 38.0 (approximately 0.29% of all users)
=======
* Browser: Firefox 38 (approximately 0.4% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": y,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-39.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 39.0 (approximately 0.15% of all users)
=======
* Browser: Firefox 39 (approximately 0.34% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": y,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-4.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-40.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 40.0 (approximately 0.15% of all users)
=======
* Browser: Firefox 40 (approximately 0.94% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": y,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-41.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 41.0 (approximately 0.27% of all users)
=======
* Browser: Firefox 41 (approximately 6.24% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": y,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-42.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: Firefox 42.0 (approximately 4.19% of all users)
=======
* Browser: Firefox 42 (approximately 0.23% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": y,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-5.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-6.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-7.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-8.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/firefox-9.scss
+4
View File
@@ -328,9 +328,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": n
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";
app/assets/stylesheets/translations/ie-10.scss
+8
View File
@@ -1,6 +1,10 @@
/*
* ../translations
<<<<<<< HEAD
* Browser: IE 10.0 (approximately 0.87% of all users)
=======
* Browser: IE 10 (approximately 0.95% of all users)
>>>>>>> 8687c10... Removed compiled files
*
*/
@@ -328,9 +332,13 @@ $browser_capabilities: (
"input-search": y,
"css-motion-paths": n,
"css-scroll-behavior": n,
<<<<<<< HEAD
"subresource-integrity": n,
"push-api": n,
"background-position-x-y": y
=======
"subresource-integrity": n
>>>>>>> 8687c10... Removed compiled files
);
@import "bumbleberry-settings";

Some files were not shown because too many files have changed in this diff Show More