summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/profile.scss
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-15 14:33:14 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-15 14:33:14 +0000
commit90e91e28e40f2d5d5205e62f6e01e23af4da117f (patch)
treeb745cd4a914d2bef8dd9559f6aa8b2d0b15c7414 /app/assets/stylesheets/pages/profile.scss
parentea7d062fa60e3e622288237fc66a815348bbcf36 (diff)
parent8f21e2ae408a4ebd0e115846b9a639e7ce09a126 (diff)
downloadgitlab-ce-90e91e28e40f2d5d5205e62f6e01e23af4da117f.tar.gz
Merge branch 'application-settings' into 'master'
Applications tab on profile settings Closes #13855 See merge request !3031
Diffstat (limited to 'app/assets/stylesheets/pages/profile.scss')
-rw-r--r--app/assets/stylesheets/pages/profile.scss18
1 files changed, 18 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 248c56e459d..90094189b55 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -215,3 +215,21 @@
color: $provider-btn-not-active-color;
}
}
+
+.profile-settings-message {
+ line-height: 32px;
+ color: $warning-message-color;
+ background-color: $warning-message-bg;
+ border: 1px solid $warning-message-border;
+ border-radius: $border-radius-base;
+}
+
+.oauth-applications {
+ form {
+ display: inline-block;
+ }
+
+ .last-heading {
+ width: 105px;
+ }
+}