summaryrefslogtreecommitdiffstats
path: root/public
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-08-15 18:29:41 +0800
committerUnknwon <joe2010xtmf@163.com>2014-08-15 18:29:41 +0800
commit36b4c57ff13198196134b853f624fb633061734d (patch)
treee973d2aad41823e50c951a08ec8742030141d675 /public
parent3e32b14ad4da2db1b05eeec73936dbbe79cecc45 (diff)
downloadgitea-36b4c57ff13198196134b853f624fb633061734d.tar.gz
gitea-36b4c57ff13198196134b853f624fb633061734d.zip
Finish new organization members and invitation page
Diffstat (limited to 'public')
-rw-r--r--public/ng/css/gogs.css52
-rw-r--r--public/ng/less/gogs/dashboard.less1
-rw-r--r--public/ng/less/gogs/organization.less61
-rw-r--r--public/ng/less/ui/label.less6
4 files changed, 117 insertions, 3 deletions
diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css
index 93a5d2f8c9..e7a3a66f26 100644
--- a/public/ng/css/gogs.css
+++ b/public/ng/css/gogs.css
@@ -851,6 +851,7 @@ The dashboard page style
margin-left: 1em;
}
#dashboard-news .push-news .news-content li img {
+ vertical-align: inherit;
margin-bottom: -2px;
}
/*
@@ -1691,6 +1692,30 @@ textarea#issue-add-content {
#org-home-header {
min-height: 100px;
}
+#org-header {
+ height: 48px;
+}
+#org-header .org-name {
+ padding-left: 10px;
+ font-size: 1.4em;
+ height: 50px;
+ line-height: 50px;
+ margin-bottom: 0;
+}
+#org-header > div > .menu-line > li.right > a {
+ font-size: 1.2em;
+ color: #444444;
+}
+#org-header > div > .menu-line > li.right > a:hover {
+ background-color: transparent;
+ color: #d9453d;
+}
+#org-header > div > .menu-line > li.right > a .octicon {
+ margin-right: 6px;
+}
+#org-header > div > .menu-line > li.right .current {
+ border-bottom: 2px solid #D26911;
+}
#org-home-header-info {
padding-top: 10px;
}
@@ -1776,3 +1801,30 @@ textarea#issue-add-content {
margin-bottom: 0;
color: #777;
}
+#org-member-toolbar {
+ padding: 10px 0;
+}
+#org-member-list .org-member-item {
+ height: 50px;
+ line-height: 50px;
+ border-top: 1px solid #eee;
+ padding: 15px 20px;
+}
+#org-member-list .org-member-item .member-name {
+ padding-left: 15px;
+}
+#org-member-list .org-member-item ul {
+ list-style: none;
+}
+#org-member-list .org-member-item ul li {
+ text-align: center;
+ display: inline-block;
+}
+.invite-box {
+ padding: 50px 0;
+ min-height: 130px;
+ text-align: center;
+}
+.invite-box input {
+ width: 250px;
+}
diff --git a/public/ng/less/gogs/dashboard.less b/public/ng/less/gogs/dashboard.less
index f8838ae6fd..6bf1150ba7 100644
--- a/public/ng/less/gogs/dashboard.less
+++ b/public/ng/less/gogs/dashboard.less
@@ -251,6 +251,7 @@ The dashboard page style
.news-content li {
margin-left: 1em;
img {
+ vertical-align: inherit;
margin-bottom: -2px;
}
}
diff --git a/public/ng/less/gogs/organization.less b/public/ng/less/gogs/organization.less
index ed8c05397a..cbdec3132e 100644
--- a/public/ng/less/gogs/organization.less
+++ b/public/ng/less/gogs/organization.less
@@ -9,6 +9,38 @@
#org-home-header {
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;
+ }
+ }
+ }
+ }
+ }
+}
#org-home-header-info {
padding-top: 10px;
h2 {
@@ -93,4 +125,33 @@
margin-top: 0;
margin-bottom: 0;
color: #777;
+}
+#org-member-toolbar {
+ padding: 10px 0;
+}
+#org-member-list {
+ .org-member-item {
+ height: 50px;
+ line-height: 50px;
+ border-top: 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;
+ text-align: center;
+ input {
+ width: 250px;
+ }
} \ No newline at end of file
diff --git a/public/ng/less/ui/label.less b/public/ng/less/ui/label.less
index 1cf0a81d85..a2a8a67905 100644
--- a/public/ng/less/ui/label.less
+++ b/public/ng/less/ui/label.less
@@ -1,8 +1,8 @@
@import "var";
.label {
- padding: 2px 6px;
- color: @labelFontColor;
+ padding: 2px 6px;
+ color: @labelFontColor;
}
.label-red {
@@ -30,7 +30,7 @@
}
.label-radius{
- border-radius: .2em;
+ border-radius: .2em;
}
.label-link{