diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-19 09:24:10 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-19 09:24:10 -0400 |
| commit | bf1d1f9579c6fd2670ff26e2074f65cf18543919 (patch) | |
| tree | aeb27ef4e048847dfdff41f4077fb3cc743c817f | |
| parent | a2fbb246151ce722a30d932dd73a9ecc76b020e9 (diff) | |
| parent | 06af48503cc002d3ab89372c11fc43fc9a5470a8 (diff) | |
| download | gitea-bf1d1f9579c6fd2670ff26e2074f65cf18543919.tar.gz gitea-bf1d1f9579c6fd2670ff26e2074f65cf18543919.zip | |
Merge branch 'master' of github.com:gogits/gogs
| -rwxr-xr-x | public/css/gogs.css | 21 | ||||
| -rw-r--r-- | templates/repo/nav.tmpl | 11 |
2 files changed, 27 insertions, 5 deletions
diff --git a/public/css/gogs.css b/public/css/gogs.css index ec1cb591e2..328d81e776 100755 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -33,6 +33,10 @@ html, body { margin: 0 .5em; } +.fa-m{ + margin: 0; +} + .list-group .list-group-item { background-color: transparent; } @@ -410,6 +414,15 @@ html, body { height: auto; } +.gogs-repo-nav .name{ + margin-top: 15px; +} + +.gogs-repo-nav .desc{ + color: #888; + margin-bottom: 0; +} + .gogs-repo-nav h3 .fa { color: #BBB; margin-left: 0; @@ -419,6 +432,10 @@ html, body { padding-top: 20px; } +.gogs-repo-nav .btn-default{ + font-family: Tahoma, Arial, sans-serif; +} + #gogs-repo-watching .dropdown-menu { width: 280px; padding: 0; @@ -530,6 +547,10 @@ html, body { color: #999; } +.popover .repo-clone-div{ + min-width: 200px; +} + /* #gogs-source */ #gogs-source { margin-top: -20px; diff --git a/templates/repo/nav.tmpl b/templates/repo/nav.tmpl index 1f74bc306e..b67f82d5e3 100644 --- a/templates/repo/nav.tmpl +++ b/templates/repo/nav.tmpl @@ -2,29 +2,30 @@ <div class="container"> <div class="row"> <div class="col-md-6"> - <h3><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3> + <h3 class="name"><i class="fa fa-book fa-lg"></i><a href="{{.Owner.HomeLink}}">{{.Owner.Name}}</a> / {{.Repository.Name}}</h3> + <p class="desc">a sentence to describe the repository.<a href="#">official-site</a></p> </div> {{if not .IsBareRepo}} <div class="col-md-6 actions text-right"> <div class="btn-group" id="gogs-repo-clone"> - <button type="button" class="btn btn-default"><i class="fa fa-download"></i>Clone</button> + <button type="button" class="btn btn-default"><i class="fa fa-download fa-lg fa-m"></i></button> <button type="button" class="btn btn-default dropdown-toggle" data-container="body" data-toggle="popover" data-placement="bottom" data-content="<label>SSH:</label><div class='input-group'><input type='text' class='form-control' value='git@{{AppDomain}}:{{.Owner.LowerName}}/{{.Repository.Name}}.git'></div>" data-html="1"> <span class="caret"></span> </button> </div> <div class="btn-group" id="gogs-repo-watching"> - <button type="button" class="btn btn-default"><i class="fa fa-eye"></i>Watch {x}</button> + <button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i></button> <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> <span class="caret"></span> <span class="sr-only">Toggle Dropdown</span> </button> <div class="dropdown-menu" role="menu"> - <div class="dropdown-item" data-val="not-watching"> + <div class="dropdown-item text-left" data-val="not-watching"> <h4 role="presentation" class="dropdown-header">Not Watching</h4> <p class="description">You only receive notifications for conversations in which you participate or are @mentioned.</p> <p class="divider"></p> </div> - <div class="dropdown-item" data-val="watching"> + <div class="dropdown-item text-left" data-val="watching"> <h4 role="presentation" class="dropdown-header">Watching</h4> <p class="description">You receive notifications for all conversations in this repository.</p> </div> |