From 726e1b46be4c2d3e6291eeae99bef87004c5b96f Mon Sep 17 00:00:00 2001 From: Alvaro Prataviera Filho Date: Fri, 25 Aug 2023 15:21:11 -0300 Subject: [PATCH 1/5] feat(tutorial): complete step 2 --- package.json | 7 +- src/styles/_carbon.scss | 4 + src/views/LandingPage/LandingPage.vue | 77 +++++++++++++++++++- src/views/LandingPage/_carbon-overrides.scss | 3 + yarn.lock | 12 +++ 5 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 src/views/LandingPage/_carbon-overrides.scss diff --git a/package.json b/package.json index a2d848095..d116c0e7b 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { + "@carbon/grid": "^11.19.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/styles/_carbon.scss b/src/styles/_carbon.scss index b6a292d0c..1854f9040 100644 --- a/src/styles/_carbon.scss +++ b/src/styles/_carbon.scss @@ -1,2 +1,6 @@ +$feature-flags: ( + grid-columns-16: true +); + @import 'carbon-components/scss/globals/scss/styles'; @import './carbon-fixes'; diff --git a/src/views/LandingPage/LandingPage.vue b/src/views/LandingPage/LandingPage.vue index d2ab93188..db0537137 100644 --- a/src/views/LandingPage/LandingPage.vue +++ b/src/views/LandingPage/LandingPage.vue @@ -1,3 +1,78 @@ + + diff --git a/src/views/LandingPage/_carbon-overrides.scss b/src/views/LandingPage/_carbon-overrides.scss new file mode 100644 index 000000000..c895d650a --- /dev/null +++ b/src/views/LandingPage/_carbon-overrides.scss @@ -0,0 +1,3 @@ +.landing-page__r2 .cds--tabs__nav { + right: 0; +} diff --git a/yarn.lock b/yarn.lock index 91c41bb78..18d0fe796 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.19.0": + version "11.19.0" + resolved "https://registry.yarnpkg.com/@carbon/grid/-/grid-11.19.0.tgz#a0af90b4625fd60bb9ad947b7f8360af09488e3f" + integrity sha512-Ie8C0yifTPOF58rhkeRhINJ6KPiTVbdJwPCE+aEWTpUrwGSnuqIYZ8zQBlYQtNGQX72TSfnGY0qijPmpnIwNsg== + dependencies: + "@carbon/layout" "^11.19.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.19.0": + version "11.19.0" + resolved "https://registry.yarnpkg.com/@carbon/layout/-/layout-11.19.0.tgz#cd0f97457a91058792d13b09293281270d2b7d91" + integrity sha512-BI9ct+yVKrgL90l4nijMhj8dokXGBJu1Xtve9fz/lcveTyxxn7YvRu8mosGhCyw77KSU6vN2yRLJnQwqwqrLJQ== + "@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" From 4b4dc96d52fe49cc7f2ef9d9d64ef10a1b556176 Mon Sep 17 00:00:00 2001 From: Alvaro Prataviera Filho Date: Fri, 25 Aug 2023 15:45:56 -0300 Subject: [PATCH 2/5] feat(tutorial): complete step 2 --- src/styles/_carbon-utils.scss | 4 ++ src/views/LandingPage/LandingPage.vue | 56 ++++++++++++++-- src/views/LandingPage/_mixins.scss | 19 ++++++ src/views/RepoPage/RepoPage.vue | 94 ++++++++++++++++++++++++++- src/views/RepoPage/RepoTable.vue | 46 +++++++++++++ 5 files changed, 214 insertions(+), 5 deletions(-) create mode 100644 src/styles/_carbon-utils.scss create mode 100644 src/views/LandingPage/_mixins.scss create mode 100644 src/views/RepoPage/RepoTable.vue 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/views/LandingPage/LandingPage.vue b/src/views/LandingPage/LandingPage.vue index db0537137..7a23c26cd 100644 --- a/src/views/LandingPage/LandingPage.vue +++ b/src/views/LandingPage/LandingPage.vue @@ -61,18 +61,66 @@
-
1/4
-
1/4
-
1/4
-
1/4
+
+

The Principles

+
+
Carbon is Open
+
Carbon is Modular
+
Carbon is Consistent
diff --git a/src/views/LandingPage/_mixins.scss b/src/views/LandingPage/_mixins.scss new file mode 100644 index 000000000..a503748e8 --- /dev/null +++ b/src/views/LandingPage/_mixins.scss @@ -0,0 +1,19 @@ +@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; + } +} diff --git a/src/views/RepoPage/RepoPage.vue b/src/views/RepoPage/RepoPage.vue index e82a6e6a9..3380a29e8 100644 --- a/src/views/RepoPage/RepoPage.vue +++ b/src/views/RepoPage/RepoPage.vue @@ -1,3 +1,95 @@ + + + + diff --git a/src/views/RepoPage/RepoTable.vue b/src/views/RepoPage/RepoTable.vue new file mode 100644 index 000000000..835ec0b96 --- /dev/null +++ b/src/views/RepoPage/RepoTable.vue @@ -0,0 +1,46 @@ + + + From a7790a05a62b4d275c1015f68dba554521282f75 Mon Sep 17 00:00:00 2001 From: Alvaro Prataviera Filho Date: Fri, 25 Aug 2023 15:50:40 -0300 Subject: [PATCH 3/5] feat(tutorial): complete step 2 --- src/views/LandingPage/LandingPage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/LandingPage/LandingPage.vue b/src/views/LandingPage/LandingPage.vue index 7a23c26cd..4d8df7713 100644 --- a/src/views/LandingPage/LandingPage.vue +++ b/src/views/LandingPage/LandingPage.vue @@ -87,7 +87,7 @@ } .landing-page__heading { - @include type-style('productive-heading-05'); + @include carbon--type-style('productive-heading-05'); } .landing-page__r2 { @@ -100,8 +100,8 @@ } .landing-page__subheading { - @include type-style('productive-heading-03'); - @include font-weight('semibold'); + @include carbon--type-style('productive-heading-03'); + @include carbon--font-weight('semibold'); } .landing-page__p { From 3d8a2b7f47accc678c9bad1e0d2c9b6b0d2fe998 Mon Sep 17 00:00:00 2001 From: Alvaro Prataviera Filho Date: Fri, 25 Aug 2023 15:54:57 -0300 Subject: [PATCH 4/5] feat(tutorial): complete step 2 --- src/views/LandingPage/LandingPage.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/LandingPage/LandingPage.vue b/src/views/LandingPage/LandingPage.vue index 4d8df7713..c2f8ce3b0 100644 --- a/src/views/LandingPage/LandingPage.vue +++ b/src/views/LandingPage/LandingPage.vue @@ -105,11 +105,11 @@ } .landing-page__p { - @include type-style('productive-heading-03'); + @include carbon--type-style('productive-heading-03'); margin-top: $spacing-06; margin-bottom: $spacing-08; - @include breakpoint-between((320px + 1), md) { + @include carbon--breakpoint-between((320px + 1), md) { max-width: 75%; } } @@ -121,6 +121,6 @@ } .landing-page__label { - @include type-style('heading-01'); + @include carbon--type-style('heading-01'); } From e4a8999256d73693fe17884bd8623552c6e5fc05 Mon Sep 17 00:00:00 2001 From: Alvaro Prataviera Filho Date: Fri, 25 Aug 2023 16:04:47 -0300 Subject: [PATCH 5/5] feat(tutorial): complete step 2 --- src/views/LandingPage/LandingPage.vue | 40 ++++++++++---------- src/views/LandingPage/_carbon-overrides.scss | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/views/LandingPage/LandingPage.vue b/src/views/LandingPage/LandingPage.vue index c2f8ce3b0..b9d5a2a2c 100644 --- a/src/views/LandingPage/LandingPage.vue +++ b/src/views/LandingPage/LandingPage.vue @@ -1,7 +1,7 @@ diff --git a/src/views/LandingPage/_carbon-overrides.scss b/src/views/LandingPage/_carbon-overrides.scss index c895d650a..0bc1a2ce8 100644 --- a/src/views/LandingPage/_carbon-overrides.scss +++ b/src/views/LandingPage/_carbon-overrides.scss @@ -1,3 +1,3 @@ -.landing-page__r2 .cds--tabs__nav { +.landing-page__r2 .bx--tabs__nav { right: 0; }