diff --git a/package.json b/package.json index a2d848095..fca8906a7 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { + "@carbon/grid": "^11.1.0", "@carbon/icons-vue": "^10.30.0", "@carbon/vue": "^2.37.1", "carbon-components": "^10.33.0", @@ -67,8 +68,10 @@ "json", "vue" ], - "setupFiles": ["./tests/setup.js"], - "transform": { + "setupFiles": [ + "./tests/setup.js" + ], + "transform": { "^.+\\.vue$": "vue-jest", ".+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$": "jest-transform-stub", "^.+\\.jsx?$": "babel-jest" diff --git a/src/components/TutorialHeader/TutorialHeader.vue b/src/components/TutorialHeader/TutorialHeader.vue index 38f43bd2f..88921ed66 100644 --- a/src/components/TutorialHeader/TutorialHeader.vue +++ b/src/components/TutorialHeader/TutorialHeader.vue @@ -18,17 +18,17 @@ - + diff --git a/src/styles/_carbon-fixes.scss b/src/styles/_carbon-fixes.scss index 3bc61fdd0..bc4158f04 100644 --- a/src/styles/_carbon-fixes.scss +++ b/src/styles/_carbon-fixes.scss @@ -14,3 +14,4 @@ .bx--content { padding: 0; } + diff --git a/src/styles/_carbon-utils.scss b/src/styles/_carbon-utils.scss new file mode 100644 index 000000000..33cc42953 --- /dev/null +++ b/src/styles/_carbon-utils.scss @@ -0,0 +1,4 @@ +@import 'carbon-components/scss/globals/scss/vendor/@carbon/type/scss/font-family.scss'; +@import 'carbon-components/scss/globals/scss/vendor/@carbon/layout/scss/breakpoint.scss'; +@import 'carbon-components/scss/globals/scss/typography.scss'; +@import 'carbon-components/scss/globals/scss/vars.scss'; diff --git a/src/styles/_carbon.scss b/src/styles/_carbon.scss index b6a292d0c..295fe27e3 100644 --- a/src/styles/_carbon.scss +++ b/src/styles/_carbon.scss @@ -1,2 +1,6 @@ -@import 'carbon-components/scss/globals/scss/styles'; -@import './carbon-fixes'; +@import 'carbon-components/scss/globals/scss/styles.scss'; +@import './_carbon-fixes'; + +$feature-flags: ( + grid-columns-16: true +); \ No newline at end of file diff --git a/src/views/LandingPage/LandingPage.vue b/src/views/LandingPage/LandingPage.vue index d2ab93188..7c78e5832 100644 --- a/src/views/LandingPage/LandingPage.vue +++ b/src/views/LandingPage/LandingPage.vue @@ -1,3 +1,118 @@ + + + diff --git a/src/views/LandingPage/_carbon-overrides.scss b/src/views/LandingPage/_carbon-overrides.scss new file mode 100644 index 000000000..1d23a2140 --- /dev/null +++ b/src/views/LandingPage/_carbon-overrides.scss @@ -0,0 +1,3 @@ +.landing-page__r2 .bx--tabs__nav { + right: 0; +} \ No newline at end of file diff --git a/src/views/LandingPage/_mixins.scss b/src/views/LandingPage/_mixins.scss new file mode 100644 index 000000000..a0aa8f59a --- /dev/null +++ b/src/views/LandingPage/_mixins.scss @@ -0,0 +1,20 @@ + +@mixin landing-page-background() { + background-color: $ui-01; + position: relative; + + &::before { + content: ''; + position: absolute; + left: -$spacing-06; + top: 0; + right: -$spacing-06; + bottom: 0; + background: $ui-01; + } + + > * { + /* lift above position absolute */ + position: relative; + } + } \ No newline at end of file diff --git a/src/views/RepoPage/RepoPage.vue b/src/views/RepoPage/RepoPage.vue index e82a6e6a9..71c701201 100644 --- a/src/views/RepoPage/RepoPage.vue +++ b/src/views/RepoPage/RepoPage.vue @@ -1,3 +1,49 @@ + + \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 91c41bb78..696776d73 100644 --- a/yarn.lock +++ b/yarn.lock @@ -886,6 +886,13 @@ "@babel/helper-validator-identifier" "^7.12.11" to-fast-properties "^2.0.0" +"@carbon/grid@^11.1.0": + version "11.1.0" + resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-11.1.0.tgz#6ffec0466c09f91fbfeca45de237e8e8dc2d5fba" + integrity sha512-AS78yH03bEqBysxRQ/zujAJTE69NLBsNezDiECUFf+VAS6hJQi0LSDxuuo6HOKQpLqUANj4d6eZdcnrIuw/Z5A== + dependencies: + "@carbon/layout" "^11.1.0" + "@carbon/icon-helpers@^10.16.0", "@carbon/icon-helpers@^10.9.0": version "10.16.0" resolved "https://registry.yarnpkg.com/@carbon/icon-helpers/-/icon-helpers-10.16.0.tgz#66f20b9bba49c6ec4c956b8e9e7ec65bdf40da8f" @@ -905,6 +912,11 @@ dependencies: "@carbon/icon-helpers" "^10.16.0" +"@carbon/layout@^11.1.0": + version "11.1.0" + resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-11.1.0.tgz#7a2072495761b1c59ebfde4271166397d18ba2f5" + integrity sha512-aryW3p8nr4xjPtr8uN5oheV9ymtVf6SCYgSkDhCPFSIK8UZt1SCUMobaMVRi3stKTm/7B9WzC27T9nKGz336aA== + "@carbon/telemetry@0.0.0-alpha.6", "@carbon/telemetry@^0.0.0-alpha.6": version "0.0.0-alpha.6" resolved "https://registry.yarnpkg.com/@carbon/telemetry/-/telemetry-0.0.0-alpha.6.tgz#1d11e64f310e98f32c3db0c55f02e047f2398087"