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/_files.scss1
-rw-r--r--web/sass-files/sass/partials/_navbar.scss6
-rw-r--r--web/sass-files/sass/partials/_post.scss178
-rw-r--r--web/sass-files/sass/partials/_post_right.scss14
-rw-r--r--web/sass-files/sass/partials/_responsive.scss15
-rw-r--r--web/sass-files/sass/partials/_settings.scss4
-rw-r--r--web/sass-files/sass/partials/_tutorial.scss7
7 files changed, 135 insertions, 90 deletions
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index d3ab3b9f8..49fb8e847 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -1,5 +1,6 @@
.preview-container {
position: relative;
+ margin-top: 10px;
width: 100%;
max-height: 110px;
height: 110px;
diff --git a/web/sass-files/sass/partials/_navbar.scss b/web/sass-files/sass/partials/_navbar.scss
index 2e78a8728..c06feffcf 100644
--- a/web/sass-files/sass/partials/_navbar.scss
+++ b/web/sass-files/sass/partials/_navbar.scss
@@ -96,9 +96,9 @@
}
.badge-notify {
- background:red;
+ background: red;
position: absolute;
- right: -5px;
- top: -5px;
+ left: 4px;
+ top: 3px;
z-index: 100;
}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 36f6f445e..79a97fbf9 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -46,7 +46,22 @@ body.ios {
.textarea-wrapper {
position:relative;
- min-height:37px;
+ min-height: 36px;
+ .textbox-preview-area {
+ position: absolute;
+ z-index: 2;
+ top: 0;
+ left: 0;
+ box-shadow: none;
+ }
+ .textbox-preview-link {
+ position: absolute;
+ z-index: 3;
+ bottom: -23px;
+ right: 0;
+ font-size: 13px;
+ cursor: pointer;
+ }
}
.date-separator, .new-separator {
@@ -324,9 +339,9 @@ body.ios {
}
}
.msg-typing {
- min-height: 20px;
- line-height: 18px;
- display: inline-block;
+ min-height: 25px;
+ line-height: 25px;
+ display: block;
font-size: 13px;
@include opacity(0.7);
}
@@ -496,6 +511,9 @@ body.ios {
border-bottom-left-radius: 4px;
@include opacity(.3);
}
+ &.tex .katex-display {
+ text-align: left;
+ }
code {
white-space: pre;
}
@@ -612,79 +630,79 @@ body.ios {
}
.attachment {
- .attachment__content {
- border-width: 1px;
- border-style: solid;
- border-radius: 4px;
- padding: 2px 5px;
- margin: 0 0 5px 0;
- }
- .attachment__thumb-pretext {
- border: 0 none;
- background: transparent;
- }
- .attachment__container {
- border-left-width: 4px;
- border-left-style: solid;
- padding: 2px 0 2px 10px;
- &.attachment__container--good {
- border-left-color: #00C100;
- }
- &.attachment__container--warning {
- border-left-color: #DEDE01;
- }
- &.attachment__container--danger {
- border-left-color: #E40303;
- }
- }
- .attachment__body {
- float: left;
- width: 80%;
- padding-right: 5px;
- &.attachment__body--no_thumb {
- width: 100%;
- }
- }
- .attachment__text p:last-of-type {
- display: inline-block;
- }
- .attachment__thumb-pretext {
- margin-left: 5px;
- }
- .attachment__title {
- margin: 5px 0;
- padding: 0;
- line-height: 16px;
- font-size: 16px;
- a {
- font-size: 16px;
- }
- }
- .attachment__author-icon {
- @include border-radius(50px);
- margin-right: 5px;
- width: 14px;
- height: 14px;
- }
- .attachment__image {
- max-width: 100%;
- margin-bottom: 1em;
- }
- .attachment__thumb-container {
- width: 20%;
- float: right;
- img {
- max-height: 75px;
- max-width: 100%;
- }
- }
- .attachment___fields {
- width: 100%;
- .attachment___field-caption {
- font-weight: 700;
- }
- .attachment___field p {
- margin: 0;
- }
- }
-} \ No newline at end of file
+ .attachment__content {
+ border-width: 1px;
+ border-style: solid;
+ border-radius: 4px;
+ padding: 2px 5px;
+ margin: 0 0 5px 0;
+ }
+ .attachment__thumb-pretext {
+ border: 0 none;
+ background: transparent;
+ }
+ .attachment__container {
+ border-left-width: 4px;
+ border-left-style: solid;
+ padding: 2px 0 2px 10px;
+ &.attachment__container--good {
+ border-left-color: #00C100;
+ }
+ &.attachment__container--warning {
+ border-left-color: #DEDE01;
+ }
+ &.attachment__container--danger {
+ border-left-color: #E40303;
+ }
+ }
+ .attachment__body {
+ float: left;
+ width: 80%;
+ padding-right: 5px;
+ &.attachment__body--no_thumb {
+ width: 100%;
+ }
+ }
+ .attachment__text p:last-of-type {
+ display: inline-block;
+ }
+ .attachment__thumb-pretext {
+ margin-left: 5px;
+ }
+ .attachment__title {
+ margin: 5px 0;
+ padding: 0;
+ line-height: 16px;
+ font-size: 16px;
+ a {
+ font-size: 16px;
+ }
+ }
+ .attachment__author-icon {
+ @include border-radius(50px);
+ margin-right: 5px;
+ width: 14px;
+ height: 14px;
+ }
+ .attachment__image {
+ max-width: 100%;
+ margin-bottom: 1em;
+ }
+ .attachment__thumb-container {
+ width: 20%;
+ float: right;
+ img {
+ max-height: 75px;
+ max-width: 100%;
+ }
+ }
+ .attachment___fields {
+ width: 100%;
+ .attachment___field-caption {
+ font-weight: 700;
+ }
+ .attachment___field p {
+ margin: 0;
+ }
+ }
+}
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index 91f9355de..ba41d3b95 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -13,6 +13,7 @@
&.post--root {
padding: 1em 1em 0;
margin: 0 0 1em;
+ width: 100%;
hr {
border-color: #DDD;
margin: 1em 0 0 0;
@@ -21,6 +22,7 @@
}
.post-create__container {
+ width: 100%;
margin-top: 10px;
.textarea-wrapper {
min-height: 100px;
@@ -31,10 +33,18 @@
.msg-typing {
@include opacity(0.7);
float: left;
- padding-top: 17px;
+ margin-top: 3px;
+ font-size: 13px;
+ line-height: 20px;
+ min-width: 1px;
+ display: block;
+ height: 20px;
+ max-width: 200px;
+ @include clearfix;
}
.post-create-footer {
- padding-top: 10px;
+ width: 100%;
+ padding-top: 5px;
}
.post-right-comments-upload-in-progress {
padding: 6px 0;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 339412b45..cb140dce6 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -507,8 +507,16 @@
form {
padding: 0;
}
+ .post-create-footer {
+ .msg-typing {
+ margin-left: 45px;
+ width: 55%;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ }
+ }
.post-create-body {
- padding-bottom: 10px;
display: table;
width: 100%;
.post-body__cell {
@@ -532,11 +540,10 @@
display: table-cell;
}
}
- .post-create-footer .msg-typing {
- display: none;
- }
}
.preview-container {
+ padding: 0px 10px;
+ margin-top: 20px;
.preview-div {
margin-top: 0;
}
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index b304450bc..0d75a42df 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -64,6 +64,10 @@
}
}
}
+ .profile-img {
+ width: 128px;
+ height: 128px;
+ }
.settings-table {
display: table;
table-layout: fixed;
diff --git a/web/sass-files/sass/partials/_tutorial.scss b/web/sass-files/sass/partials/_tutorial.scss
index a6e16fe37..cfbc3454a 100644
--- a/web/sass-files/sass/partials/_tutorial.scss
+++ b/web/sass-files/sass/partials/_tutorial.scss
@@ -162,7 +162,7 @@
}
.btn-primary {
position: absolute;
- bottom: 0;
+ bottom: 0px;
}
}
h1 {
@@ -179,6 +179,11 @@
position: absolute;
bottom: 40px;
}
+ .tutorial-skip {
+ position: absolute;
+ bottom: 7px;
+ left: 80px;
+ }
}
.tutorial__circles {