From 6842879985b0f7dd03811d42119630219fe725a3 Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 3 Aug 2021 11:41:46 -0700 Subject: [PATCH] #6797: Improve object view styling & responsiveness --- netbox/project-static/dist/netbox-dark.css | Bin 805578 -> 806206 bytes netbox/project-static/dist/netbox-light.css | Bin 500678 -> 501068 bytes netbox/project-static/styles/netbox.scss | 34 +++++++++++++++++- .../circuits/inc/circuit_termination.html | 26 +++++++------- netbox/templates/generic/object.html | 10 +++--- 5 files changed, 51 insertions(+), 19 deletions(-) diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css index 4ffeebd40c48034968a5ccca2dc35d6cdbc37f58..c24c562a981d897796ba40e709aad411eeb0d5af 100644 GIT binary patch delta 291 zcmX>#)o|Y|!-f{d7N!>F7M2#)7Pc1l7LFFq7OpMa%Fm|PH?p!#K3FR}JuZ$zYjT1W z%k&S=xP_-5+{G@&oSK(1{h&O%+Vr>2xFx11KjXeHpqHPNm6}|lTU?q{l39|II(=R> zr_|)Cmwar=sVOEYiIWf1ihzycM^_l=!zw!cekZ4@2%3ytaY16<^ms{jBUx-Rdc~;) yiA9Me`O^hHa!X7;Rm%l7UkFp}^u}0bH3DV?da#OtT%j_3!)tD??LN=B>yiPNPHu<* delta 56 zcmV-80LTBnnlZ|iF@S^tgaU*Egam{Iga(8Mgb0KQgbK6^Bj%SeM+GO7U^)bszvc_{ Omw@mK3b(-N3w~ot1{Kf% diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css index efa62c1b8191d58f3cd44e685798446c21573ee3..6566438c461c25ba7dac380c18bbe4e52933ce8f 100644 GIT binary patch delta 271 zcmX?hT<**%xrP?T7N!>F7M2#)7Pc+yZ{w#IXtT0T7SxcN{w1DWbh=;?s~AgaUP|rs z5Ap0%vbc;)qN-|4wQma!kiwklRE3J}p@{_YC^UacCGfOr%HBSMWAj5~M zc)Fq)vsh4VExH+Y#RZ9Zs0LwIqgR|-kXV#hl3xT@otK}N3bM)s)v8pmnL1c)LYOkW Q(1}%)v37fN0=u&_0H!iz1^@s6 delta 38 ucmX?eO77TkxrP?T7N!>F7M2#)7Pc+yZ{wL$^HQeUC$LZ1&XvUO * { // Pad each control button. @@ -288,6 +294,32 @@ div.title-container { } } +.object-subtitle { + display: block; + font-size: $font-size-sm; + color: $text-muted; + + @include media-breakpoint-up(md) { + display: inline-block; + } + + > span { + display: block; + + // Hide the separator on small screens. + &.separator { + display: none; + } + + &, + &.separator { + @include media-breakpoint-up(md) { + display: inline-block; + } + } + } +} + // Global Search nav.search { // Don't overtake dropdowns diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 6f7391763..3b0a84219 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -2,7 +2,8 @@
-
+ Termination - {{ side }} Side +
{% if not termination and perms.circuits.add_circuittermination %} Add @@ -22,7 +23,6 @@ {% endif %}
- Termination - {{ side }} Side
{% if termination %} @@ -44,17 +44,7 @@ Marked as connected {% elif termination.cable %} -
- - - - {% if perms.dcim.delete_cable %} - - Disconnect - - {% endif %} -
- {{ termination.cable }} + {{ termination.cable }} {% with peer=termination.get_cable_peer %} to {% if peer.device %} @@ -64,6 +54,16 @@ {% endif %} {{ peer }} {% endwith %} +
+ + + + {% if perms.dcim.delete_cable %} + + Disconnect + + {% endif %} +
{% elif perms.dcim.add_cable %}