Commit 8980b0f3 authored by Phil Hughes's avatar Phil Hughes

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
parents 00009f28 15a5e24e
...@@ -305,6 +305,7 @@ table.u2f-registrations { ...@@ -305,6 +305,7 @@ table.u2f-registrations {
margin: 20px -5px 0; margin: 20px -5px 0;
.bordered-box { .bordered-box {
padding: 32px;
border: 1px solid $blue-300; border: 1px solid $blue-300;
border-radius: $border-radius-default; border-radius: $border-radius-default;
background-color: $blue-50; background-color: $blue-50;
...@@ -461,3 +462,41 @@ table.u2f-registrations { ...@@ -461,3 +462,41 @@ table.u2f-registrations {
.help-block { .help-block {
color: $gl-text-color-secondary; 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;
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment