summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-27 00:06:48 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-08-27 00:06:48 +0200
commit3d02ead9246c7112d5a32ee87da774e47927c84e (patch)
tree27be3917486969a68269570964ada021039be0ad
parent4ac7f5c949c664523e9a6e474d522f7d093249a2 (diff)
downloadgitlab-ce-3d02ead9246c7112d5a32ee87da774e47927c84e.tar.gz
Use same snippets icon everywhere. Fix list style for bordered-list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--app/assets/stylesheets/base/mixins.scss1
-rw-r--r--app/views/layouts/nav/_project.html.haml2
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/base/mixins.scss b/app/assets/stylesheets/base/mixins.scss
index 3974befa95c..05f5bd79f91 100644
--- a/app/assets/stylesheets/base/mixins.scss
+++ b/app/assets/stylesheets/base/mixins.scss
@@ -164,6 +164,7 @@
@mixin basic-list {
margin: 5px 0px;
padding: 0px;
+ list-style: none;
li {
padding: 10px 0;
diff --git a/app/views/layouts/nav/_project.html.haml b/app/views/layouts/nav/_project.html.haml
index d17d1c5fbd4..5e7b902622b 100644
--- a/app/views/layouts/nav/_project.html.haml
+++ b/app/views/layouts/nav/_project.html.haml
@@ -100,7 +100,7 @@
- if project_nav_tab? :snippets
= nav_link(controller: :snippets) do
= link_to namespace_project_snippets_path(@project.namespace, @project), title: 'Snippets', class: 'shortcuts-snippets', data: {placement: 'right'} do
- = icon('file-text-o fw')
+ = icon('clipboard fw')
%span
Snippets