Fix top menu layout with custom_menu plugin

Fixes #89
This commit is contained in:
mrliptontea
2019-03-19 23:57:37 +00:00
parent d429f35dfc
commit 97b68972f7
7 changed files with 84 additions and 9 deletions

View File

@@ -56,6 +56,10 @@ If you need to customize styles for [Redmine Backlogs][redmine_backlogs] remembe
## Changelog ## Changelog
Latest:
* Fixed #89: [RM+ custom menu](http://rmplus.pro/en/redmine/plugins/custom_menu) breaking the layout
v2.0.1 (2019-03-17): v2.0.1 (2019-03-17):
* Fixed #90: regression in some sidebar layouts * Fixed #90: regression in some sidebar layouts

View File

@@ -147,6 +147,11 @@ hr {
margin-bottom: $line-height-computed; margin-bottom: $line-height-computed;
border: 0; border: 0;
border-top: 1px solid $hr-border; border-top: 1px solid $hr-border;
li & {
margin-top: $line-height-computed / 2;
margin-bottom: $line-height-computed / 2;
}
} }
blockquote { blockquote {

View File

@@ -104,6 +104,7 @@ p.buttons,
color $transition-time ease-in-out; color $transition-time ease-in-out;
border: 1px solid; border: 1px solid;
border-radius: $border-radius-base; border-radius: $border-radius-base;
font-size: $font-size-base;
&.icon { &.icon {
padding-left: 20px + $btn-padding-horizontal-small; padding-left: 20px + $btn-padding-horizontal-small;

View File

@@ -703,6 +703,7 @@ div.wiki {
.other-formats { .other-formats {
%other-format { %other-format {
@extend %fa-icon; @extend %fa-icon;
background-image: none;
&::before { &::before {
margin-right: .3em; margin-right: .3em;

View File

@@ -179,6 +179,67 @@
//
// Redmine custom menu
// http://rmplus.pro/en/redmine/plugins/custom_menu
// --------------------------------------------------
#top-menu {
.cm-menu-header {
> li {
margin: 0;
> a,
> .title {
line-height: $input-height-base;
}
> .cm-menu-divider {
height: 18px;
margin: 5px 4px 0 5px;
border-top: 0;
border-left: 1px solid;
opacity: .3;
}
}
.drdn-trigger {
font-size: $font-size-base;
}
}
.dropdown {
.dropdown-menu > li a:hover,
.dropdown-menu > li a:focus,
.dropdown-submenu:hover a,
.dropdown-submenu:focus a {
background-color: $brand-primary;
color: $brand-text;
}
}
.rm-icon {
&::before {
font-size: $fa-font-size-base;
}
}
#quick-search {
margin: 0;
form > input {
width: $quick-search-width / 2;
min-width: $quick-search-width / 2;
}
a {
line-height: inherit;
}
}
}
// //
// Redmine CRM People // Redmine CRM People
// http://www.redminecrm.com/projects/people/ // http://www.redminecrm.com/projects/people/

View File

@@ -67,14 +67,15 @@
} }
ul { ul {
@include clearfix;
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
li { li {
display: inline;
margin: 0 .5em 0 0; margin: 0 .5em 0 0;
padding: 0; padding: 0;
float: left;
list-style-type: none; list-style-type: none;
white-space: nowrap; white-space: nowrap;
} }
@@ -154,10 +155,12 @@
} }
#quick-search { #quick-search {
margin-top: floor(($header-title-line-height + $header-padding-vertical * 2 - $input-height-base) / 2) - 1px; #header & {
margin-right: $header-padding-horizontal; margin-top: floor(($header-title-line-height + $header-padding-vertical * 2 - $input-height-base) / 2) - 1px;
float: right; margin-right: $header-padding-horizontal;
color: $header-text; float: right;
color: $header-text;
}
> * { > * {
vertical-align: top; vertical-align: top;
@@ -165,10 +168,10 @@
form { form {
display: inline-block; display: inline-block;
}
input { input {
width: $quick-search-width; width: $quick-search-width;
}
} }
> form > input, > form > input,

File diff suppressed because one or more lines are too long