aboutsummaryrefslogtreecommitdiff
path: root/public/ng/less
diff options
context:
space:
mode:
authorMichael Boke <michael@mbict.nl>2014-10-03 22:51:07 +0200
committerMichael Boke <michael@mbict.nl>2014-10-03 22:51:07 +0200
commitba1270df2d3d835b397317f133963e7b517242f1 (patch)
tree1265a142a1fd9951d30ae11648e7fbfb5806e594 /public/ng/less
parentba0feadc34400cb91ff23f66096884d862651cdd (diff)
parent405ee14711ab946bd709ec28a526890c40cbc03b (diff)
Merge remote-tracking branch 'upstream/master'
Conflicts: conf/app.ini
Diffstat (limited to 'public/ng/less')
-rw-r--r--public/ng/less/gogs.less3
-rw-r--r--public/ng/less/gogs/base.less13
-rw-r--r--public/ng/less/gogs/dashboard.less66
-rw-r--r--public/ng/less/gogs/external.less170
-rw-r--r--public/ng/less/gogs/issue.less59
-rw-r--r--public/ng/less/gogs/markdown.less26
-rw-r--r--public/ng/less/gogs/organization.less377
-rw-r--r--public/ng/less/gogs/profile.less57
-rw-r--r--public/ng/less/gogs/repository.less834
-rw-r--r--public/ng/less/gogs/settings.less16
-rw-r--r--public/ng/less/ui/alert.less14
-rw-r--r--public/ng/less/ui/form.less17
-rw-r--r--public/ng/less/ui/label.less8
-rw-r--r--public/ng/less/ui/reset.less16
14 files changed, 900 insertions, 776 deletions
diff --git a/public/ng/less/gogs.less b/public/ng/less/gogs.less
index a5cd26c4..2d9812da 100644
--- a/public/ng/less/gogs.less
+++ b/public/ng/less/gogs.less
@@ -7,4 +7,5 @@
@import "gogs/settings";
@import "gogs/issue";
@import "gogs/organization";
-@import "gogs/admin"; \ No newline at end of file
+@import "gogs/admin";
+@import "gogs/profile"; \ No newline at end of file
diff --git a/public/ng/less/gogs/base.less b/public/ng/less/gogs/base.less
index 241846db..f715ed06 100644
--- a/public/ng/less/gogs/base.less
+++ b/public/ng/less/gogs/base.less
@@ -17,9 +17,6 @@ body {
width: 16px;
text-align: center;
}
-.fa {
- font-size: 14px;
-}
.container {
max-width: 1170px;
padding: 0 1.5em;
@@ -30,6 +27,11 @@ img.avatar-16 {
height: 16px;
vertical-align: middle;
}
+img.avatar-20 {
+ width: 20px;
+ height: 20px;
+ vertical-align: middle;
+}
img.avatar-24 {
width: 24px;
height: 24px;
@@ -55,6 +57,11 @@ img.avatar-100{
height: 100px;
vertical-align: middle;
}
+.drop-down{
+ .panel-header{
+ font-size: 14px;
+ }
+}
#wrapper {
padding: 0;
margin: 0 0 -55px 0;
diff --git a/public/ng/less/gogs/dashboard.less b/public/ng/less/gogs/dashboard.less
index afef60cf..a40debe5 100644
--- a/public/ng/less/gogs/dashboard.less
+++ b/public/ng/less/gogs/dashboard.less
@@ -1,9 +1,7 @@
@import "../ui/var";
-
/*
-The dashboard page style
+ The dashboard page style
*/
-
@dashboardHeaderBorderColor: #D6D6D6;
@dashboardHeaderLinkColor: #444;
@dashboardHeaderLinkHoverColor: #D9453D;
@@ -14,14 +12,16 @@ The dashboard page style
#dashboard-header {
border-bottom: 1px solid @dashboardHeaderBorderColor;
height: 69px;
+ background-color: #FFF;
> .menu-line {
> li {
- padding: 12px 0;
+ padding: 12px 6px;
}
> li.right {
> a {
font-size: 1.2em;
color: @dashboardHeaderLinkColor;
+ padding: .4em .8em;
&:hover {
background-color: transparent;
color: @dashboardHeaderLinkHoverColor;
@@ -36,18 +36,15 @@ The dashboard page style
}
}
}
-
// dashboard context switch selection
#dashboard-selection-menu {
a img {
margin: -4px 10px 0 0;
}
}
-
#dashboard {
padding: 24px 0;
}
-
// dashboard sidebar contains contributed repositories panel,
// and my repositories panel
#dashboard-sidebar {
@@ -60,7 +57,6 @@ The dashboard page style
border-bottom-right-radius: .3em;
}
}
-
#dashboard-sidebar-menu {
border-top-left-radius: .3em;
border-top-right-radius: .3em;
@@ -70,8 +66,8 @@ The dashboard page style
margin-right: -1px;
border-bottom: none;
> a {
- padding-top: .4em;
- padding-bottom: .4em;
+ padding-top: .3em;
+ padding-bottom: .3em;
}
}
> li.first {
@@ -85,7 +81,7 @@ The dashboard page style
float: right;
}
width: 100%;
- height: 35px;
+ height: 32px;
> li.js-tab-nav-show {
background-color: #EEEEEE;
}
@@ -96,7 +92,6 @@ The dashboard page style
}
}
}
-
#dashboard-my-mirror,
#dashboard-my-org,
#dashboard-my-repo {
@@ -131,8 +126,10 @@ The dashboard page style
.repo-contrib-header {
border-top: 1px solid #d6d6d6;
}
+ .panel-header{
+ font-size: 14px;
+ }
}
-
#dashboard-my-repo {
.panel-header {
.octicon {
@@ -144,16 +141,14 @@ The dashboard page style
margin-left: 4px;
}
}
-
#dashboard-my-org,
#dashboard-my-mirror {
display: none;
}
-
// the button of new repository in my repositories panel
#dashboard-new-repo {
width: 50px;
- height: 35px;
+ height: 33px;
padding-top: 6px;
margin-right: 1px;
.octicon {
@@ -162,10 +157,9 @@ The dashboard page style
border-top-left-radius: .3em;
border-top-right-radius: .3em;
}
-
// the drop-down menu of #dashboard-new-repo
#dashboard-new-repo-menu {
- top: 35px;
+ top: 33px;
width: 180px;
background-color: #FFF;
left: -132px;
@@ -174,28 +168,26 @@ The dashboard page style
font-size: 1.1em;
}
}
-
#dashboard-selection-menu {
- width: auto;
- max-width: 300px;
- > .drop-down {
- top: 56px;
+ width: auto;
+ max-width: 300px;
+ > .drop-down {
+ top: 56px;
+ }
+ li {
+ white-space: nowrap;
+ &.checked {
+ .octicon {
+ opacity: 1;
+ }
}
- li {
- white-space: nowrap;
- &.checked {
- .octicon {
- opacity: 1;
- }
- }
- a {
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- overflow: hidden;
- }
+ a {
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
}
+ }
}
-
// the drop-down menu of #dashboard-selection-menu
#dashboard-switch-menu {
> li {
@@ -228,8 +220,8 @@ The dashboard page style
border-bottom-left-radius: .3em;
border-bottom-right-radius: .3em;
}
-
#dashboard-news {
+ padding-bottom: 60px;
.news {
margin-right: 2.4em;
.mega-octicon {
diff --git a/public/ng/less/gogs/external.less b/public/ng/less/gogs/external.less
index b8d2e551..407fc4f5 100644
--- a/public/ng/less/gogs/external.less
+++ b/public/ng/less/gogs/external.less
@@ -1,97 +1,105 @@
@import "base";
@import "../ui/var";
#promo-wrapper {
- padding-top: 50px;
- background-color: @headerBgColor;
+ padding-top: 50px;
+ background-color: @headerBgColor;
}
-
#promo-logo {
- img {
- max-width: 250px;
- }
- margin-right: 50px;
- padding-bottom: 50px;
+ margin-right: 50px;
+ padding-bottom: 50px;
+ img {
+ max-width: 250px;
+ }
}
-
#promo-content {
- color: #FFF;
- margin-left: 300px;
- h1,
- h2 {
- font-family: 'PT Sans Narrow', sans-serif;
- line-height: 60px;
- margin-bottom: 0;
- text-shadow: 0 2px 1px rgba(0, 0, 0, 0.5);
- }
- h1 {
- font-size: 96px;
- line-height: 96px;
- margin-bottom: 30px;
- }
- h2 {
- font-size: 52px;
- line-height: 70px;
- font-weight: normal;
- }
+ color: #FFF;
+ margin-left: 300px;
+ h1,
+ h2 {
+ font-family: 'PT Sans Narrow', sans-serif;
+ line-height: 60px;
+ margin-bottom: 0;
+ text-shadow: 0 2px 1px rgba(0, 0, 0, 0.5);
+ }
+ h1 {
+ font-size: 96px;
+ line-height: 96px;
+ margin-bottom: 30px;
+ }
+ h2 {
+ font-size: 52px;
+ line-height: 70px;
+ font-weight: normal;
+ }
}
-
#promo-form {
- padding: 40px 0;
- .ipt-large {
- border: none;
- border-radius: 4px;
- font-size: 18px;
- &:focus {
- box-shadow: 0 0 3px #FFF;
+ padding: 40px 0;
+ .ipt-large {
+ border: none;
+ border-radius: 4px;
+ font-size: 18px;
+ margin-right: 12px;
+ &:focus {
+ box-shadow: 0 0 3px #FFF;
+ }
+ }
+ .btn-large {
+ border-radius: 4px;
+ font-size: 18px;
+ margin-right: 12px;
}
- margin-right: 12px;
- }
- .btn-large {
- border-radius: 4px;
- font-size: 18px;
- margin-right: 12px;
- }
}
-
#promo-social {
- padding-bottom: 60px;
- .qq{
- box-shadow: 0 0 1px #1c6399;
- }
+ padding-bottom: 60px;
+ .qq{
+ box-shadow: 0 0 1px #1c6399;
+ }
}
-
#feature-wrapper {
- font-family: Lato, sans-serif;
- font-size: 18px;
- padding: 50px 0 100px 0;
- .octicon {
- color: @btnRedColor;
- font-size: 60px;
- height: 60px;
- width: 60px;
- line-height: 60px;
- margin-right: 12px;
- vertical-align: middle;
- display: inline-block;
- }
- b {
- color: #000;
- font-size: 24px;
- display: inline-block;
- line-height: 60px;
- }
- p {
- margin: 1em 0;
- line-height: 40px;
- padding-right: 30px;
- }
- a {
- color: @btnRedColor;
- &:hover {
- color: @btnHoverRedColor;
+ font-family: Lato, sans-serif;
+ font-size: 18px;
+ padding: 50px 0 100px 0;
+ .octicon {
+ color: @btnRedColor;
+ font-size: 60px;
+ height: 60px;
+ width: 60px;
+ line-height: 60px;
+ margin-right: 12px;
+ vertical-align: middle;
+ display: inline-block;
+ }
+ b {
+ color: #000;
+ font-size: 24px;
+ display: inline-block;
+ line-height: 60px;
+ }
+ p {
+ margin: 1em 0;
+ line-height: 40px;
+ padding-right: 30px;
+ }
+ a {
+ color: @btnRedColor;
+ &:hover {
+ color: @btnHoverRedColor;
+ }
+ }
+ .grid-1-2 {
+ margin-bottom: 30px;
+ }
+}
+#install-form {
+ padding: 15px;
+ label {
+ width: 35%;
+ }
+ input {
+ width: 30%;
+ }
+ input[type="checkbox"],
+ input[type="radio"] {
+ width: auto;
}
- }
- .grid-1-2 {
- margin-bottom: 30px;
- }
} \ No newline at end of file
diff --git a/public/ng/less/gogs/issue.less b/public/ng/less/gogs/issue.less
index ae481f0e..aaeb1af3 100644
--- a/public/ng/less/gogs/issue.less
+++ b/public/ng/less/gogs/issue.less
@@ -1,54 +1,26 @@
@import "../ui/var";
-
-.repo-issue-wrapper {
- padding: 18px 0;
-}
-
+// pull request main content
.pr-main {
- padding-right: 40px;
- box-sizing: border-box;
+ margin-right: 100px;
}
-
+// right bar in pull request page
.pr-sidebar {
border-left: 1px solid #DDD;
box-sizing: border-box;
+ position: absolute;
+ right: 0;
+ top: 12px;
}
-
-#pr-sidebar-nav {
- margin-top: 6px;
- li {
- margin-bottom: 4px;
- }
- li > a {
- border: 1px solid transparent;
- border-left: none;
- &:hover {
- background-color: #FFF;
- border-color: #DDD;
- }
- }
- .label {
- font-size: 12px;
- line-height: 1.4em;
- margin-top: 1px;
- }
- li.current {
- a {
- background-color: #FFF;
- border-color: #DDD;
- }
- }
-}
-
.pr-title {
.pr-num {
font-weight: normal;
color: #888;
}
+ padding: 4px 0;
}
-
.pr-meta {
color: #888;
+ padding: 4px 0 8px 0;
.pr-author {
margin: 0 8px;
color: #444;
@@ -62,7 +34,6 @@
padding: 4px 6px;
}
}
-
.pr-nav {
border-bottom: 1px solid #DDD;
margin-top: 16px;
@@ -89,7 +60,6 @@
}
}
}
-
.diff-bar {
.diff-add {
color: @btnGreenColor;
@@ -114,26 +84,22 @@
border-bottom-left-radius: .2em;
}
}
-
#pr-commit,
#pr-file-diff,
#issue-add-comment-preview {
display: none;
}
-
#pr-conversation-list {
padding-right: 30px;
box-sizing: border-box;
}
-
.issue-comment,
.issue-commit,
.issue-line,
.issue-merge,
.issue-add-comment {
- margin-bottom: 16px;
+ margin-bottom: 24px;
}
-
.issue-comment {
.author-avatar {
img {
@@ -165,7 +131,6 @@
}
}
}
-
.issue-commit {
line-height: 32px;
i, .author-avatar img {
@@ -181,7 +146,6 @@
line-height: 24px;
}
}
-
.issue-merge {
.ico {
width: 40px;
@@ -202,7 +166,6 @@
font-size: 13px;
}
}
-
.issue-merge-ok {
.ico {
background-color: #65AD4E;
@@ -217,12 +180,10 @@
color: darken(#65AD4E, 10%);
}
}
-
.issue-line {
height: 4px;
background-color: #E6E6E6;
}
-
.issue-add-comment {
.panel {
margin-left: 60px;
@@ -254,9 +215,9 @@
}
}
}
-
textarea#issue-add-content {
width: 100%;
box-sizing: border-box;
height: 120px;
+ resize: vertical;
} \ No newline at end of file
diff --git a/public/ng/less/gogs/markdown.less b/public/ng/less/gogs/markdown.less
index 898f8e77..72cd610a 100644
--- a/public/ng/less/gogs/markdown.less
+++ b/public/ng/less/gogs/markdown.less
@@ -26,7 +26,13 @@
margin-top: 0;
}
}
- > pre {
+ code {
+ padding: 0.2em 0.5em;
+ margin: 0;
+ background-color: rgba(0,0,0,0.04);
+ border-radius: 3px;
+ }
+ >pre {
font-size: 14px;
line-height: 1.6;
overflow: auto;
@@ -35,11 +41,24 @@
margin: 5px 0;
padding: 10px;
background-color: #f8f8f8;
+ code {
+ padding: 0;
+ background-color: inherit;
+ }
}
img {
padding: 10px 0;
max-width: 100%;
}
+ blockquote {
+ border-left: 4px solid #ddd;
+ margin-bottom: 16px;
+ p {
+ font-size: 14px;
+ padding: 5px 15px;
+ color: #777;
+ }
+ }
}
.markdown a {
color: #428BCA;
@@ -108,11 +127,6 @@
margin: 0 0 9px;
padding: 0 9px;
}
-.markdown blockquote,
-.markdown blockquote p {
- font-size: 14px;
- background-color: #f5f5f5;
-}
.markdown > pre.linenums {
padding: 0;
}
diff --git a/public/ng/less/gogs/organization.less b/public/ng/less/gogs/organization.less
index b6e31940..e2accbea 100644
--- a/public/ng/less/gogs/organization.less
+++ b/public/ng/less/gogs/organization.less
@@ -1,229 +1,232 @@
@import "../ui/var";
.org-header-alert .alert {
- margin-top: 10px;
+ margin-top: 10px;
}
.org-header {
- padding: 16px 0;
- background-color: #FFF;
- border-bottom: 1px solid #DDD;
- img {
- padding-right: 10px;
- }
+ padding: 16px 0;
+ background-color: #FFF;
+ border-bottom: 1px solid #DDD;
+ img {
+ padding-right: 10px;
+ }
}
#org-home-header {
- min-height: 100px;
+ min-height: 100px;
}
#org-header {
- height: 48px;
- .org-name {
- padding-left: 10px;
- font-size: 1.4em;
- height: 50px;
- line-height: 50px;
- margin-bottom: 0;
- }
- > div {
- > .menu-line {
- > li {
- &.right {
- > a {
- font-size: 1.2em;
- color: @dashboardHeaderLinkColor;
- &:hover {
- background-color: transparent;
- color: @dashboardHeaderLinkHoverColor;
- }
- .octicon {
- margin-right: 6px;
- }
- }
- .current {
- border-bottom: 2px solid #D26911;
- }
- }
- }
- }
- }
+ height: 48px;
+ .org-name {
+ padding-left: 10px;
+ font-size: 1.4em;
+ height: 50px;
+ line-height: 50px;
+ margin-bottom: 0;
+ }
+ > div {
+ > .menu-line {
+ > li {
+ &.right {
+ > a {
+ font-size: 1.2em;
+ color: @dashboardHeaderLinkColor;
+ &:hover {
+ background-color: transparent;
+ color: @dashboardHeaderLinkHoverColor;
+ }
+ .octicon {
+ margin-right: 4px;
+ }
+ .label{
+ margin-left: 4px;
+ }
+ }
+ .current {
+ border-bottom: 2px solid #D26911;
+ }
+ }
+ }
+ }
+ }
}
#org-home-header-info {
- padding-top: 10px;
- h2 {
- font-size: 30px;
- }
- ul {
- list-style: none;
- li {
- float: left;
- padding-right: 5px;
- }
- }
+ padding-top: 10px;
+ h2 {
+ font-size: 30px;
+ }
+ ul {
+ list-style: none;
+ li {
+ float: left;
+ padding-right: 5px;
+ }
+ }
}
#org-home-repo-list {
- padding: 10px 0;
+ padding: 10px 0;
}
#org-repo-list {
- padding: 10px 0;
- .org-repo-item {
- border-top: 1px solid #eee;
- padding: 30px 20px;
- .org-repo-status {
- list-style: none;
- color: #888;
- li {
- float: left;
- margin-right: 6px;
- }
- }
- h2 {
- margin-bottom: 5px;
- }
- .org-repo-description {
- margin: 0;
- font-size: 14px;
- color: #666;
- }
- .org-repo-updated {
- font-size: 12px;
- display: block;
- margin: 5px 0 0;
- color: #808080;
- }
- }
+ padding: 10px 0;
+ .org-repo-item {
+ border-top: 1px solid #eee;
+ padding: 30px 20px;
+ .org-repo-status {
+ list-style: none;
+ color: #888;
+ li {
+ float: left;
+ margin-right: 6px;
+ }
+ }
+ h2 {
+ margin-bottom: 5px;
+ }
+ .org-repo-description {
+ margin: 0;
+ font-size: 14px;
+ color: #666;
+ }
+ .org-repo-updated {
+ font-size: 12px;
+ display: block;
+ margin: 5px 0 0;
+ color: #808080;
+ }
+ }
}
.org-sidebar {
- margin: -80px 0 0 20px;
- .panel-footer {
- padding: .8em 1.2em;
- }
- .member-avatar-group {
- padding: 15px;
- img {
- width: 59px;
- height: 59px;
- border-radius: 3px;
- }
- }
+ margin: -80px 0 0 20px;
+ .panel-footer {
+ padding: .8em 1.2em;
+ }
+ .member-avatar-group {
+ padding: 15px;
+ img {
+ width: 59px;
+ height: 59px;
+ border-radius: 3px;
+ }
+ }
}
#org-home-team-list {
- padding: 0 15px;
- ul {
- list-style: none;
- padding-top: 10px;
- li {
- padding: 10px 0;
- border-bottom: 1px solid #eee;
- &:last-child {
- border-bottom: 0;
- }
- }
- }
+ padding: 0 15px;
+ ul {
+ list-style: none;
+ padding-top: 10px;
+ li {
+ padding: 10px 0;
+ border-bottom: 1px solid #eee;
+ &:last-child {
+ border-bottom: 0;
+ }
+ }
+ }
}
.team-name {
- display: block;
- font-size: 14px;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
+ display: block;
+ font-size: 14px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.team-meta {
- margin-top: 0;
- margin-bottom: 0;
- color: #777;
+ margin-top: 0;
+ margin-bottom: 0;
+ color: #777;
}
.org-toolbar {
- padding: 10px 0;
- border-bottom: 1px solid #eee;
+ padding: 10px 0;
+ border-bottom: 1px solid #eee;
}
#org-member-list {
- .org-member-item {
- height: 50px;
- line-height: 50px;
- border-bottom: 1px solid #eee;
- padding: 15px 20px;
- .member-name {
- padding-left: 15px;
- }
- ul {
- list-style: none;
- li {
- text-align: center;
- display: inline-block;
- }
- }
- }
+ .org-member-item {
+ height: 50px;
+ line-height: 50px;
+ border-bottom: 1px solid #eee;
+ padding: 15px 20px;
+ .member-name {
+ padding-left: 15px;
+ }
+ ul {
+ list-style: none;
+ li {
+ text-align: center;
+ display: inline-block;
+ }
+ }
+ }
}
.invite-box {
- padding: 50px 0;
- min-height: 130px;
- margin: 0 auto;
- width: 50%;
- input {
- width: 300px;
- }
+ padding: 50px 0;
+ min-height: 130px;
+ margin: 0 auto;
+ width: 50%;
+ input {
+ width: 300px;
+ }
}
#org-member-list-block {
- padding-top: 2px;
+ padding-top: 2px;
}
.org-team-list {
- .org-team-list-item {
- float: left;
- padding: 15px;
- width: 555px;
- .member-avatar-group {
- padding: 5px 15px;
- img {
- width: 38px;
- height: 38px;
- border-radius: 3px;
- }
- }
- }
+ .org-team-list-item {
+ float: left;
+ padding: 15px;
+ width: 555px;
+ .member-avatar-group {
+ padding: 5px 15px;
+ img {
+ width: 38px;
+ height: 38px;
+ border-radius: 3px;
+ }
+ }
+ }
}
#team-create-form {
- .note {
- margin-left: 153px;
- }
+ .note {
+ margin-left: 153px;
+ }
}
#org-team-card {
- .desc {
- font-size: 14px;
- padding: 10px 20px;
- }
- .team-stats {
- padding: 0 20px 10px 20px;
- text-transform: uppercase;
- border-bottom: 1px solid #dddddd;
- }
- .panel-footer {
- padding: 10px 20px;
- }
+ .desc {
+ font-size: 14px;
+ padding: 10px 20px;
+ }
+ .team-stats {
+ padding: 0 20px 10px 20px;
+ text-transform: uppercase;
+ border-bottom: 1px solid #dddddd;
+ }
+ .panel-footer {
+ padding: 10px 20px;
+ }
}
#team-repositories-list,
#team-members-list {
- .panel-body .search {
- padding: 4px 0 10px 10px;
- border-bottom: 1px solid #dddddd;
- }
- li {
- &.collab {
- padding-top: 10px !important;
- border-bottom: 1px solid #dddddd;
- }
- &:last-child {
- border-bottom: 0 !important;
- }
- }
+ .panel-body .search {
+ padding: 4px 0 10px 10px;
+ border-bottom: 1px solid #dddddd;
+ }
+ li {
+ &.collab {
+ padding-top: 10px !important;
+ border-bottom: 1px solid #dddddd;
+ }
+ &:last-child {
+ border-bottom: 0 !important;
+ }
+ }
}
#team-repositories-list {
- li {
- a .octicon {
- color: #888;
- }
- .member {
- color: @linkColor;
- font-size: 14px;
- height: 40px;
- line-height: 40px;
- }
- }
+ li {
+ a .octicon {
+ color: #888;
+ }
+ .member {
+ color: @linkColor;
+ font-size: 14px;
+ height: 40px;
+ line-height: 40px;
+ }
+ }
} \ No newline at end of file
diff --git a/public/ng/less/gogs/profile.less b/public/ng/less/gogs/profile.less
new file mode 100644
index 00000000..f618d260
--- /dev/null
+++ b/public/ng/less/gogs/profile.less
@@ -0,0 +1,57 @@
+.profile-avatar {
+ width: 200px;
+ height: 200px;
+ border-radius: 6px;
+}
+#profile-name {
+ padding: 10px 0;
+}
+#profile-fullname {
+ font-size: 1.6em;
+}
+#profile-username {
+ font-size: 1.6em;
+ font-weight: bold;
+}
+.profile-info {
+ padding: 0 50px;
+ font-size: 14px;
+ ul {
+ padding-bottom: 10px;
+ .list-group-item {
+ background-color: transparent;
+ padding-top: 5px;
+ color: #666;
+ }
+ .profile-rel {
+ width: 31%;
+ text-align: center;
+ display: inline-block;
+ strong {
+ display: block;
+ font-size: 28px;
+ font-weight: bold;
+ line-height: 1;
+ }
+ p {
+ font-size: 12px;
+ }
+ }
+ }
+}
+#profile-header {
+ li {
+ a {
+ font-size: 1.2em;
+ color: #444444;
+ padding: .4em .8em;
+ &:hover {
+ background-color: transparent;
+ color: @dashboardHeaderLinkHoverColor;
+ }
+ }
+ .current {
+ border-bottom: 2px solid #D26911;
+ }
+ }
+} \ No newline at end of file
diff --git a/public/ng/less/gogs/repository.less b/public/ng/less/gogs/repository.less
index 4a49ac43..daa8983b 100644
--- a/public/ng/less/gogs/repository.less
+++ b/public/ng/less/gogs/repository.less
@@ -6,457 +6,525 @@
/* repository main */
#repo-wrapper {
- padding-bottom: 100px;
+ padding-bottom: 100px;
}
#repo-header {
- height: 69px;
- border-bottom: 1px solid@repoHeaderBorderColor;
-
-background-color: @repoHeaderBgColor;
-
+ height: 69px;
+ border-bottom: 1px solid@repoHeaderBorderColor;
+ background-color: @repoHeaderBgColor;
}
#repo-header-name {
- line-height: 66px;
- color: @repoHeaderNameColor;
-
-font-size: 1.6em;
- font-weight: normal;
- margin-bottom: 0;
- i {
- margin-right: 12px;
- vertical-align: middle;
- }
- .divider {
- margin: 0 4px;
- }
+ line-height: 66px;
+ color: @repoHeaderNameColor;
+ font-size: 1.6em;
+ font-weight: normal;
+ margin-bottom: 0;
+ i {
+ margin-right: 12px;
+ vertical-align: middle;
+ }
+ .divider {
+ margin: 0 4px;
+ }
}
#repo-header-meta {
- line-height: 66px;
- li {
- > a {
- padding: 0;
- &:hover {
- background-color: transparent;
- }
- }
- }
- a > .btn {
- font-size: 1.05em;
- margin-left: 16px;
- i {
- margin-right: 6px;
- }
- line-height:16px;
- .num {
- margin-left: 6px;
- }
- }
+ line-height: 66px;
+ li {
+ > a {
+ padding: 0;
+ &:hover {
+ background-color: transparent;
+ }
+ }
+ }
+ a {
+ & > .btn {
+ line-height: 16px;
+ margin-left: 16px;
+ font-size: 13px;
+ i {
+ margin-right: 6px;
+ }
+ .num {
+ margin-left: 6px;
+ }
+ }
+ }
}
#repo-header-download-btn {
- > .btn > i {
- margin-right: 0 !important;
- }
- &:hover {
- &:after, .btn {
- background-color: @btnHoverBlackColor;
-
-color: #FFF;
- }
- }
- &:after {
- background-color: @btnBlackColor;
-
-padding: 9px 16px 8px 0;
- margin-left: -8px !important;
- color: #FFF;
- border-top: 1px solid@btnBlackColor;
-
-border-bottom: 1px solid@btnBlackColor;
-
-border-top-right-radius: .25em;
- border-bottom-right-radius: .25em;
- }
+ > .btn > i {
+ margin-right: 0 !important;
+ }
+ &:hover {
+ &:after, .btn {
+ background-color: @btnHoverBlackColor;
+ color: #FFF;
+ }
+ }
+ &:after {
+ background-color: @btnBlackColor;
+ padding: 9px 16px 8px 0;
+ margin-left: -8px !important;
+ color: #FFF;
+ border-top: 1px solid@btnBlackColor;
+ border-bottom: 1px solid@btnBlackColor;
+ border-top-right-radius: .25em;
+ border-bottom-right-radius: .25em;
+ }
}
#repo-header-download-drop {
- line-height: 24px;
- width: 440px;
- top: 50px;
- left: -354px;
- padding: 20px;
- box-sizing: border-box;
- .btn > i {
- margin-right: 6px;
- }
+ line-height: 24px;
+ width: 440px;
+ top: 50px;
+ left: -370px;
+ padding: 20px;
+ box-sizing: border-box;
+ z-index: 1;
+ .btn > i {
+ margin-right: 6px;
+ }
+ button,
+ input {
+ font-size: 11px;
+ }
}
#repo-content {
- padding: 18px 0;
+ padding: 18px 0;
+}
+.repo-wide-wrapper {
+ padding: 18px 0;
+ position: relative;
}
#repo-clone-url {
- border-right: none;
- width: 196px;
- border-left: none;
+ border-right: none;
+ width: 190px;
+ border-left: none;
}
#repo-clone-help {
- clear: both;
- line-height: 48px;
+ clear: both;
+ line-height: 48px;
}
#repo-clone-zip {
- line-height: 48px;
- a {
- cursor: pointer;
- color: white;
- overflow: visible;
- padding: .6em 1.2em;
- }
- .btn {
- margin: 0 6px;
- }
+ line-height: 48px;
+ a {
+ cursor: pointer;
+ color: white;
+ overflow: visible;
+ padding: .6em 1.2em;
+ }
+ .btn {
+ margin: 0 6px;
+ }
}
#repo-desc {
- font-size: 1.2em;
+ font-size: 1.2em;
+ .no-description{
+ color: #999;
+ }
}
#repo-sidebar-nav {
- .label {
- font-size: 12px;
- line-height: 1.4em;
- margin-top: 2px;
- }
- i {
- margin-right: 6px;
- }
+ .label {
+ font-size: 12px;
+ line-height: 1.4em;
+ margin-top: 2px;
+ }
+ i {
+ margin-right: 6px;
+ }
+}
+#repo-sidebar-mini {
+ margin-top: 6px;
+ width: 60px;
+ li {
+ margin-bottom: 4px;
+ }
+ li > a {
+ position: relative;
+ padding-left: 12px;
+ width: 24px;
+ text-align: center;
+ > i.octicon {
+ font-size: 21px;
+ }
+ }
+ .num {
+ position: absolute;
+ font-size: 12px;
+ top: 0;
+ left: 36px;
+ padding: 0 2px;
+ min-width: 16px;
+ height: 16px;
+ text-align: center;
+ line-height: 16px;
+ border-radius: 4px;
+ opacity: 0.7;
+ -webkit-transform: scale(0.9);
+ font-weight: bold;
+ }
}
#repo-file-nav {
- padding: .6em 0 1em 0;
- > li > a {
- padding-left: 0;
- &:hover {
- background-color: transparent;
- }
- }
- li.repo-jump > a {
- padding-right: 0;
- .btn {
- margin-left: -1px;
- }
- }
+ padding: .6em 0 1em 0;
+ > li > a {
+ padding-left: 0;
+ &:hover {
+ background-color: transparent;
+ }
+ }
+ li.repo-jump > a {
+ padding-right: 0;
+ .btn {
+ margin-left: -1px;
+ }
+ }
}
#repo-branch-switch {
- > a {
- .btn {
- padding-right: 30px;
- }
- &:after {
- position: absolute;
- top: 12px;
- right: 30px;
- margin-left: 0;
- color: @baseFontColor;
+ > a {
+ .btn {
+ padding-right: 30px;
+ }
+ &:after {
+ position: absolute;
+ top: 12px;
+ right: 30px;
+ margin-left: 0;
+ color: @baseFontColor;
- }
- }
- > .drop-down {
- top: 40px;
- left: 0;
- }
+ }
+ }
+ > .drop-down {
+ top: 40px;
+ left: 0;
+ }
}
#repo-branch-filter-ipt {
- width: 100%;
- border-left: none;
- border-right: none;
- box-sizing: border-box;
+ width: 100%;
+ border-left: none;
+ border-right: none;
+ box-sizing: border-box;
}
#repo-branch-tag {
- .tab-nav {
- border-bottom: 1px solid #EAEAEA;
- a {
- padding: .3em .8em;
- }
- .js-tab-nav-show {
- background-color: #EEE;
- font-weight: bold;
- }
- }
+ .tab-nav {
+ border-bottom: 1px solid #EAEAEA;
+ a {
+ padding: .3em .8em;
+ }
+ .js-tab-nav-show {
+ background-color: #EEE;
+ font-weight: bold;
+ }
+ }
+ .switching-list {
+ max-height: 300px;
+ overflow-y: auto;
+ }
}
#repo-branch-list,
#repo-tag-list {
- li {
- i {
- margin-right: 12px;
- opacity: 0;
- }
- }
- li.checked {
- i {
- opacity: 1;
- }
- }
-}
-#repo-tag-list {
- display: none;
+ li {
+ i {
+ margin-right: 12px;
+ opacity: 0;
+ }
+ }
+ li.checked {
+ i {
+ opacity: 1;
+ }
+ }
}
#repo-bread {
- .bread {
- padding-right: 0;
- font-size: 16px;
- font-weight: bold;
- }
+ .bread {
+ padding-right: 0;
+ font-size: 16px;
+ font-weight: bold;
+ }
}
#repo-main {
- padding-right: 40px;
- box-sizing: border-box;
+ padding-right: 40px;
+ box-sizing: border-box;
}
#repo-files-table {
- margin-bottom: 20px;
- th, td {
- text-align: left;
- line-height: 32px;
- }
- td.icon {
- width: 16px;
- padding-right: .1em;
- padding-left: 1em;
- }
- td.name {
- max-width: 120px;
- .text-truncate {
- max-width: 100%;
- }
- }
- td.age {
- max-width: 120px;
- text-align: right;
- }
- td.msg {
- max-width: 440px;
- .text-truncate {
- max-width: 100%;
- }
- }
- td.age,
- td.size,
- td.msg a {
- color: #888;
- }
- td.msg a:hover {
- color: #428BCA;
- text-decoration: underline;
- }
- tbody {
- background-color: #FFF;
- tr:hover {
- background-color: #ffffEE;
- }
- }
- thead {
- background-color: #F0F0F0;
- .author {
- a {
- margin: 0 .4em;
- }
- }
- .last-commit {
- strong {
- color: #444;
- }
- .text-truncate {
- margin-left: .4em;
- }
- }
- .last-commit .text-truncate,
- .age {
- font-weight: normal;
- color: #888;
- }
- }
-}
-#repo-readme {
- margin-bottom: 80px;
+ margin-bottom: 20px;
+ th, td {
+ text-align: left;
+ line-height: 32px;
+ }
+ td.icon {
+ width: 16px;
+ padding-right: .1em;
+ padding-left: 1em;
+ }
+ td.name {
+ max-width: 120px;
+ .text-truncate {
+ max-width: 100%;
+ }
+ }
+ td.age {
+ max-width: 120px;
+ text-align: right;
+ }
+ td.msg {
+ max-width: 440px;
+ .text-truncate {
+ max-width: 100%;
+ }
+ }
+ td.age,
+ td.size,
+ td.msg a {
+ color: #888;
+ }
+ td.msg a:hover {
+ color: #428BCA;
+ text-decoration: underline;
+ }
+ tbody {
+ background-color: #FFF;
+ tr:hover {
+ background-color: #ffffEE;
+ }
+ }
+ thead {
+ background-color: #F0F0F0;
+ .author {
+ a {
+ margin: 0 .4em;
+ }
+ }
+ .last-commit {
+ strong {
+ color: #444;
+ }
+ .text-truncate {
+ margin-left: .4em;
+ }
+ }
+ .last-commit .text-truncate,
+ .age {
+ font-weight: normal;
+ color: #888;
+ }
+ }
+}
+#repo-readme,
+#repo-read-file {
+ margin-bottom: 80px;
}
#repo-bare-start {
- margin-bottom: 100px;
- .panel-content {
- background-color: #FFF;
- }
- pre {
- margin: 0 40px;
- padding: 6px 10px;
- border: 1px solid #ddd;
- background: #f8f8f8;
- }
+ margin-bottom: 100px;
+ .panel-content {
+ background-color: #FFF;
+ }
+ pre {
+ margin: 0 40px;
+ padding: 6px 10px;
+ border: 1px solid #ddd;
+ background: #f8f8f8;
+ }
}
.repo-bare {
- #repo-bare-start {
- h2 {
- margin-top: 30px;
- margin-bottom: 24px;
- }
- }
- #repo-header-meta {
- display: none;
- }
- #repo-clone-ssh {
- margin-left: 200px;
- }
- #repo-clone-copy {
- margin-right: 200px;
- }
- #repo-clone-help {
- clear: both;
- width: 100%;
- }
- #repo-clone-url {
- width: 520px;
- }
+ #repo-bare-start {
+ h2 {
+ margin-top: 30px;
+ margin-bottom: 24px;
+ }
+ }
+ #repo-header-meta {
+ display: none;
+ }
+ #repo-clone-ssh {
+ margin-left: 200px;
+ }
+ #repo-clone-copy {
+ margin-right: 200px;
+ }
+ #repo-clone-help {
+ clear: both;
+ width: 100%;
+ }
+ #repo-clone-url {
+ width: 520px;
+ }
}
/* repository create */
#team-create-form,
#repo-migrate-form,
#repo-create-form {
- width: 800px;
- margin: 60px auto auto auto;
- background: white;
- h2 {
- margin: .5em 1em;
- }
- .field {
- margin: 1.2em 0 2em 0;
- }
- .ipt {
- width: 540px;
- }
- textarea {
- height: 120px;
- }
- .avatar {
- vertical-align: middle;
- margin-right: .6em;
- width: 28px;
- height: 28px;
- }
- &:hover {
- box-shadow: 0px 0px 6px #CCC;
- }
+ width: 800px;
+ margin: 60px auto auto auto;
+ background: white;
+ h2 {
+ margin: .5em 1em;
+ }
+ .field {
+ margin: 1.2em 0 2em 0;
+ }
+ .ipt {
+ width: 540px;
+ }
+ textarea {
+ height: 120px;
+ }
+ .avatar {
+ vertical-align: middle;
+ margin-right: .6em;
+ width: 28px;
+ height: 28px;
+ }
+ &:hover {
+ box-shadow: 0px 0px 6px #CCC;
+ }
}
#repo-create-cancel {
- margin-left: 4em;
+ margin-left: 4em;
}
#repo-create-owner-list {
- top: 30px;
- left: 0;
- width: auto;
- max-width: 300px;
- .octicon {
- margin-right: 12px;
- opacity: 0;
- }
- .avatar {
- width: 20px;
- height: 20px;
- }
- li {
- white-space: nowrap;
- &.checked {
- .octicon {
- opacity: 1;
- }
- }
- a {
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- overflow: hidden;
- }
- }
+ top: 30px;
+ left: 0;
+ width: auto;
+ max-width: 300px;
+ .octicon {
+ margin-right: 12px;
+ opacity: 0;
+ }
+ .avatar {
+ width: 20px;
+ height: 20px;
+ }
+ li {
+ white-space: nowrap;
+ &.checked {
+ .octicon {
+ opacity: 1;
+ }
+ }
+ a {
+ text-overflow: ellipsis;
+ -o-text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ }
}
.file-name {
- margin-left: 1em;
+ margin-left: 1em;
}
.file-size {
- font-size: 13px;
- color: #888;
- margin-left: 1em;
+ font-size: 13px;
+ color: #888;
+ margin-left: 1em;
}
.code-view {
- overflow: auto;
- overflow-x: auto;
- overflow-y: hidden;
- background: white;
- .view-raw {
- min-height: 40px;
- text-align: center;
- padding-top: 20px;
- .btn {
- font-size: 1.05em;
- line-height: 16px;
- padding: 6px 8px;
- }
- }
- table {
- width: 100%;
- td {
- padding: 0;
- }
- }
- .lines-num {
- text-align: right;
- color: #999;
- background: #f5f5f5;
- width: 1%;
- span {
- font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
- line-height: 18px;
- padding: 0 8px 0 10px;
- cursor: pointer;
- display: block;
- margin-top: 2px;
- font-size: 12px;
- }
- }
- .lines-code > pre {
- border: none;
- border-left: 1px solid #ddd;
- > ol.linenums > li {
- padding: 0 10px;
- &.active {
- background: #ffffdd;
- }
- }
- }
+ overflow: auto;
+ overflow-x: auto;
+ overflow-y: hidden;
+ background: white;
+ .view-raw {
+ min-height: 40px;
+ text-align: center;
+ padding-top: 20px;
+ .btn {
+ font-size: 1.05em;
+ line-height: 16px;
+ padding: 6px 8px;
+ }
+ }
+ table {
+ width: 100%;
+ td {
+ padding: 0;
+ }
+ }
+ .lines-num {
+ vertical-align: top;
+ text-align: right;
+ color: #999;
+ background: #f5f5f5;
+ width: 1%;
+ span {
+ font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+ line-height: 18px;
+ padding: 0 8px 0 10px;
+ cursor: pointer;
+ display: block;
+ margin-top: 2px;
+ font-size: 12px;
+ }
+ }
+ .lines-code > pre {
+ border: none;
+ border-left: 1px solid #ddd;
+ > ol.linenums > li {
+ padding: 0 10px;
+ &.active {
+ background: #ffffdd;
+ }
+ }
+ }
}
.repo-setting-zone {
- padding: 30px;
+ padding: 30px;
}
#team-repositories-list,
#team-members-list,
#repo-collab-list {
- list-style: none;
- padding: 10px 0 5px 0;
- li.collab {
- clear: both;
- height: 50px;
- padding: 0 15px 0 15px;
- }
- a.member {
- color: #444;
- height: 50px;
- line-height: 50px;
- &:hover {
- color: #4183C4;
- }
- }
- .avatar {
- margin-right: 1em;
- width: 40px;
- }
- .remove-collab {
- color: #DD4B39;
- }
+ list-style: none;
+ padding: 10px 0 5px 0;
+ li.collab {
+ clear: both;
+ height: 50px;
+ padding: 0 15px 0 15px;
+ }
+ a.member {
+ color: #444;
+ height: 50px;
+ line-height: 50px;
+ &:hover {
+ color: #4183C4;
+ }
+ }
+ .avatar {
+ margin-right: 1em;
+ width: 40px;
+ }
+ .remove-collab {
+ color: #DD4B39;
+ }
}
.repo-user-list-block {
- position: relative;
- top: 5px;
+ position: relative;
+ top: 5px;
}
.setting-list {
- width: 100%;
- list-style: none;
+ width: 100%;
+ list-style: none;
+}
+#commits-list {
+ padding-top: 20px;
+ h4{
+ line-height: 30px;
+ margin-bottom: 0;
+ }
+}
+.commit-list {
+ th {
+ background-color: #FFF;
+ line-height: 28px !important;
+ }
+ .date {
+ width: 120px;
+ }
+ .author {
+ padding-left: 20px;
+ min-width: 180px;
+ img {
+ margin-top: -4px;
+ }
+ }
+ .sha a {
+ font-family: Consolas, Menlo, Monaco, "Lucida Console", monospace;
+ font-size: 14px;
+ }
} \ No newline at end of file
diff --git a/public/ng/less/gogs/settings.less b/public/ng/less/gogs/settings.less
index b246a947..80c00f2d 100644
--- a/public/ng/less/gogs/settings.less
+++ b/public/ng/less/gogs/settings.less
@@ -34,7 +34,8 @@
#auth-setting-form,
#org-setting-form,
#repo-setting-form,
-#user-profile-form {
+#user-profile-form,
+.repo-setting-form {
background-color: #FFF;
padding: 30px 0;
textarea {
@@ -53,6 +54,17 @@
}
}
+#hook-type {
+ padding: 10px 0 0 0;
+ background-color: #fff;
+ .field {
+ margin-bottom: 24px;
+ }
+ label {
+ width: 240px;
+ }
+}
+
#repo-hooks-panel,
#repo-hooks-history-panel,
#user-social-panel,
@@ -109,4 +121,4 @@
.field {
margin-bottom: 24px;
}
-} \ No newline at end of file
+}
diff --git a/public/ng/less/ui/alert.less b/public/ng/less/ui/alert.less
index a52bc7f9..606c1114 100644
--- a/public/ng/less/ui/alert.less
+++ b/public/ng/less/ui/alert.less
@@ -41,7 +41,15 @@
border: 1px solid darken(@alertOrangeColor,10%);
background-color: lighten(@alertOrangeColor,45%);
}
-
-
-
+.white-popup-block {
+ background: #FFF;
+ padding: 20px 30px;
+ text-align: left;
+ max-width: 650px;
+ margin: 40px auto;
+ position: relative;
+ p {
+ font-size: 14px;
+ }
+}
diff --git a/public/ng/less/ui/form.less b/public/ng/less/ui/form.less
index 80d94866..4a681994 100644
--- a/public/ng/less/ui/form.less
+++ b/public/ng/less/ui/form.less
@@ -176,7 +176,6 @@ input[readonly] {
margin-bottom: 1em;
}
}
-
.form-align {
label,
.form-label {
@@ -189,10 +188,14 @@ input[readonly] {
margin-bottom: 1em;
}
}
-
-label.req {
- &:after {
- content: "*";
- color: @labelRedColor;
- }
+label {
+ &.text-left {
+ text-align: left;
+ }
+ &.req {
+ &:after {
+ content: "*";
+ color: @labelRedColor;
+ }
+ }
} \ No newline at end of file
diff --git a/public/ng/less/ui/label.less b/public/ng/less/ui/label.less
index a2a8a679..21a4c82d 100644
--- a/public/ng/less/ui/label.less
+++ b/public/ng/less/ui/label.less
@@ -16,11 +16,13 @@
.label-gray {
background-color: @labelGrayColor;
}
-
.label-green {
- background-color: @labelGreenColor;
+ background-color: @labelGreenColor;
+ &:hover {
+ background-color: @btnHoverGreenColor;
+ color: #FFF;
+ }
}
-
.label-orange {
background-color: @labelOrangeColor;
}
diff --git a/public/ng/less/ui/reset.less b/public/ng/less/ui/reset.less
index 36906ce5..0e7a50e4 100644
--- a/public/ng/less/ui/reset.less
+++ b/public/ng/less/ui/reset.less
@@ -193,22 +193,19 @@ code,
kbd,
pre,
samp {
- font-family: monospace, monospace;
- font-size: 1em;
+ font-family: monospace, monospace;
+ font-size: 1em;
}
.text-left {
text-align: left;
}
-
.text-right {
text-align: right;
}
-
.text-center {
text-align: center;
}
-
.list-no-style {
list-style: none;
}
@@ -342,15 +339,6 @@ hr {
border-bottom: 1px solid @hrColor;
margin-bottom: .75em;
}
-
-// code element
-
-p {
- code {
- color: @inlineCodeColor;
- }
-}
-
// radius element
.radius {