diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-21 22:59:15 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-21 22:59:15 +0100 |
| commit | 308abc8db05f75da8f1cc66facb5e85bee5c69c4 (patch) | |
| tree | 6b0acf3cbcf7036fb831381cfe195ad572d6a3c8 /app/assets/stylesheets/framework/markdown_area.scss | |
| parent | a42fe49c8c953c0aa8ca20c8fb5a141447128894 (diff) | |
| parent | c176fb40a52d32edc54843a5b54884cbab1e67e1 (diff) | |
| download | gitlab-ce-308abc8db05f75da8f1cc66facb5e85bee5c69c4.tar.gz | |
Merge branch 'master' into housekeeping-doc
Diffstat (limited to 'app/assets/stylesheets/framework/markdown_area.scss')
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index 4a00a197d9a..6732343802a 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -65,13 +65,6 @@ position: relative; } -.md-header { - ul { - float: left; - margin-bottom: 1px; - } -} - .referenced-users { color: #4c4e54; padding-top: 10px; @@ -85,28 +78,12 @@ box-shadow: none; } -.new_note, -.edit_note, -.detail-page-description, -.milestone-description, -.wiki-content, -.merge-request-form { - .nav-tabs { - margin-bottom: 0; - border: none; - - li a, - li.active a { - border: 1px solid #DDD; - } - } -} - .markdown-area { @include border-radius(0); background: #FFF; border: 1px solid #ddd; min-height: 140px; + max-height: 430px; padding: 5px; box-shadow: none; width: 100%; |