summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-09 10:55:53 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-09 10:55:53 -0400
commit2c67b4db61fb896854906c096b02290935fb9c7f (patch)
tree3b9e78b36ebf02246349e51bd4a31eb703ba246a /web/sass-files/sass
parent12f3c877f1b70869398f9318c1b81bfdf5080a43 (diff)
parent9d3f67dddb96d851f5cf448d7ba85e24c7949451 (diff)
downloadchat-2c67b4db61fb896854906c096b02290935fb9c7f.tar.gz
chat-2c67b4db61fb896854906c096b02290935fb9c7f.tar.bz2
chat-2c67b4db61fb896854906c096b02290935fb9c7f.zip
Merge pull request #625 from asaadmahmoodspin/ui-changes
UI changes for various tickets
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_modal.scss4
-rw-r--r--web/sass-files/sass/partials/_post.scss2
-rw-r--r--web/sass-files/sass/partials/_responsive.scss9
-rw-r--r--web/sass-files/sass/partials/_settings.scss16
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss4
5 files changed, 25 insertions, 10 deletions
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index dec08b567..29e05f6bf 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -63,7 +63,6 @@
margin: 0;
}
button.close {
- margin: -2px -2px 0 0;
color: #fff;
@include opacity(1);
z-index: 5;
@@ -71,7 +70,8 @@
height: 30px;
line-height: 30px;
@include single-transition(all, 0.25s, ease-in);
- position: relative;
+ position: absolute;
+ right: 10px;
&:hover {
background: rgba(0, 0, 0, 0.1);
}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 76d0cc29a..5ae9e656d 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -140,7 +140,7 @@ body.ios {
padding: 1em 0 0;
position: relative;
-webkit-overflow-scrolling: touch;
- &.hide-scroll::-webkit-scrollbar {
+ &::-webkit-scrollbar {
width: 0px !important;
}
&.inactive {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 71e9d0f96..24c79e6c2 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -365,6 +365,9 @@
width: 100%;
z-index: 5;
}
+ .modal-title {
+ padding-left: 20px;
+ }
.user-settings {
.tab-header {
display: none;
@@ -526,6 +529,12 @@
height: 45px;
position: relative;
@include single-transition(all, 0.2s, linear);
+ .glyphicon-refresh-animate {
+ right: 33px;
+ top: 15px;
+ color: #fff;
+ color: rgba(255,255,255,0.5);
+ }
.form-control {
border: none;
padding: 0 10px 0 31px;
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 8d743dfe2..25c093957 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -14,13 +14,15 @@
width:800px;
max-width: 100%;
.modal-back {
- width: 8px;
- height: 13px;
- background: url("../images/arrow-left.png");
- @include background-size(100% 100%);
- margin-right: 10px;
- display: inline-block;
+ width: 40px;
+ height: 56px;
+ background: url("../images/arrow-left.png") no-repeat;
+ @include background-size(8px 13px);
+ background-position: center;
+ top: 0;
+ left: 0;
cursor: pointer;
+ position: absolute;
}
.modal-body {
padding: 0;
@@ -59,7 +61,7 @@
.section-max {
background: #f2f2f2;
- padding: 1em 0;
+ padding: 1em 0 1.3em;
margin-bottom: 0;
@include clearfix;
.section-title {
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 432b8eb46..933be96ff 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -10,6 +10,10 @@
&.sidebar--padded {
padding-top: 44px;
}
+ .dropdown-menu {
+ max-height: 300px;
+ overflow: auto;
+ }
.search__form {
margin: 0;
padding: 1em 1em 0;