summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-03 13:38:14 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-03 13:38:14 -0700
commit427d999cda9f37c27aa4dc973a81570829814636 (patch)
treeee4c2e174d70d17a4bb64812db9f0c1074c85082 /web/sass-files/sass
parente69e2db6b4724517a39c57e3689dec82608581ee (diff)
downloadchat-427d999cda9f37c27aa4dc973a81570829814636.tar.gz
chat-427d999cda9f37c27aa4dc973a81570829814636.tar.bz2
chat-427d999cda9f37c27aa4dc973a81570829814636.zip
Adding initial admin console html pages
Diffstat (limited to 'web/sass-files/sass')
-rw-r--r--web/sass-files/sass/partials/_command-box.scss16
-rw-r--r--web/sass-files/sass/partials/_post.scss1
-rw-r--r--web/sass-files/sass/partials/_responsive.scss4
-rw-r--r--web/sass-files/sass/partials/_settings.scss5
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss2
-rw-r--r--web/sass-files/sass/styles.scss1
6 files changed, 7 insertions, 22 deletions
diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss
index 565296fae..44eb9b8df 100644
--- a/web/sass-files/sass/partials/_command-box.scss
+++ b/web/sass-files/sass/partials/_command-box.scss
@@ -4,30 +4,20 @@
width: 100%;
border: $border-gray;
bottom: 38px;
- overflow: auto;
@extend %popover-box-shadow;
- .sidebar--right & {
- bottom: 100px;
- }
}
.command-name {
position: relative;
width: 100%;
background-color: #fff;
- line-height: 24px;
- padding: 5px 10px 8px;
+ height: 37px;
+ line-height: 37px;
+ padding: 2px 10px 2px 5px;
z-index: 101;
- font-size: 0.95em;
- border-bottom: 1px solid #ddd;
&:hover {
background-color: #e8eaed;
}
- .command__desc {
- margin-left: 5px;
- color: #999;
- line-height: normal;
- }
}
.command-desc {
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 231e6fe3f..0605e9c3b 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -139,7 +139,6 @@ body.ios {
width: 100%;
padding: 1em 0 0;
position: relative;
- -webkit-overflow-scrolling: touch;
&.hide-scroll::-webkit-scrollbar {
width: 0px !important;
}
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index 682809f02..f691fba43 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -635,10 +635,10 @@
}
}
.app__content {
- padding-top: 50px;
+ padding-top: 45px;
margin: 0;
.channel__wrap & {
- padding-top: 50px;
+ padding-top: 45px;
}
.channel-header {
display: none;
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 8d743dfe2..99a7eb7bc 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -94,11 +94,6 @@
list-style-type:none;
}
- .setting-list__hint {
- color: #555;
- margin-top: 20px;
- }
-
.mentions-input {
margin-top: 10px;
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 432b8eb46..6b827eaee 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -59,7 +59,7 @@
top: 66px;
}
.nav-pills__unread-indicator-bottom {
- bottom: 10px;
+ bottom: 0px;
}
.nav {
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index eb5152a2c..422447b6e 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -23,6 +23,7 @@
@import "partials/sidebar--left";
@import "partials/sidebar--right";
@import "partials/sidebar--menu";
+@import "partials/admin-console";
@import "partials/signup";
@import "partials/files";
@import "partials/videos";