Some CSS fixes, to fix rendering the sitemap when the sidebar is collapsed

This commit is contained in:
Deon George 2021-03-08 09:52:08 +11:00
parent 0b867abbac
commit 88eb35a567
4 changed files with 72 additions and 37 deletions

View File

@ -22,10 +22,8 @@ docker:
- docker version
- echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
- if [ -n "$GITHUB_TOKEN" ]; then cat $GITHUB_TOKEN |base64 -d > auth.json; fi
- ls -al vendor/
script:
- ls -al vendor/
- if [ -f init ]; then chmod 500 init; fi
- ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "true"
- echo -n ${CI_COMMIT_SHORT_SHA} > VERSION

View File

@ -3,6 +3,8 @@ test:
stage: test
# NOTE: This service is dependant on project file configuration, which is not there if the cache was deleted
# resulting in the testing to fail on the first run.
services:
- name: osixia/openldap:latest
alias: ldap

103
public/css/fixes.css vendored
View File

@ -43,11 +43,12 @@ table.dataTable thead .sorting {
cursor: not-allowed;
}
#favourite.selected {
/* A selected indicator - used with icons */
.tag-selected {
color: orange;
}
#favourite:hover {
.tag-selected:hover {
cursor: pointer;
}
@ -59,31 +60,84 @@ body {
font-size: 0.85em;
}
/** SIDEBAR FIXES **/
/**
The sidebar has a few states:
+ Wide Screen
- Open (app-container fixed-sidebar) &
- Closed (app-container fixed-sidebar closed-sidebar) &
- Hover Open (app-sidebar:hover)
+ Medium Screen
- Closed (app-container fixed-sidebar closed-sidebar-mobile closed-sidebar) &
- Hover Open (app-sidebar:hover)
+ Small Screen
- Missing (?) &
- Click Open (app-container fixed-sidebar closed-sidebar-mobile closed-sidebar sidebar-mobile-open)
*/
/* Fancy Tree Fixes */
/** Remove the border around the tree **/
ul.fancytree-container {
border: 0px;
}
/** Tree Placement **/
#tree > ul {
padding-left: 0px;
}
/** Fix tree rendering **/
.fancytree-node {
line-height: 1.75em;
}
/** Fix position of tree expander and checkbox */
span.fancytree-checkbox, span.fancytree-custom-icon, span.fancytree-expander, span.fancytree-icon {
margin-top: 4px;
}
/* Position branch center of icon */
ul.fancytree-container ul {
padding: 0 0 0 20px;
}
/* Show treeicon when collapsed and remove it when open */
/* @todo treeicon appears when not hovering on page in small mode */
.sidebar-mobile-open:hover #treeicon, /* small */
.fixed-sidebar #treeicon, /* wide */
.fixed-sidebar .app-sidebar:hover #treeicon /* wide & closed:hover */
{
display: none;
}
.closed-sidebar #treeicon
{
opacity: 1;
display: inline;
}
/* Architect Fixes */
/** Remove the Cyan vertical line from the tree **/
.vertical-nav-menu #tree ul:before {
opacity: 0;
}
/** Tree Icon Placement **/
#tree > ul {
padding-left: 0px;
/** Fix elipse icon (top right) on small display */
.closed-sidebar .app-header.header-text-light .app-header__menu .mobile-toggle-header-nav {
background: #343a40;
}
/* Hide tree when collapsed and show it when open */
/* @todo tree disappears when not hovering on page in small mode - related to #treeicon - see server icons they work? */
.sidebar-mobile-open:hover #tree, /* small */
.fixed-sidebar #tree, /* wide */
.fixed-sidebar .app-sidebar:hover #tree /* wide & closed:hover */
{
display: block;
}
.closed-sidebar #tree {
display: none;
}
.closed-sidebar:hover .app-sidebar:hover #tree, .sidebar-mobile-open #tree {
display: block;
}
.app-sidebar #treeicon, .closed-sidebar:hover .app-sidebar:hover #treeicon, .sidebar-mobile-open #treeicon {
display: none;
}
.closed-sidebar .app-sidebar #treeicon :not(.sidebar-mobile-open) {
display: initial;
position: relative;
}
/** Server icons **/
.closed-sidebar .server-icon {
display: none;
@ -91,22 +145,3 @@ ul.fancytree-container {
.closed-sidebar .app-sidebar:hover .server-icon, .sidebar-mobile-open .server-icon {
display: flex;
}
/** Fix position of tree expander and checkbox */
span.fancytree-checkbox, span.fancytree-custom-icon, span.fancytree-expander, span.fancytree-icon {
margin-top: 4px;
}
ul.fancytree-container ul {
padding: 0 0 0 20px;
}
/** Fix elipse icon (top right) on small display */
.closed-sidebar .app-header.header-text-light .app-header__menu .mobile-toggle-header-nav {
background: #343a40;
}
/** Fix tree rendering **/
.fancytree-node {
line-height: 1.75em;
}
/** Dont render when hoving on the tree **/
.vertical-nav-menu li a.no-hover:hover {
background: #ffffff;
}

View File

@ -15,7 +15,7 @@
<div class="row">
<div class="col-12 col-sm-4">
<h3 class="d-inline-block d-sm-none">phpLDAPadmin</h3>
<img src="/img/logo.png" class="logo-image col-12" alt="PLA Logo">
<img src="{{ url('/img/logo.png') }}" class="logo-image col-12" alt="PLA Logo">
</div>
<div class="col-12 col-sm-8">