Commit 35ced44a authored by henry's avatar henry Committed by Pier Angelo Vendrame
Browse files

TB 42664: Generate style tokens. 

This commit only contains changes generated automatically by
`./mach buildtokens`.

When rebasing, conflicts should not be resolved manually.
Instead, the changes introduced by this commit can be dropped and
replaced with a new run of `./mach buildtokens`.

See #44406.
parent ff2c0b93

browser/themes/shared/tabbrowser/tab.tokens.css

+21 −0
Original line number Diff line number Diff line
@@ -2,6 +2,27 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



/* Tor Browser instructions

 * ========================

 *

 * DO NOT EDIT this file directly!

 *

 * DO NOT MANUALLY RESOLVE MERGE CONFLICTS for this file!

 *

 * This is a file generated by `./mach buildtokens`.

 *

 * When resolving conflicts, first resolve other conflicts outside the

 * 'dist' directory, if there are any:

 *   git mergetool ':(exclude)toolkit/themes/shared/design-system/dist/'

 *

 * Then regenerate these 'dist' files:

 *

 *   ./mach buildtokens

 *

 * Then add the generated files as resolved:

 *

 *   git add toolkit/themes/shared/design-system/dist/

 */

/* DO NOT EDIT this file directly, instead modify moz-tab.tokens.json

 * and run `mach buildtokens` to see your changes. */

browser/themes/shared/tabbrowser/tabs-navbar.tokens.css

+21 −0
Original line number Diff line number Diff line
@@ -2,6 +2,27 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



/* Tor Browser instructions

 * ========================

 *

 * DO NOT EDIT this file directly!

 *

 * DO NOT MANUALLY RESOLVE MERGE CONFLICTS for this file!

 *

 * This is a file generated by `./mach buildtokens`.

 *

 * When resolving conflicts, first resolve other conflicts outside the

 * 'dist' directory, if there are any:

 *   git mergetool ':(exclude)toolkit/themes/shared/design-system/dist/'

 *

 * Then regenerate these 'dist' files:

 *

 *   ./mach buildtokens

 *

 * Then add the generated files as resolved:

 *

 *   git add toolkit/themes/shared/design-system/dist/

 */

/* DO NOT EDIT this file directly, instead modify moz-tabs-navbar.tokens.json

 * and run `mach buildtokens` to see your changes. */

browser/themes/shared/urlbar/urlbar.tokens.css

+21 −0
Original line number Diff line number Diff line
@@ -2,6 +2,27 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



/* Tor Browser instructions

 * ========================

 *

 * DO NOT EDIT this file directly!

 *

 * DO NOT MANUALLY RESOLVE MERGE CONFLICTS for this file!

 *

 * This is a file generated by `./mach buildtokens`.

 *

 * When resolving conflicts, first resolve other conflicts outside the

 * 'dist' directory, if there are any:

 *   git mergetool ':(exclude)toolkit/themes/shared/design-system/dist/'

 *

 * Then regenerate these 'dist' files:

 *

 *   ./mach buildtokens

 *

 * Then add the generated files as resolved:

 *

 *   git add toolkit/themes/shared/design-system/dist/

 */

/* DO NOT EDIT this file directly, instead modify moz-urlbar.tokens.json

 * and run `mach buildtokens` to see your changes. */

browser/themes/shared/urlbar/urlbarview.tokens.css

+21 −0
Original line number Diff line number Diff line
@@ -2,6 +2,27 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



/* Tor Browser instructions

 * ========================

 *

 * DO NOT EDIT this file directly!

 *

 * DO NOT MANUALLY RESOLVE MERGE CONFLICTS for this file!

 *

 * This is a file generated by `./mach buildtokens`.

 *

 * When resolving conflicts, first resolve other conflicts outside the

 * 'dist' directory, if there are any:

 *   git mergetool ':(exclude)toolkit/themes/shared/design-system/dist/'

 *

 * Then regenerate these 'dist' files:

 *

 *   ./mach buildtokens

 *

 * Then add the generated files as resolved:

 *

 *   git add toolkit/themes/shared/design-system/dist/

 */

/* DO NOT EDIT this file directly, instead modify moz-urlbarview.tokens.json

 * and run `mach buildtokens` to see your changes. */

toolkit/content/widgets/moz-badge/moz-badge.tokens.css

+21 −0
Original line number Diff line number Diff line
@@ -2,6 +2,27 @@ 
 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



/* Tor Browser instructions

 * ========================

 *

 * DO NOT EDIT this file directly!

 *

 * DO NOT MANUALLY RESOLVE MERGE CONFLICTS for this file!

 *

 * This is a file generated by `./mach buildtokens`.

 *

 * When resolving conflicts, first resolve other conflicts outside the

 * 'dist' directory, if there are any:

 *   git mergetool ':(exclude)toolkit/themes/shared/design-system/dist/'

 *

 * Then regenerate these 'dist' files:

 *

 *   ./mach buildtokens

 *

 * Then add the generated files as resolved:

 *

 *   git add toolkit/themes/shared/design-system/dist/

 */

/* DO NOT EDIT this file directly, instead modify moz-badge.tokens.json

 * and run `mach buildtokens` to see your changes. */