diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-14 17:22:36 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-14 17:22:36 -0800 |
commit | 46ed6fb58fc33d084751e77fe7d5521d108a1e43 (patch) | |
tree | 063812ce65292891da9640a6b5668db74b1e9f33 | |
parent | 18b7acc399e05c2a1aeb42ee5f738778b0289dcf (diff) | |
download | gitlab-ce-46ed6fb58fc33d084751e77fe7d5521d108a1e43.tar.gz |
Revert "Fix anchor issue with fixed navbar"
This reverts commit 204b3c121cb038c5825dff3fa877ae2eea15403b.
-rw-r--r-- | app/assets/stylesheets/generic/timeline.scss | 11 | ||||
-rw-r--r-- | app/assets/stylesheets/generic/typography.scss | 15 | ||||
-rw-r--r-- | app/assets/stylesheets/main/layout.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/main/mixins.scss | 6 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/header.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/sections/notes.scss | 1 | ||||
-rw-r--r-- | app/views/layouts/_head_panel.html.haml | 2 |
7 files changed, 8 insertions, 30 deletions
diff --git a/app/assets/stylesheets/generic/timeline.scss b/app/assets/stylesheets/generic/timeline.scss index cdd044290da..82ee41b71bd 100644 --- a/app/assets/stylesheets/generic/timeline.scss +++ b/app/assets/stylesheets/generic/timeline.scss @@ -20,17 +20,6 @@ margin-bottom: 10px; clear: both; - /* Hack for anchors and fixed navbar */ - &[id] { - &:before { - content: ''; - display: block; - position: relative; - width: 0; - height: 3em; - margin-top: -3em; - } - } &:target { .timeline-entry-inner .timeline-content { diff --git a/app/assets/stylesheets/generic/typography.scss b/app/assets/stylesheets/generic/typography.scss index 3f63a0b92b1..385a627b4be 100644 --- a/app/assets/stylesheets/generic/typography.scss +++ b/app/assets/stylesheets/generic/typography.scss @@ -98,7 +98,8 @@ a:focus { $size: 16px; position: absolute; right: 100%; - bottom: 7px; + top: 50%; + margin-top: -$size/2; margin-right: 0px; padding-right: 20px; display: inline-block; @@ -108,18 +109,6 @@ a:focus { background-size: contain; background-repeat: no-repeat; } - - /* Hack for anchors and fixed navbar */ - &[id] { - &:before { - content: ''; - display: block; - position: relative; - width: 0; - height: 3em; - margin-top: -3em; - } - } } ul { diff --git a/app/assets/stylesheets/main/layout.scss b/app/assets/stylesheets/main/layout.scss index e44bccb0183..71522443f10 100644 --- a/app/assets/stylesheets/main/layout.scss +++ b/app/assets/stylesheets/main/layout.scss @@ -12,3 +12,4 @@ html { .container .content { margin: 0 0; } + diff --git a/app/assets/stylesheets/main/mixins.scss b/app/assets/stylesheets/main/mixins.scss index c86f9be52d0..5f83913b73b 100644 --- a/app/assets/stylesheets/main/mixins.scss +++ b/app/assets/stylesheets/main/mixins.scss @@ -65,10 +65,8 @@ max-width: 100%; } - h1, h2, h3 { - &:first-child { - margin-top: 0; - } + *:first-child { + margin-top: 0; } code { padding: 0 4px; } diff --git a/app/assets/stylesheets/sections/header.scss b/app/assets/stylesheets/sections/header.scss index a5098b6da5b..32b0b10c649 100644 --- a/app/assets/stylesheets/sections/header.scss +++ b/app/assets/stylesheets/sections/header.scss @@ -8,6 +8,8 @@ header { margin-bottom: 0; min-height: 40px; border: none; + position: fixed; + top: 0; width: 100%; .navbar-inner { diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index 74945717a02..1550e30fe53 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -57,7 +57,6 @@ ul.notes { .note { display: block; position:relative; - .attachment { font-size: 14px; } diff --git a/app/views/layouts/_head_panel.html.haml b/app/views/layouts/_head_panel.html.haml index bdf27562c26..e98b8ec631d 100644 --- a/app/views/layouts/_head_panel.html.haml +++ b/app/views/layouts/_head_panel.html.haml @@ -1,4 +1,4 @@ -%header.navbar.navbar-fixed-top.navbar-gitlab +%header.navbar.navbar-static-top.navbar-gitlab .navbar-inner .container %div.app_logo |