Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/4108'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Jul 27, 2023
2 parents b57ed0b + 0a66990 commit e932972
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
14 changes: 2 additions & 12 deletions app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@ small, aside {
/* Rules for the header */

#menu-icon {
display: none !important;
display: none;
float: right;
background: image-url("menu-icon.png") no-repeat;
background-size: 30px 30px;
display: block;
width: 30px;
height: 30px;
margin: 14px 10px 0 0;
Expand Down Expand Up @@ -244,7 +243,7 @@ body.compact-nav {

body.small-nav {
#menu-icon {
display: inline-block !important;
display: block;
}

nav.primary,
Expand Down Expand Up @@ -777,15 +776,6 @@ tr.turn:hover {

.routing_marker { width: 15px; cursor: move; }

/* Rules for entity history */

#sidebar_content {
.browse_details {
position: relative;
border-bottom: $keyline;
}
}

.browse_status {
display: none;
}
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/parameters.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ $vibrant-green: #76c551;
$grey: #CCC;
$lightgrey: #EEE;
$darkgrey: #888;
$hovercolor: 20%;
$headerHeight: 55px;
$sidebarWidth: 350px;
$keyline: 1px solid $lightgrey;
$list-highlight: #FFFFC0;
$border: 1px solid $grey;

Expand Down

0 comments on commit e932972

Please sign in to comment.