Fix some css after bootstrap 3

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix some css after bootstrap 3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent 010a770b
Showing 11 changed files with 31 additions and 16 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/files.scss
app/assets/stylesheets/gitlab_bootstrap/mixins.scss
app/assets/stylesheets/gitlab_bootstrap/typography.scss
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/tree.scss
app/assets/stylesheets/selects.scss
app/views/projects/blob/_blob.html.haml
app/views/projects/commits/_head.html.haml
app/views/projects/issues/_head.html.haml
app/views/projects/tree/_tree.html.haml
@@ -20,6 +20,7 @@
 .append-right-10 { margin-right:10px }
 .append-right-20 { margin-right:20px }
 .append-bottom-10 { margin-bottom:10px }
+.append-bottom-15 { margin-bottom:15px }
 .append-bottom-20 { margin-bottom:20px }
 .inline { display: inline-block }
@@ -129,3 +130,9 @@ pre.well-pre {
 .gl-hide {
   display: none;
 }
+
+.breadcrumb > li + li:before {
+  content: "/";
+  padding: 0;
+  color: #666;
+}
@@ -20,7 +20,6 @@
     text-align: left;
     color: $style_color;
     padding: 9px 10px;
-    height: 18px;
     .options {
       float: right;
@@ -84,6 +84,10 @@
 }
 @mixin md-typography {
+  img {
+    max-width: 100%;
+  }
+
   *:first-child {
     margin-top: 0;
   }
@@ -2,11 +2,6 @@
  * Headers
  *
  */
-h1, h2, h3, h4, h5, h6 {
-  font-weight: 500;
-  line-height: 1.1;
-}
-
 h1.page-title {
   @include page-title;
   font-size: 28px;
@@ -99,6 +94,7 @@ a:focus {
     background: #f5f5f5;
   }
   ul {
+    padding: 0;
     margin: 0 0 9px 25px !important;
   }
 }
@@ -103,7 +103,6 @@ header {
     }
     .search-input {
-      width: 300px;
       background-image: url("icon-search.png");
       background-repeat: no-repeat;
       background-position: 10px;
@@ -115,9 +114,6 @@ header {
       border: 1px solid #c6c6c6;
       box-shadow: none;
       @include transition(all 0.15s ease-in 0s);
-      &:focus {
-        width: 400px;
-      }
     }
   }
@@ -201,3 +197,18 @@ header {
   }
 }
+.search .search-input {
+  width: 300px;
+  &:focus {
+    width: 400px;
+  }
+}
+
+@media (max-width: 1200px)  {
+  .search .search-input {
+    width: 200px;
+    &:focus {
+      width: 300px;
+    }
+  }
+}
@@ -111,7 +111,7 @@
 .tree-ref-holder {
   float: left;
-  margin-top: 5px;
+  margin-top: 8px;
 }
 .readme-holder {
@@ -3,6 +3,7 @@
   min-width: 100px;
   .chosen-single {
+    height: 26px;
     background: #EEE !important;
     border: 1px solid #DDD !important;
     @include box-shadow(none !important);
@@ -4,7 +4,6 @@
     = link_to project_tree_path(@project, @ref) do
       = @project.path
   - tree_breadcrumbs(@tree, 6) do |title, path|
-    \/
     %li
       - if path
         - if path.end_with?(@path)
-%ul.nav.nav-tabs
+%ul.nav.nav-tabs.append-bottom-15
   %li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
   = nav_link(controller: [:commit, :commits]) do
-%ul.nav.nav-tabs
+%ul.nav.nav-tabs.append-bottom-15
   = nav_link(controller: :issues) do
     = link_to project_issues_path(@project), class: "tab" do
       Browse Issues
@@ -4,14 +4,12 @@
     = link_to project_tree_path(@project, @ref) do
       = @project.path
   - tree_breadcrumbs(tree, 6) do |title, path|
-    \/
     %li
       - if path
         = link_to truncate(title, length: 40), project_tree_path(@project, path)
       - else
         = link_to title, '#'
   - if @repository.branch_names.include?(@ref)
-    \/
     %li
       = link_to project_new_tree_path(@project, @id), title: 'New file', id: 'new-file-link' do
         %small
	@@ -20,7 +20,6 @@		@@ -20,7 +20,6 @@
20	text-align: left;	20	text-align: left;
21	color: $style_color;	21	color: $style_color;
22	padding: 9px 10px;	22	padding: 9px 10px;
23	- height: 18px;
24		23
25	.options {	24	.options {
26	float: right;	25	float: right;
	@@ -111,7 +111,7 @@		@@ -111,7 +111,7 @@
111		111
112	.tree-ref-holder {	112	.tree-ref-holder {
113	float: left;	113	float: left;
114	- margin-top: 5px;	114	+ margin-top: 8px;
115	}	115	}
116		116
117	.readme-holder {	117	.readme-holder {
	@@ -3,6 +3,7 @@		@@ -3,6 +3,7 @@
3	min-width: 100px;	3	min-width: 100px;
4		4
5	.chosen-single {	5	.chosen-single {
		6	+ height: 26px;
6	background: #EEE !important;	7	background: #EEE !important;
7	border: 1px solid #DDD !important;	8	border: 1px solid #DDD !important;
8	@include box-shadow(none !important);	9	@include box-shadow(none !important);
1	-%ul.nav.nav-tabs	1	+%ul.nav.nav-tabs.append-bottom-15
2	%li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}	2	%li= render partial: 'shared/ref_switcher', locals: {destination: 'commits'}
3		3
4	= nav_link(controller: [:commit, :commits]) do	4	= nav_link(controller: [:commit, :commits]) do
1	-%ul.nav.nav-tabs	1	+%ul.nav.nav-tabs.append-bottom-15
2	= nav_link(controller: :issues) do	2	= nav_link(controller: :issues) do
3	= link_to project_issues_path(@project), class: "tab" do	3	= link_to project_issues_path(@project), class: "tab" do
4	Browse Issues	4	Browse Issues