summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-18 20:35:41 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-11-18 20:35:41 +0000
commit2488bff877e653f55d8b6817a1111168be4cab16 (patch)
tree7882f9b9b3e1e400dff37e235d7f95bea84d0575
parent130c8a51981268d53adb0000c6cd11ad65350b7c (diff)
parentad1bce1733795f89f7ac44c16b730fbef241fbe4 (diff)
downloadgitlab-ce-2488bff877e653f55d8b6817a1111168be4cab16.tar.gz
Merge branch '24641-focus-state' into 'master' fix/use-authorized-projects-project-team
Fix focus state in preview tab ## What does this MR do? Fixes the focus border in the preview tab by modifying the `line-height`, keeping the same height :cartwheel: ## Screenshots (if relevant) ![Screen_Shot_2016-11-18_at_18.35.36](/uploads/3ef96699194704f030cc8d2b5132226c/Screen_Shot_2016-11-18_at_18.35.36.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24641 See merge request !7581
-rw-r--r--app/assets/stylesheets/framework/markdown_area.scss9
1 files changed, 7 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss
index 8a93eac1b6d..42087c91530 100644
--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
@@ -64,12 +64,17 @@
a {
padding-top: 0;
- line-height: 1;
+ line-height: 19px;
border-bottom: 1px solid $border-color;
&.btn.btn-xs {
padding: 2px 5px;
}
+
+ &:focus {
+ margin-top: -10px;
+ padding-top: 10px;
+ }
}
}
}
@@ -163,4 +168,4 @@
border: 1px solid $white-light;
}
}
-} \ No newline at end of file
+}