summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-15 11:42:01 -0700
committerCorey Hulen <corey@hulen.com>2015-10-15 11:42:01 -0700
commit5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5 (patch)
treeda20ee242192263e0e0b2077e296876a8e250091 /web/sass-files
parentf09685a37398da7808117b960321a14ab7989da7 (diff)
parent3d16d64c0ba2233b680e4ded01784a892c63e925 (diff)
downloadchat-5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5.tar.gz
chat-5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5.tar.bz2
chat-5f1734a3c294d1a6ca453a0b3dbb7f67f97cf4a5.zip
Merge pull request #1076 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_admin-console.scss9
-rw-r--r--web/sass-files/sass/partials/_base.scss11
-rw-r--r--web/sass-files/sass/partials/_files.scss1
-rw-r--r--web/sass-files/sass/partials/_markdown.scss1
-rw-r--r--web/sass-files/sass/partials/_post_right.scss1
-rw-r--r--web/sass-files/sass/partials/_responsive.scss5
-rw-r--r--web/sass-files/sass/partials/_search.scss1
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss2
8 files changed, 21 insertions, 10 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss
index 4b4fc1664..14f1d9c2f 100644
--- a/web/sass-files/sass/partials/_admin-console.scss
+++ b/web/sass-files/sass/partials/_admin-console.scss
@@ -15,12 +15,11 @@
.nav {
li {
padding: 0;
+ @include opacity(1);
.icon {
width: 17px;
}
> a {
- padding: 9px 15px;
- display: block;
&:hover, &.active, &:focus {
background-color: #EAEAEA;
}
@@ -117,8 +116,10 @@
.form-group {
margin-bottom: 25px;
}
- ul, ol {
- padding-left: 23px;
+ .help-text {
+ ul, ol {
+ padding-left: 23px;
+ }
}
.help-text {
margin: 10px 0 0 15px;
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 44a474213..cb5ff67b5 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -39,10 +39,6 @@ img {
height: auto;
}
-.input-group-addon {
- background: transparent;
-}
-
.popover {
color: #333;
&.bottom, &.right, &.top, &.left {
@@ -53,6 +49,9 @@ img {
.popover-title {
background: rgba(black, 0.05);
}
+ .popover-content {
+ white-space: pre-wrap;
+ }
}
.dropdown-menu {
@@ -182,6 +181,10 @@ a:focus, a:hover {
background-color: white !important;
}
+.alert {
+ padding: 8px 12px;
+}
+
.emoji {
width: 1.5em;
height: 1.5em;
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index 6dbb82810..01057423d 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -194,6 +194,7 @@
vertical-align: top;
.file-details__name {
+ color: #333;
font-size: 16px;
}
.file-details__info {
diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss
index 1aa942ad0..70c99f504 100644
--- a/web/sass-files/sass/partials/_markdown.scss
+++ b/web/sass-files/sass/partials/_markdown.scss
@@ -1,5 +1,6 @@
.markdown__heading {
font-weight: 700;
+ line-height: 1.5;
}
.markdown__paragraph-inline {
display: inline;
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index b72176a11..9557d7570 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -93,6 +93,7 @@
.post-right__scroll {
position: relative;
+ overflow: auto;
}
.post-right-comment-time {
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index dbe6029ec..09f2c179e 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -586,11 +586,14 @@
&.move--right {
@include translate3d(0, 0, 0);
}
+ .nav-pills__unread-indicator-bottom {
+ bottom: 10px;
+ }
.badge {
top: 13px;
}
> div {
- padding-bottom: 105px;
+ padding-bottom: 65px;
}
.team__header {
display: none;
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index 2de1b5380..ca90ec46d 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -67,6 +67,7 @@
}
.search-items-container {
+ overflow: auto;
position: relative;
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 24aaef059..831c19cff 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -69,7 +69,7 @@
top: 66px;
}
.nav-pills__unread-indicator-bottom {
- bottom: 10px;
+ bottom: 20px;
}
.nav {