Skip to content

Feature UI #17069

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 27 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2c00726
16649 general contrast issues (#16759)
andrewgormley Jul 3, 2024
7b0cdca
16648 dashboard contrast issues (#16824)
andrewgormley Jul 10, 2024
561f505
fixed #16853: accessibility issues
Jul 10, 2024
d6d71a1
fixed #16847: updated font (#16848)
andrewgormley Jul 15, 2024
d3f0dae
16849 document hierarchy issues (#16875)
andrewgormley Jul 15, 2024
e5691df
16650 button contrast issues (#16845)
andrewgormley Jul 16, 2024
938aa7b
16907 web UI refresh (#16915)
andrewgormley Jul 16, 2024
d3e2993
Merge branch 'feature' into feature-ui
jeremystretch Jul 17, 2024
5e25067
16394 distinguish product edition (#16924)
andrewgormley Jul 19, 2024
4342024
Merge branch 'feature' into feature-ui
jeremystretch Jul 19, 2024
a5d7071
Query release features to toggle commercial theme
jeremystretch Jul 19, 2024
a921eb0
Merge branch 'feature' into feature-ui
jeremystretch Jul 25, 2024
faea4b3
fixes dark mode primary button contrast issue
Jul 25, 2024
2c69db1
fixes #16913: hidden admin nav link (#16978)
andrewgormley Jul 25, 2024
74c89de
fixed 16852: misc accessbility problems (#16977)
andrewgormley Jul 25, 2024
455a73f
Merge branch 'feature' into feature-ui
jeremystretch Jul 26, 2024
40fe303
fixes issues in #16850 (#16986)
andrewgormley Aug 1, 2024
a9c53dd
Merge branch 'feature' into feature-ui
jeremystretch Aug 1, 2024
34c8516
Use alternate footer links for commercial releases
jeremystretch Aug 1, 2024
e02f386
Remove Inter font
jeremystretch Aug 1, 2024
d3e0546
Adjust base font weight to 500
jeremystretch Aug 1, 2024
d2a2b00
Retain default text color for hyperlinks inside tables
jeremystretch Aug 1, 2024
9917979
Logo & edition cleanup
jeremystretch Aug 2, 2024
c6ff601
Move dashboard styling
jeremystretch Aug 2, 2024
784b7ec
Misc cleanup
jeremystretch Aug 2, 2024
9d7147f
Remove unused styles
jeremystretch Aug 2, 2024
d336512
Misc cleanup & refactoring
jeremystretch Aug 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion netbox/netbox/tables/columns.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ def __init__(self, *args, **kwargs):
kwargs['attrs'] = {
'th': {
'class': 'w-1',
'aria-label': _('Select all'),
},
'td': {
'class': 'w-1',
Expand Down Expand Up @@ -284,7 +285,7 @@ def render(self, record, table, **kwargs):
if len(self.actions) == 1 or (self.split_actions and idx == 0):
dropdown_class = attrs.css_class
button = (
f'<a class="btn btn-sm btn-{attrs.css_class}" href="{url}{url_appendix}" type="button">'
f'<a class="btn btn-sm btn-{attrs.css_class}" href="{url}{url_appendix}" type="button" aria-label="{attrs.title}">'
f'<i class="mdi mdi-{attrs.icon}"></i></a>'
)

Expand Down
2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox-external.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox.css

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 24 additions & 0 deletions netbox/project-static/img/logo_netbox_bright_teal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions netbox/project-static/img/logo_netbox_dark_teal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions netbox/project-static/img/motif.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion netbox/project-static/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"validate:formatting:scripts": "prettier -c src/**/*.ts"
},
"dependencies": {
"@fontsource-variable/plus-jakarta-sans": "^5.0.21",
"@mdi/font": "7.4.47",
"@tabler/core": "1.0.0-beta20",
"bootstrap": "5.3.3",
Expand All @@ -32,7 +33,6 @@
"query-string": "9.1.0",
"sass": "1.77.8",
"tom-select": "2.3.1",
"typeface-inter": "3.18.1",
"typeface-roboto-mono": "1.1.13"
},
"devDependencies": {
Expand Down
16 changes: 15 additions & 1 deletion netbox/project-static/styles/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
// Global variables

// Set base fonts
$font-family-sans-serif: 'Inter';
$font-family-sans-serif: 'Plus Jakarta Sans Variable', system-ui, sans-serif;
// See https://github.com/tabler/tabler/issues/1812
$font-family-monospace: 'Roboto Mono';
$font-weight-base: 500;

// Set the navigation sidebar width
$sidebar-width: 18rem;
Expand All @@ -21,3 +22,16 @@ $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);

// Brand colors
$rich-black: #001423;
$rich-black-light: #081B2A;
$rich-black-lighter: #0D202E;
$rich-black-lightest: #1A2C39;
$bright-teal: #00F2D4;
$dark-teal: #00857D;

$primary: $dark-teal;

// Navbar active dropdown border color
$navbar-active-border-color: $dark-teal;
12 changes: 12 additions & 0 deletions netbox/project-static/styles/custom/_dashboard.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Alter default color for dashboard widget headings
.grid-stack {
.card-header {
// Default color of card header changes depending on theme
&.bg-default {
background: var(--tblr-bg-surface-secondary) !important;
}
a {
color: inherit !important;
}
}
}
5 changes: 5 additions & 0 deletions netbox/project-static/styles/custom/_misc.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,8 @@ span.color-label {
visibility: hidden;
opacity: 0;
}

// NetBox edition text
.netbox-edition {
letter-spacing: .15rem;
}
2 changes: 1 addition & 1 deletion netbox/project-static/styles/external.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
@import 'gridstack/dist/gridstack.min.css';

// Fonts
@import url("../node_modules/typeface-inter/inter.css");
@import url("../node_modules/typeface-roboto-mono/index.css");
@import url("../node_modules/@fontsource-variable/plus-jakarta-sans/index.css");
1 change: 1 addition & 0 deletions netbox/project-static/styles/netbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

// Custom styling
@import 'custom/code';
@import 'custom/dashboard';
@import 'custom/interfaces';
@import 'custom/markdown';
@import 'custom/misc';
Expand Down
5 changes: 5 additions & 0 deletions netbox/project-static/styles/overrides/_bootstrap.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,8 @@ hr.dropdown-divider {
margin-bottom: 0.25rem;
margin-top: 0.25rem;
}

// Bootstrap forces the font weight for dropdown items to $font-weight-normal
.dropdown-item {
font-weight: $font-weight-base;
}
Loading