diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-10-21 08:39:19 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-10-21 08:39:19 +0200 |
commit | d222ce8b348ff2f6c76c3f1b05f8a4e91efcf0b4 (patch) | |
tree | 9b4fa2659335c681b41d1f5c6d2fe329d52bf1e1 /app/assets | |
parent | 7ae139566b46050b31bf01a6302af560fc129819 (diff) | |
parent | 249a9476d44e89bf1ab12fbc40bf81478faafd12 (diff) | |
download | gitlab-ce-d222ce8b348ff2f6c76c3f1b05f8a4e91efcf0b4.tar.gz |
Merge branch 'master' into full-width-tables
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/framework/blocks.scss | 45 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/profile.scss | 6 |
3 files changed, 51 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss index 32d219d4d60..5949a0fd5ad 100644 --- a/app/assets/stylesheets/framework/blocks.scss +++ b/app/assets/stylesheets/framework/blocks.scss @@ -65,3 +65,48 @@ line-height: 42px; } } + +.cover-block { + text-align: center; + background: #f7f8fa; + margin: -$gl-padding; + margin-bottom: 0; + padding: 44px $gl-padding; + border-bottom: 1px solid $border-color; + position: relative; + + .avatar-holder { + margin-bottom: 16px; + + .avatar, .identicon { + margin: 0 auto; + float: none; + } + + .identicon { + @include border-radius(50%); + } + } + + .cover-title { + color: $gl-header-color; + margin: 0; + font-size: 23px; + font-weight: normal; + margin: 16px 0 5px 0; + color: #4c4e54; + font-size: 23px; + line-height: 1.1; + } + + .cover-desc { + padding: 0 $gl-padding; + color: $gl-text-color; + } + + .cover-controls { + position: absolute; + top: 10px; + right: 10px; + } +} diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 1857c1659aa..e6d1cca9f7a 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -18,7 +18,6 @@ font-family: $monospace_font; white-space: pre; word-wrap: normal; - padding: 1px 2px; } kbd { diff --git a/app/assets/stylesheets/pages/profile.scss b/app/assets/stylesheets/pages/profile.scss index 8e4f0eb2b25..b7391e5303b 100644 --- a/app/assets/stylesheets/pages/profile.scss +++ b/app/assets/stylesheets/pages/profile.scss @@ -47,3 +47,9 @@ } } } + +.calendar-hint { + margin-top: -12px; + float: right; + font-size: 12px; +} |