Explorar o código

Closes #18623: Upgrade Tabler to v1.0 (#18624)

* Upgrade Tabler to v1.0

* Fix navigation menu colors

* Reduce table column heading font size
Jeremy Stretch hai 11 meses
pai
achega
26c7c8f08d

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
netbox/project-static/dist/netbox.css


+ 3 - 2
netbox/project-static/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@mdi/font": "7.4.47",
-    "@tabler/core": "1.0.0-beta21",
+    "@tabler/core": "1.0.0",
     "bootstrap": "5.3.3",
     "clipboard": "2.0.11",
     "flatpickr": "4.6.13",
@@ -53,5 +53,6 @@
   },
   "resolutions": {
     "@types/bootstrap/**/@popperjs/core": "^2.11.6"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

+ 0 - 4
netbox/project-static/styles/_variables.scss

@@ -2,7 +2,6 @@
 
 // Set base fonts
 $font-family-sans-serif: 'Inter', system-ui, sans-serif;
-// See https://github.com/tabler/tabler/issues/1812
 $font-family-monospace: 'Roboto Mono';
 
 // Set the navigation sidebar width
@@ -16,9 +15,6 @@ $btn-padding-y: 0.25rem;
 $table-cell-padding-x: 0.5rem;
 $table-cell-padding-y: 0.5rem;
 
-// Fix Tabler bug #1694 in 1.0.0-beta20
-$hover-bg: rgba(var(--tblr-secondary-rgb), 0.08);
-
 // Ensure active nav-pill has a background color in dark mode
 $nav-pills-link-active-bg: rgba(var(--tblr-secondary-rgb), 0.15);
 

+ 9 - 25
netbox/project-static/styles/transitional/_navigation.scss

@@ -8,8 +8,8 @@
 
   // Adjust hover color & style for menu items
   .navbar-collapse {
-    .nav-link-icon {
-      color: var(--tblr-nav-link-color) !important;
+    .nav-link-icon, .nav-link-title {
+      color: $rich-black;
     }
     .text-secondary {
       color: $dark-teal !important;
@@ -26,8 +26,8 @@
           visibility: hidden;
         }
 
-        // Style menu item hover state
-        &:hover {
+        // Style menu item hover/active state
+        &:hover, &.active {
           background-color: var(--tblr-navbar-active-bg);
           a {
             text-decoration: none;
@@ -37,17 +37,6 @@
           }
         }
 
-        // Style active menu item
-        &.active {
-          background-color: var(--tblr-navbar-active-bg);
-          a {
-            color: $rich-black;
-          }
-          .btn-group {
-            visibility: visible;
-          }
-        }
-
       }
     }
   }
@@ -109,22 +98,17 @@ body[data-bs-theme=dark] .navbar-vertical.navbar-expand-lg {
     border-color: $bright-teal !important;
   }
 
+  .nav-link-title, .nav-link-icon {
+    color: white !important;
+  }
+
   // Adjust hover color & style for menu items
   .dropdown-item {
     a {
       color: white !important;
     }
-    &.active {
+    &.active, &:hover {
       background-color: $navbar-dark-active-bg !important;
-      a {
-        color: white !important;
-      }
-    }
-    &:hover {
-      background-color: $navbar-dark-active-bg !important;
-    }
-    .nav-link-title {
-      color: white !important;
     }
   }
   .text-secondary {

+ 5 - 0
netbox/project-static/styles/transitional/_tables.scss

@@ -1,3 +1,8 @@
+// Reduce column heading font size
+.table thead th {
+  font-size: 0.625rem;
+}
+
 // Object list tables
 table.object-list {
 

+ 9 - 9
netbox/project-static/yarn.lock

@@ -759,19 +759,19 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@tabler/core@1.0.0-beta21":
-  version "1.0.0-beta21"
-  resolved "https://registry.yarnpkg.com/@tabler/core/-/core-1.0.0-beta21.tgz#cd10d7648b3b7b31927a430fd776d3304e796403"
-  integrity sha512-9ZKu38BScc0eHruhX/SlVDSiXenBFSgBp2WDq6orkuC8J/1yutKDt7CdXuJpBwkiADEk5yqYV31Ku+CnhwOc3Q==
+"@tabler/core@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@tabler/core/-/core-1.0.0.tgz#08736378108663b5893a31ad462be7d12e64be67"
+  integrity sha512-uFmv6f8TAaW2JaGwzjT1LfK+TjmBQSTCoznCMdV5uur4cv4TtJlV8Hh1Beu55YX0svMtOQ0Xts7tYv/+qBEcfA==
   dependencies:
     "@popperjs/core" "^2.11.8"
-    "@tabler/icons" "^3.14.0"
+    "@tabler/icons" "^3.29.0"
     bootstrap "5.3.3"
 
-"@tabler/icons@^3.14.0":
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-3.16.0.tgz#d618670b80163925a31a6c2290e8775f6058d81a"
-  integrity sha512-GU7MSx4uQEr55BmyON6hD/QYTl6k1v0YlRhM91gBWDoKAbyCt6QIYw7rpJ/ecdh5zrHaTOJKPenZ4+luoutwFA==
+"@tabler/icons@^3.29.0":
+  version "3.30.0"
+  resolved "https://registry.yarnpkg.com/@tabler/icons/-/icons-3.30.0.tgz#4f80f52cc6355b440a4ee0dadd4c3e3775e50663"
+  integrity sha512-c8OKLM48l00u9TFbh2qhSODMONIzML8ajtCyq95rW8vzkWcBrKRPM61tdkThz2j4kd5u17srPGIjqdeRUZdfdw==
 
 "@tanstack/react-virtual@^3.0.0-beta.60":
   version "3.5.0"

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio