Wiki style: move styles to right place

Valeriy Sizov
1 parent 607d8b79
Showing 3 changed files with 14 additions and 16 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/files.scss
app/assets/stylesheets/sections/wiki.scss
lib/gitlab/markdown.rb
@@ -37,20 +37,6 @@
     background:#fff;
     font-size: 11px;
-    &.wiki {
-      font-size: 13px;
-      code {
-        padding:0 4px;
-      }
-      padding:20px;
-      h1, h2 {
-        line-height: 46px;
-      }
-      h3, h4 {
-        line-height: 40px;
-      }
-    }
-
     &.image_file {
       background:#eee;
       text-align:center;
-.wiki{
-  padding: 5px;
+.wiki {
+    font-size: 13px;
+    code {
+        padding:0 4px;
+    }
+    padding:20px;
+    h1, h2 {
+        line-height: 46px;
+    }
+    h3, h4 {
+        line-height: 40px;
+    }
 }
@@ -176,6 +176,8 @@ module Gitlab
       if commit = @project.commit(identifier)
         link_to(identifier, project_commit_path(@project, commit), html_options.merge(title: CommitDecorator.new(commit).link_title, class: "gfm gfm-commit #{html_options[:class]}"))
       end
+    rescue Grit::NoSuchPathError
+      nil
     end
   end
 end
	@@ -37,20 +37,6 @@		@@ -37,20 +37,6 @@
37	background:#fff;	37	background:#fff;
38	font-size: 11px;	38	font-size: 11px;
39		39
40	- &.wiki {
41	- font-size: 13px;
42	- code {
43	- padding:0 4px;
44	- }
45	- padding:20px;
46	- h1, h2 {
47	- line-height: 46px;
48	- }
49	- h3, h4 {
50	- line-height: 40px;
51	- }
52	- }
53	-
54	&.image_file {	40	&.image_file {
55	background:#eee;	41	background:#eee;
56	text-align:center;	42	text-align:center;
1	-.wiki{
2	- padding: 5px;	1	+.wiki {
		2	+ font-size: 13px;
		3	+ code {
		4	+ padding:0 4px;
		5	+ }
		6	+ padding:20px;
		7	+ h1, h2 {
		8	+ line-height: 46px;
		9	+ }
		10	+ h3, h4 {
		11	+ line-height: 40px;
		12	+ }
3	}	13	}