summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-03-26 12:39:52 +0000
committerPhil Hughes <me@iamphill.com>2019-03-26 12:39:52 +0000
commit8980b0f3d54ea2f00ef6edde6823f72d6356c128 (patch)
tree96660fd114fcdf3cb0e4fb8ab3dedf729aabcf98
parent00009f287f7cf65efc79c44ab2874539fbed4062 (diff)
parent15a5e24ef245d92906906a216735c6780252451f (diff)
downloadgitlab-ce-8980b0f3d54ea2f00ef6edde6823f72d6356c128.tar.gz
Merge branch '10643-profile-css' into 'master'
Removes EE differences for profile.scss Closes gitlab-ee#10643 See merge request gitlab-org/gitlab-ce!26584
-rw-r--r--app/assets/stylesheets/pages/profile.scss39
1 files changed, 39 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss
index 8e933b62dd9..2e81579d7b3 100644
--- a/app/assets/stylesheets/pages/profile.scss
+++ b/app/assets/stylesheets/pages/profile.scss
@@ -305,6 +305,7 @@ table.u2f-registrations {
margin: 20px -5px 0;
.bordered-box {
+ padding: 32px;
border: 1px solid $blue-300;
border-radius: $border-radius-default;
background-color: $blue-50;
@@ -461,3 +462,41 @@ table.u2f-registrations {
.help-block {
color: $gl-text-color-secondary;
}
+
+.gitlab-slack-gif {
+ width: 100%;
+ max-width: $add-to-slack-gif-max-width;
+}
+
+.gitlab-slack-well {
+ background-color: $white-light;
+ box-shadow: none;
+ max-width: $add-to-slack-well-max-width;
+}
+
+.gitlab-slack-logo {
+ width: $add-to-slack-logo-size;
+ height: $add-to-slack-logo-size;
+}
+
+.gitlab-slack-popup {
+ width: 100%;
+ max-width: $add-to-slack-popup-max-width;
+}
+
+.gitlab-slack-right-arrow svg {
+ fill: $white-dark;
+ width: $right-arrow-size;
+ height: $right-arrow-size;
+ vertical-align: text-bottom;
+}
+
+.gitlab-slack-double-headed-arrow {
+ vertical-align: text-top;
+
+ svg {
+ fill: $gray-darker;
+ width: $double-headed-arrow-width;
+ height: $double-headed-arrow-height;
+ }
+}