diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-19 18:30:23 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-19 18:30:23 +0000 |
| commit | 2f4cdca6f94a51f578b3d067c8c48b9e06b537b4 (patch) | |
| tree | 206c681c4727d0d3265d57ee1307a99f49a5a7e3 | |
| parent | 06867f30598eaed32e03a6af0139482418df878a (diff) | |
| download | gitlab-ce-2f4cdca6f94a51f578b3d067c8c48b9e06b537b4.tar.gz | |
Resolve header.scss conflicts
| -rw-r--r-- | app/assets/stylesheets/framework/header.scss | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss index 14d71342fb1..f4ecabd55da 100644 --- a/app/assets/stylesheets/framework/header.scss +++ b/app/assets/stylesheets/framework/header.scss @@ -30,13 +30,10 @@ header { background-color: $gray-light; border: none; border-bottom: 1px solid $border-color; -<<<<<<< HEAD -======= position: fixed; top: 0; left: 0; right: 0; ->>>>>>> 3c45906... Merge branch 'fix-header-z-index' into 'master' @media (max-width: $screen-xs-min) { padding: 0 16px; |