Merge remote-tracking branch 'upstream/pull/4108'

This commit is contained in:
Tom Hughes 2023-07-27 20:42:03 +01:00
commit e932972a4a
2 changed files with 2 additions and 14 deletions

View file

@ -80,11 +80,10 @@ small, aside {
/* Rules for the header */ /* Rules for the header */
#menu-icon { #menu-icon {
display: none !important; display: none;
float: right; float: right;
background: image-url("menu-icon.png") no-repeat; background: image-url("menu-icon.png") no-repeat;
background-size: 30px 30px; background-size: 30px 30px;
display: block;
width: 30px; width: 30px;
height: 30px; height: 30px;
margin: 14px 10px 0 0; margin: 14px 10px 0 0;
@ -244,7 +243,7 @@ body.compact-nav {
body.small-nav { body.small-nav {
#menu-icon { #menu-icon {
display: inline-block !important; display: block;
} }
nav.primary, nav.primary,
@ -777,15 +776,6 @@ tr.turn:hover {
.routing_marker { width: 15px; cursor: move; } .routing_marker { width: 15px; cursor: move; }
/* Rules for entity history */
#sidebar_content {
.browse_details {
position: relative;
border-bottom: $keyline;
}
}
.browse_status { .browse_status {
display: none; display: none;
} }

View file

@ -11,10 +11,8 @@ $vibrant-green: #76c551;
$grey: #CCC; $grey: #CCC;
$lightgrey: #EEE; $lightgrey: #EEE;
$darkgrey: #888; $darkgrey: #888;
$hovercolor: 20%;
$headerHeight: 55px; $headerHeight: 55px;
$sidebarWidth: 350px; $sidebarWidth: 350px;
$keyline: 1px solid $lightgrey;
$list-highlight: #FFFFC0; $list-highlight: #FFFFC0;
$border: 1px solid $grey; $border: 1px solid $grey;