mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-04 02:04:11 +01:00 
			
		
		
		
	Merge branch 'master' of github.com:gogits/gogs
This commit is contained in:
		
						commit
						a22c4ba71d
					
				@ -119,6 +119,10 @@ html, body {
 | 
			
		||||
    bottom: -4px !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#gogs-nav-avatar:after {
 | 
			
		||||
    bottom: -4px !important;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.gogs-nav .tooltip {
 | 
			
		||||
    border: none;
 | 
			
		||||
}
 | 
			
		||||
@ -712,11 +716,11 @@ html, body {
 | 
			
		||||
    vertical-align: top;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.commit-box .search{
 | 
			
		||||
.commit-box .search {
 | 
			
		||||
    margin-top: 3px;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.commit-box td{
 | 
			
		||||
.commit-box td {
 | 
			
		||||
    background-color: #FFF;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -15,6 +15,7 @@ func Create(ctx *middleware.Context, form auth.CreateRepoForm) {
 | 
			
		||||
	ctx.Data["Title"] = "Create repository"
 | 
			
		||||
 | 
			
		||||
	if ctx.Req.Method == "GET" {
 | 
			
		||||
		ctx.Data["PageIsNewRepo"] = true // For navbar arrow.
 | 
			
		||||
		ctx.Data["LanguageIgns"] = models.LanguageIgns
 | 
			
		||||
		ctx.Data["Licenses"] = models.Licenses
 | 
			
		||||
		ctx.HTML(200, "repo/create", ctx.Data)
 | 
			
		||||
 | 
			
		||||
@ -69,6 +69,7 @@ func Profile(ctx *middleware.Context, params martini.Params) {
 | 
			
		||||
		ctx.Data["Repos"] = repos
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ctx.Data["PageIsUserProfile"] = true
 | 
			
		||||
	ctx.HTML(200, "user/profile", ctx.Data)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -5,10 +5,10 @@
 | 
			
		||||
            <a class="gogs-nav-item{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a>
 | 
			
		||||
            <a class="gogs-nav-item{{if .PageIsHelp}} active{{end}}" href="/help">Help</a>{{if .IsSigned}}
 | 
			
		||||
            <a id="gogs-nav-out" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/user/logout/"><i class="fa fa-power-off fa-lg"></i></a>
 | 
			
		||||
            <a id="gogs-nav-avatar" class="gogs-nav-item navbar-right" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
 | 
			
		||||
            <a id="gogs-nav-avatar" class="gogs-nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
 | 
			
		||||
                <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>
 | 
			
		||||
            </a>
 | 
			
		||||
            <a class="navbar-right gogs-nav-item" href="/repo/create" data-toggle="tooltip" data-placement="bottom" title="New Repository"><i class="fa fa-plus fa-lg"></i></a>
 | 
			
		||||
            <a class="navbar-right gogs-nav-item{{if .PageIsNewRepo}} active{{end}}" href="/repo/create" data-toggle="tooltip" data-placement="bottom" title="New Repository"><i class="fa fa-plus fa-lg"></i></a>
 | 
			
		||||
            <a class="navbar-right gogs-nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/setting"  data-toggle="tooltip" data-placement="bottom" title="Setting"><i class="fa fa-cogs fa-lg"></i></a>
 | 
			
		||||
            {{else}}<a id="gogs-nav-signin" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/user/login/">Sign in</a>{{end}}
 | 
			
		||||
        </nav>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user