summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_admin-console.scss59
-rw-r--r--web/sass-files/sass/partials/_headers.scss2
-rw-r--r--web/sass-files/sass/partials/_popover.scss40
-rw-r--r--web/sass-files/sass/partials/_post.scss8
-rw-r--r--web/sass-files/sass/partials/_statistics.scss84
-rw-r--r--web/sass-files/sass/styles.scss1
6 files changed, 114 insertions, 80 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index 9c65e2d1e..206d5bfca 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -2,63 +2,16 @@
> div {
height: 100%;
}
- .table {
- background: #fff;
- }
-
- .total-count {
- width: 175px;
- height: 100px;
- border: 1px solid #ddd;
- padding: 22px 10px 10px 10px;
- margin: 10px 10px 10px 10px;
- background: #fff;
- float: left;
-
- > div {
- font-size: 18px;
- font-weight: 300;
- }
- }
-
- .total-count-by-day {
- width: 760px;
- height: 275px;
- border: 1px solid #ddd;
- padding: 5px 10px 10px 10px;
- margin: 10px 10px 10px 10px;
- background: #fff;
- clear: both;
- > div {
- font-size: 18px;
- font-weight: 300;
- }
+ h3 {
+ font-weight: 600;
+ border-bottom: 1px solid #ddd;
+ padding-bottom: 0.5em;
+ margin: 1em 0;
}
- .recent-active-users {
- width: 365px;
- border: 1px solid #ddd;
- padding: 5px 10px 10px 10px;
- margin: 10px 10px 10px 10px;
+ .table {
background: #fff;
- float: left;
-
- > div {
- font-size: 18px;
- font-weight: 300;
- }
-
- > table {
- margin: 10px 10px 10px 10px;
- }
-
- .recent-active-users-td {
- font-size: 14px;
- font-weight: 300;
- border: 1px solid #ddd;
- padding: 3px 3px 3px 5px;
- }
}
.sidebar--left {
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index 8bf163f90..7e776bf76 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -215,7 +215,7 @@
color: #999;
cursor: pointer;
.fa {
- margin-left: 3px;
+ margin-left: 4px;
font-size: 16px;
}
}
diff --git a/web/sass-files/sass/partials/_popover.scss b/web/sass-files/sass/partials/_popover.scss
index 4f5f1d215..430813e63 100644
--- a/web/sass-files/sass/partials/_popover.scss
+++ b/web/sass-files/sass/partials/_popover.scss
@@ -41,6 +41,9 @@
padding: 6px 8px;
margin: 3px 0;
@include border-radius(2px);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
&:hover {
background: rgba(black, 0.1);
@@ -94,33 +97,20 @@
#member-list-popover {
max-width: initial;
- .popover-content > div {
+ .popover-content {
+ position: relative;
+ padding: 0;
+ width: 260px;
max-height: 350px;
- overflow-y: auto;
- overflow-x: hidden;
- > div {
- border-bottom: 1px solid rgba(51,51,51,0.1);
- padding: 8px 8px 8px 15px;
+ .text-nowrap {
+ padding: 6px 10px;
width: 100%;
- box-sizing: content-box;
- @include clearfix;
- .profile-img {
- border-radius: 50px;
- margin-right: 8px;
- }
- .more-name {
- font-weight: 600;
- font-size: 0.95em;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- .more-description {
- @include opacity(0.7);
- }
- .profile-action {
- margin-left: 8px;
- margin-right: 18px;
- }
+ overflow: hidden;
+ line-height: 26px;
+ font-size: 13px;
+ }
+ .more-name {
+ margin-left: 6px;
}
}
}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 414ab0554..11816efd9 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -398,11 +398,17 @@ body.ios {
}
p {
margin: 0 0 1em;
- line-height: 1.6em;
+ line-height: 1.6em;
font-size: 0.97em;
white-space: pre-wrap;
}
+ span {
+ p:last-child {
+ margin-bottom: 0.5em;
+ }
+ }
+
.post-loading-gif {
height:10px;
width:10px;
diff --git a/web/sass-files/sass/partials/_statistics.scss b/web/sass-files/sass/partials/_statistics.scss
new file mode 100644
index 000000000..a2401a70f
--- /dev/null
+++ b/web/sass-files/sass/partials/_statistics.scss
@@ -0,0 +1,84 @@
+.team_statistics {
+ .total-count {
+ margin: 1em 0;
+ text-align: center;
+ background: #fff;
+ border: 1px solid #ddd;
+ width: 100%;
+ @include border-radius(3px);
+
+ .title {
+ font-weight: 400;
+ padding: 7px 10px;
+ border-bottom: 1px solid #ddd;
+ text-align: left;
+
+ .fa {
+ float: right;
+ margin: 3px 0 0;
+ color: #555;
+ font-size: 16px;
+ }
+
+ }
+
+ .content {
+ font-size: 30px;
+ font-weight: 600;
+ color: #555;
+ padding: 0.3em 0 0.35em;
+ overflow: auto;
+ }
+
+ }
+
+ .total-count--day {
+ width: 760px;
+ height: 275px;
+ border: 1px solid #ddd;
+ padding: 5px 10px 10px 10px;
+ margin: 10px 10px 10px 10px;
+ background: #fff;
+ clear: both;
+
+ > div {
+ font-size: 18px;
+ font-weight: 300;
+ }
+ }
+
+ .recent-active-users {
+
+ table {
+ width: 100%;
+ table-layout: fixed;
+ }
+
+ .content {
+ max-height: 400px;
+ overflow: auto;
+ padding: 0;
+ }
+
+ tr {
+ &:first-child {
+ td {
+ border-top: none;
+ }
+ }
+ td {
+ font-weight: 400;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ font-size: 13px;
+ border-left: 1px solid #ddd;
+ border-top: 1px solid #ddd;
+ padding: 5px 5px 6px;
+ @include clearfix;
+ &:first-child {
+ border-left: none;
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index c614052da..ad2cae194 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -38,6 +38,7 @@
@import "partials/loading";
@import "partials/get-link";
@import "partials/markdown";
+@import "partials/statistics";
// Responsive Css
@import "partials/responsive";