summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials
diff options
context:
space:
mode:
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r--web/sass-files/sass/partials/_access-history.scss29
-rw-r--r--web/sass-files/sass/partials/_activity-log.scss31
-rw-r--r--web/sass-files/sass/partials/_headers.scss15
-rw-r--r--web/sass-files/sass/partials/_responsive.scss46
-rw-r--r--web/sass-files/sass/partials/_settings.scss11
5 files changed, 123 insertions, 9 deletions
diff --git a/web/sass-files/sass/partials/_access-history.scss b/web/sass-files/sass/partials/_access-history.scss
new file mode 100644
index 000000000..f54c9a122
--- /dev/null
+++ b/web/sass-files/sass/partials/_access-history.scss
@@ -0,0 +1,29 @@
+.access-history__table {
+ display: table;
+ width: 100%;
+ padding-top: 15px;
+ line-height: 1.6;
+ &:first-child {
+ padding: 0;
+ }
+ > div {
+ display: table-cell;
+ vertical-align: top;
+ }
+ .access__date {
+ font-weight: 600;
+ font-size: 16px;
+ width: 190px;
+ }
+ .access__report {
+ border-bottom: 1px solid #ddd;
+ padding-bottom: 15px;
+ }
+ .report__time {
+ font-weight: 600;
+ font-size: 16px;
+ }
+ .report__info {
+ color: #999;
+ }
+} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_activity-log.scss b/web/sass-files/sass/partials/_activity-log.scss
new file mode 100644
index 000000000..36eb48750
--- /dev/null
+++ b/web/sass-files/sass/partials/_activity-log.scss
@@ -0,0 +1,31 @@
+.activity-log__table {
+ display: table;
+ width: 100%;
+ line-height: 1.8;
+ border-top: 1px solid #DDD;
+ padding: 15px 0;
+ &:first-child {
+ padding-top: 0;
+ border: none;
+ }
+ > div {
+ display: table-cell;
+ vertical-align: top;
+ }
+ .activity-log__report {
+ width: 80%;
+ }
+ .activity-log__action {
+ text-align: right;
+ }
+ .report__platform {
+ font-size: 16px;
+ font-weight: 600;
+ .fa {
+ margin-right: 6px;
+ }
+ }
+ .report__info {
+ color: #999;
+ }
+} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index adeaa70d7..eab4becac 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -44,14 +44,16 @@
white-space: normal;
}
}
+
}
.channel-intro {
padding-bottom:5px;
margin: 0 1em 35px;
+ max-width: 850px;
border-bottom: 1px solid lightgrey;
.intro-links {
- margin: 0.5em 1.5em 0 0;
+ margin: 0 1.5em 10px 0;
display: inline-block;
.fa {
margin-right: 5px;
@@ -64,8 +66,15 @@
.channel-intro-img {
float:left;
}
- .channel-intro-title {
+ .channel-intro__title {
font-weight:600;
+ font-size: 20px;
+ margin-bottom: 15px;
+ }
+ .channel-intro__content {
+ background: #f7f7f7;
+ padding: 10px 15px;
+ @include border-radius(3px);
}
.channel-intro-text {
margin-top:35px;
@@ -106,9 +115,9 @@
height: 36px;
float: left;
@include border-radius(36px);
+ margin-right: 6px;
}
.header__info {
- padding-left: 42px;
color: #fff;
}
.team__name, .user__name {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index b3d3cd7ea..d8a8fd982 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -89,6 +89,9 @@
max-width: 810px;
}
}
+ .channel-intro {
+ max-width: 810px;
+ }
.date-separator, .new-separator {
&.hovered--comment {
&:before, &:after {
@@ -214,6 +217,12 @@
}
}
+@media (min-width: 992px){
+ .modal-lg {
+ width: 700px;
+ }
+}
+
@media screen and (min-width: 768px) {
.second-bar {
display: none;
@@ -252,11 +261,11 @@
}
}
}
- .post-header .post-header-col.post-header__reply {
- .dropdown-toggle:after {
- content: '...';
- }
- }
+ .post-header .post-header-col.post-header__reply {
+ .dropdown-toggle:after {
+ content: '...';
+ }
+ }
}
.signup-team__container {
padding: 30px 0;
@@ -640,6 +649,33 @@
padding: 9px 21px 10px 10px !important;
}
}
+@media screen and (max-width: 640px) {
+ .access-history__table {
+ > div {
+ display: block;
+ }
+ .access__report {
+ margin: 0 0 15px 15px;
+ }
+ .access__date {
+ div {
+ margin-bottom: 15px;
+ }
+ }
+ }
+ .activity-log__table {
+ > div {
+ display: block;
+ }
+ .activity-log__report {
+ width: 100%;
+ }
+ .activity-log__action {
+ text-align: left;
+ margin-top: 10px;
+ }
+ }
+}
@media screen and (max-width: 480px) {
.modal {
.modal-body {
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index e60bc290e..b8dc9e997 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -1,3 +1,6 @@
+@import "access-history";
+@import "activity-log";
+
.user-settings {
background: #fff;
min-height:300px;
@@ -32,6 +35,12 @@
display: table-cell;
vertical-align: top;
}
+ .security-links {
+ margin-right: 20px;
+ .fa {
+ margin-right: 6px;
+ }
+ }
.settings-links {
width: 180px;
background: #FAFAFA;
@@ -223,4 +232,4 @@
.color-btn {
margin:4px;
-}
+} \ No newline at end of file