Browse Source

fix menu overflow

pull/1546/head
Unknwon 9 years ago
parent
commit
2f2bf20aae
  1. 2
      public/css/gogs.min.css
  2. 31
      public/less/_base.less
  3. 28
      public/less/_repository.less
  4. 5
      templates/repo/pulls/compare.tmpl
  5. 8
      templates/user/dashboard/navbar.tmpl

2
public/css/gogs.min.css vendored

File diff suppressed because one or more lines are too long

31
public/less/_base.less

@ -143,6 +143,37 @@ img {
}
}
.overflow.menu {
.items {
max-height: 300px;
overflow-y: auto;
.item {
position: relative;
cursor: pointer;
display: block;
border: none;
height: auto;
border-top: none;
line-height: 1em;
color: rgba(0,0,0,.8);
padding: .71428571em 1.14285714em!important;
font-size: 1rem;
text-transform: none;
font-weight: 400;
box-shadow: none;
-webkit-touch-callout: none;
&.active {
font-weight: 700;
}
&:hover {
background: rgba(0,0,0,.05);
color: rgba(0,0,0,.8);
z-index: 13;
}
}
}
}
footer {
margin-top: @footer-margin+14px!important;
height: @footer-margin;

28
public/less/_repository.less

@ -354,34 +354,6 @@
.filter.dropdown .menu {
margin-top: 1px!important;
.items {
max-height: 300px;
overflow-y: auto;
.item {
position: relative;
cursor: pointer;
display: block;
border: none;
height: auto;
border-top: none;
line-height: 1em;
color: rgba(0,0,0,.8);
padding: .71428571em 1.14285714em!important;
font-size: 1rem;
text-transform: none;
font-weight: 400;
box-shadow: none;
-webkit-touch-callout: none;
&.active {
font-weight: 700;
}
&:hover {
background: rgba(0,0,0,.05);
color: rgba(0,0,0,.8);
z-index: 13;
}
}
}
}
&.commits {

5
templates/repo/pulls/compare.tmpl

@ -14,7 +14,7 @@
<span class="text">base: {{$.BaseBranch}}</span>
<i class="dropdown icon"></i>
</div>
<div class="menu">
<div class="overflow menu">
<div class="ui icon search input">
<i class="filter icon"></i>
<input name="search" placeholder="Filter branch...">
@ -32,7 +32,7 @@
<span class="text">compare: {{$.HeadBranch}}</span>
<i class="dropdown icon"></i>
</div>
<div class="menu">
<div class="overflow menu">
<div class="ui icon search input">
<i class="filter icon"></i>
<input name="search" placeholder="Filter branch...">
@ -47,6 +47,7 @@
</div>
{{template "repo/issue/new_form" .}}
</div>
</div>
</div>
{{template "base/footer" .}}

8
templates/user/dashboard/navbar.tmpl

@ -5,20 +5,22 @@
{{.ContextUser.Name}}
<i class="dropdown icon"></i>
</span>
<div class="context user menu" tabindex="-1">
<div class="context user overflow menu" tabindex="-1">
<div class="ui header">
{{.i18n.Tr "home.switch_dashboard_context"}}
</div>
<div class="items">
<a class="{{if eq .ContextUser.Id .SignedUser.Id}}active selected{{end}} item" href="{{AppSubUrl}}/issues">
<img class="ui image" src="{{.SignedUser.AvatarLink}}">
<img class="ui avatar image" src="{{.SignedUser.AvatarLink}}">
{{.SignedUser.Name}}
</a>
{{range .Orgs}}
<a class="{{if eq $.ContextUser.Id .Id}}active selected{{end}} item" href="{{AppSubUrl}}/org/{{.Name}}/issues">
<img class="ui image" src="{{.AvatarLink}}">
<img class="ui avatar image" src="{{.AvatarLink}}">
{{.Name}}
</a>
{{end}}
</div>
<a class="item" href="{{AppSubUrl}}/org/create">
<i class="octicon octicon-repo-create"></i>&nbsp;&nbsp;&nbsp;{{.i18n.Tr "new_org"}}
</a>

Loading…
Cancel
Save