summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-08-07 05:23:16 +0500
committerCorey Hulen <corey@hulen.com>2017-08-06 17:23:16 -0700
commit9eb8d93a0d958b830b1f759dd0917629bd79c8e6 (patch)
tree2098d0e0ba18bd76aa40527faa4aaa9ca3168301 /webapp/sass
parent178ccd16cba26144eac404f413440867b360033c (diff)
downloadchat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.tar.gz
chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.tar.bz2
chat-9eb8d93a0d958b830b1f759dd0917629bd79c8e6.zip
Updating user access token UI (#7091)
* Updating user access token UI Updating help text Updating tokenlistClass Updating string for token Updating translations Updating translations Updating translations * Updating translations * Minor UI fix * Update manage_tokens_modal.jsx * Update user_settings_security.jsx * Update en.json * Fix merge conflicts
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/components/_alerts.scss1
-rw-r--r--webapp/sass/components/_modal.scss4
2 files changed, 0 insertions, 5 deletions
diff --git a/webapp/sass/components/_alerts.scss b/webapp/sass/components/_alerts.scss
index e0444de39..cb4c9c9e1 100644
--- a/webapp/sass/components/_alerts.scss
+++ b/webapp/sass/components/_alerts.scss
@@ -11,4 +11,3 @@
margin: 1px 0 0 10px;
padding: 4px 10px;
}
-
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
index f92ae042e..b98ec85c9 100644
--- a/webapp/sass/components/_modal.scss
+++ b/webapp/sass/components/_modal.scss
@@ -103,10 +103,6 @@
}
}
- .alert {
- margin-bottom: 0;
- }
-
.custom-textarea {
border-color: $light-gray;
color: inherit;