Merge pull request #48344 from michellengnx/merged-main-dev-1.32

Merge main branch into dev 1.32
kubernetes · Oct 15, 2024 · 35e7e1d · 35e7e1d
2 parents fd55058 + 6d8076a
commit 35e7e1d
Show file tree

Hide file tree

Showing 68 changed files with 3,163 additions and 1,209 deletions.
diff --git a/assets/scss/_base.scss b/assets/scss/_base.scss
@@ -1,5 +1,6 @@
 @import "reset";
 
+
 // header
 $full-width-paddingX: 20px;
 
@@ -35,6 +36,7 @@ $vendor-strip-font-size: 16px;
 $video-section-height: 200px;
 
 @import "size";
+@import "documentation";
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -898,34 +900,3 @@ footer.row {
   margin-right: initial;
 }
 
-/* DOCUMENTATION */
-
-// nav-tabs and tab-content
-.nav-tabs {
-  border-bottom: none !important;
-
-  .nav-item {
-    margin-bottom: 0;
-  }
-}
-
-.td-content .tab-content .highlight {
-  margin: 0;
-}
-
-//Table Content
-.tab-content table{
-  border-collapse: separate;
-  border-spacing: 6px;
-}
-
-.tab-pane {
-  border-radius: 0.25rem;
-  padding: 0 16px 16px;
-  overflow: auto;
-
-  border: 1px solid #dee2e6;
-  &:first-of-type.active {
-    border-top-left-radius: 0;
-  }
-}