summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConstance Okoghenun <constanceokoghenun@gmail.com>2018-09-24 18:47:51 +0100
committerConstance Okoghenun <constanceokoghenun@gmail.com>2018-09-24 18:47:51 +0100
commit10d39fb598a200a3baee36ee6a9e2bfaa9cd486b (patch)
tree3f020867b7fbcde4e7a5319e798eafa1e03fdb5e
parenta605317210d634e5627c461d9a8e01dcf5c351cb (diff)
downloadgitlab-ce-10d39fb598a200a3baee36ee6a9e2bfaa9cd486b.tar.gz
Reset changes in avatar styles
-rw-r--r--app/assets/stylesheets/framework/avatar.scss83
1 files changed, 16 insertions, 67 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index 2748d515605..fcf282a7d7c 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -46,12 +46,8 @@
flex-shrink: 0;
-webkit-flex-shrink: 0;
- &.s16 {
- margin-right: 4px;
- }
- &.s24 {
- margin-right: 4px;
- }
+ &.s16 { margin-right: 4px; }
+ &.s24 { margin-right: 4px; }
}
&.center {
@@ -77,59 +73,19 @@
background-color: $gray-darker;
// Sizes
- &.s16 {
- font-size: 12px;
- line-height: 1.33;
- }
- &.s24 {
- font-size: 13px;
- line-height: 1.8;
- }
- &.s26 {
- font-size: 20px;
- line-height: 1.33;
- }
- &.s32 {
- font-size: 20px;
- line-height: 30px;
- }
- &.s40 {
- font-size: 16px;
- line-height: 38px;
- }
- &.s48 {
- font-size: 20px;
- line-height: 46px;
- }
- &.s60 {
- font-size: 32px;
- line-height: 58px;
- }
- &.s70 {
- font-size: 34px;
- line-height: 70px;
- }
- &.s90 {
- font-size: 36px;
- line-height: 88px;
- }
- &.s100 {
- font-size: 36px;
- line-height: 98px;
- }
- &.s110 {
- font-size: 40px;
- line-height: 108px;
- font-weight: $gl-font-weight-normal;
- }
- &.s140 {
- font-size: 72px;
- line-height: 138px;
- }
- &.s160 {
- font-size: 96px;
- line-height: 158px;
- }
+ &.s16 { font-size: 12px; line-height: 1.33; }
+ &.s24 { font-size: 13px; line-height: 1.8; }
+ &.s26 { font-size: 20px; line-height: 1.33; }
+ &.s32 { font-size: 20px; line-height: 30px; }
+ &.s40 { font-size: 16px; line-height: 38px; }
+ &.s48 { font-size: 20px; line-height: 46px; }
+ &.s60 { font-size: 32px; line-height: 58px; }
+ &.s70 { font-size: 34px; line-height: 70px; }
+ &.s90 { font-size: 36px; line-height: 88px; }
+ &.s100 { font-size: 36px; line-height: 98px; }
+ &.s110 { font-size: 40px; line-height: 108px; font-weight: $gl-font-weight-normal; }
+ &.s140 { font-size: 72px; line-height: 138px; }
+ &.s160 { font-size: 96px; line-height: 158px; }
// Background colors
&.bg1 { background-color: $identicon-red; }
@@ -161,10 +117,7 @@
align-self: center;
}
- &.s40 {
- min-width: 40px;
- min-height: 40px;
- }
+ &.s40 { min-width: 40px; min-height: 40px; }
}
.avatar-counter {
@@ -177,7 +130,3 @@
line-height: 16px;
text-align: center;
}
-
-.no-avatar {
- border: 1px dashed $gray-darkest;
-}