From d5a14482a6b78ef0722fd7596b5810a3e830b9df Mon Sep 17 00:00:00 2001 From: takezoe Date: Sat, 5 Oct 2013 12:58:26 +0900 Subject: [PATCH] Fix for pull request #119 to take some part of design fix. --- src/main/twirl/account/main.scala.html | 2 +- src/main/twirl/index.scala.html | 6 +-- src/main/twirl/main.scala.html | 13 +++--- src/main/twirl/newrepo.scala.html | 6 +-- src/main/twirl/settings/options.scala.html | 4 +- src/main/twirl/signinform.scala.html | 2 +- src/main/twirl/wiki/history.scala.html | 3 +- .../webapp/assets/common/css/gitbucket.css | 43 +++++-------------- 8 files changed, 27 insertions(+), 52 deletions(-) diff --git a/src/main/twirl/account/main.scala.html b/src/main/twirl/account/main.scala.html index b60fa2817..f571851d6 100644 --- a/src/main/twirl/account/main.scala.html +++ b/src/main/twirl/account/main.scala.html @@ -7,7 +7,7 @@
-
@account.userName
+
@account.userName
@if(account.url.isDefined){ diff --git a/src/main/twirl/index.scala.html b/src/main/twirl/index.scala.html index 99ccf2f41..ef8bd670d 100644 --- a/src/main/twirl/index.scala.html +++ b/src/main/twirl/index.scala.html @@ -18,7 +18,7 @@
- New repository + New repository
Your repositories (@userRepositories.size) @@ -30,7 +30,7 @@ } else { @userRepositories.map { repository => - + @if(repository.repository.isPrivate){ } @@ -62,7 +62,7 @@ } else { @recentRepositories.map { repository => - + @if(repository.repository.isPrivate){ } diff --git a/src/main/twirl/main.scala.html b/src/main/twirl/main.scala.html index c7d8e8861..592238a5a 100644 --- a/src/main/twirl/main.scala.html +++ b/src/main/twirl/main.scala.html @@ -46,15 +46,12 @@ @version.majorVersion.@version.minorVersion } -
- @repository.map { repository => - - - - } -
- + @repository.map { repository => + + + + } @if(loginAccount.isDefined){ @avatar(loginAccount.get.userName, 20) @loginAccount.get.userName diff --git a/src/main/twirl/newrepo.scala.html b/src/main/twirl/newrepo.scala.html index 5a0526a59..6d24a9c7a 100644 --- a/src/main/twirl/newrepo.scala.html +++ b/src/main/twirl/newrepo.scala.html @@ -32,7 +32,7 @@   Public
- All users and guests can read this repository. + All users and guests can read this repository.
@@ -41,7 +41,7 @@   Private
- Only collaborators can read this repository. + Only collaborators can read this repository.
@@ -50,7 +50,7 @@ Initialize this repository with a README
- This will allow you to git clone the repository immediately. + This will allow you to git clone the repository immediately.
diff --git a/src/main/twirl/settings/options.scala.html b/src/main/twirl/settings/options.scala.html index 4973bffaa..8cf505299 100644 --- a/src/main/twirl/settings/options.scala.html +++ b/src/main/twirl/settings/options.scala.html @@ -30,7 +30,7 @@ > Public
- All users and guests can read this repository. + All users and guests can read this repository.
@@ -42,7 +42,7 @@ > Private
- Only collaborators can read this repository. + Only collaborators can read this repository.
diff --git a/src/main/twirl/signinform.scala.html b/src/main/twirl/signinform.scala.html index 747aa71dc..8be7f177e 100644 --- a/src/main/twirl/signinform.scala.html +++ b/src/main/twirl/signinform.scala.html @@ -5,7 +5,7 @@ @if(systemSettings.allowAccountRegistration){
- Create new account + Create new account
} Sign in diff --git a/src/main/twirl/wiki/history.scala.html b/src/main/twirl/wiki/history.scala.html index 9dc1be2d2..22d0b37e6 100644 --- a/src/main/twirl/wiki/history.scala.html +++ b/src/main/twirl/wiki/history.scala.html @@ -37,8 +37,7 @@ @avatar(commit.committer, 20) @commit.committer - @datetime(commit.time): - @commit.shortMessage + @datetime(commit.time): @commit.shortMessage } diff --git a/src/main/webapp/assets/common/css/gitbucket.css b/src/main/webapp/assets/common/css/gitbucket.css index dface9e38..02964a8e6 100644 --- a/src/main/webapp/assets/common/css/gitbucket.css +++ b/src/main/webapp/assets/common/css/gitbucket.css @@ -1,11 +1,8 @@ -@import url(http://fonts.googleapis.com/css?family=Rambla:400,700,400italic,700italic|Pathway+Gothic+One|Roboto:400,400italic,700italic,700); - /****************************************************************************/ /* Common */ /****************************************************************************/ body { color: #333; - font-family: 'Roboto', sans-serif; } /* ======================================================================== */ @@ -44,8 +41,6 @@ div.nav-collapse a.menu-last { .navbar .brand { padding-top: 6px; padding-bottom: 6px; - font-family: 'Pathway Gothic One', sans-serif; - font-size: 27px; } .navbar .brand img { @@ -88,14 +83,6 @@ div.input-prepend span.add-on { border-radius: 0 4px 4px 0; } -.head i { - margin-top: 6px; -} - -.repo-list-item i { - margin-top: 2px; -} - /* div.input-prepend span.add-on a { color: #333; @@ -228,7 +215,7 @@ div.box-header-small { div.box-content { background-color: white; border: 1px solid #d8d8d8; - padding: 12px; + padding: 4px; } th.box-header { @@ -238,7 +225,6 @@ th.box-header { background-image: linear-gradient(#fafafa, #e0e0e0); background-repeat: repeat-x; margin: 0; - height: 25px; border-top-left-radius: 1px; border-top-right-radius: 1px; border: 1px solid #d8d8d8; @@ -253,7 +239,6 @@ th.metal { background-image: linear-gradient(#fafafa, #e8e8e8); background-repeat: repeat-x; margin: 0; - padding-left: 10px; border-top-left-radius: 1px; border-top-right-radius: 1px; } @@ -271,10 +256,6 @@ hr { margin-bottom: 4px; } -span.note { - margin-left: 20px; -} - img.avatar { border-radius: 4px; -webkit-border-radius: 4px; @@ -321,12 +302,12 @@ span.highlight { /* Create Repo */ /****************************************************************************/ .slash { - font-size: 25px; + font-size: 20px; } + /****************************************************************************/ /* Sign-in form */ /****************************************************************************/ - div.signin-form { width: 350px; margin: 30px auto; @@ -398,8 +379,6 @@ div.activity-icon-small { div.activity-content { margin-left: 40px; - padding-top: 2px; - padding-bottom: 2px; } /****************************************************************************/ @@ -426,8 +405,8 @@ table.table-file-list td { } th, td, .table th, .table td { - padding-top: 10px; - padding-bottom: 10px; + padding-top: 4px; + padding-bottom: 4px; } div.commit-avatar-image { @@ -486,7 +465,7 @@ span.issue-status { display: block; font-size: large; text-align: center; - padding: 16px; + padding: 8px; } table.table-issues { @@ -508,8 +487,8 @@ ul.label-list { ul.label-list a { padding-left: 6px; - padding-top: 7px; - padding-bottom: 7px; + padding-top: 4px; + padding-bottom: 4px; margin-bottom: 8px; color: #444; } @@ -593,7 +572,7 @@ span.milestone-percentage { } div.issue-header { - padding-left: 12px; + padding-left: 8px; padding-right: 8px; padding-top: 12px; padding-bottom: 12px; @@ -603,13 +582,13 @@ div.issue-info { border-top: 1px solid #e5e5e5; border-bottom: 1px solid #e5e5e5; background-color: #f5f5f5; - padding: 10px; + padding: 8px; margin-left: 0px; margin-right: 0px; } div.issue-content { - padding: 12px; + padding: 8px; background-color: #fbfbfb; }