issue search styleup

gitlabhq
1 parent 7d773ecb
Showing 3 changed files with 49 additions and 30 deletions Show diff stats
app/assets/stylesheets/projects.css.scss
app/views/issues/index.html.haml
config/database.yml
@@ -681,3 +681,20 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
     }
   }
 }
+
+.top_panel_issues{
+  #issue_search_form { 
+    margin:5px 0; 
+    input { 
+      border:1px solid #D3D3D3;
+      padding: 3px;
+      height: 20px;
+      width: 300px;
+
+      &:focus { 
+        border-color:#c2e1ef;
+      }
+    }
+  }
+}
+
 %div
-  - if can? current_user, :write_issue, @project
-    .left
-      = form_tag search_project_issues_path(@project), :method => :get, :remote => true do
-        = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
-        = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
-      = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
-    
-  .right
-    = form_tag project_issues_path(@project), :method => :get do
-      .span-2
-        = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
-        = label_tag "open_issues","Open"
-      .span-2
-        = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
-        = label_tag "closed_issues","Closed"
-      .span-2
-        = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
-        = label_tag "my_issues","To Me"
-      .span-2
-        = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
-        = label_tag "all_issues","All"
+  .top_panel_issues
+    - if can? current_user, :write_issue, @project
+      %div{:class => "left", :style => "margin-right: 10px;" }
+        = link_to 'New Issue', new_project_issue_path(@project), :remote => true, :class => "lbutton vm"
+    = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :class => :left, :id => "issue_search_form" do
+      = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
+      = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' }
+      
+    .right
+      = form_tag project_issues_path(@project), :method => :get do
+        .span-2
+          = radio_button_tag :f, 0, (params[:f] || "0") == "0", :onclick => "this.form.submit()", :id => "open_issues", :class => "status"
+          = label_tag "open_issues","Open"
+        .span-2
+          = radio_button_tag :f, 2, params[:f] == "2", :onclick => "this.form.submit()", :id => "closed_issues", :class => "status"
+          = label_tag "closed_issues","Closed"
+        .span-2
+          = radio_button_tag :f, 3, params[:f] == "3", :onclick => "this.form.submit()", :id => "my_issues", :class => "status"
+          = label_tag "my_issues","To Me"
+        .span-2
+          = radio_button_tag :f, 1, params[:f] == "1", :onclick => "this.form.submit()", :id => "all_issues", :class => "status"
+          = label_tag "all_issues","All"
   #issues-table-holder= render "issues"
   %br
@@ -4,9 +4,8 @@
 #   Ensure the SQLite 3 gem is defined in your Gemfile
 #   gem 'sqlite3'
 development:
-  adapter: mysql2
-  database: gitlab_development
-  username: root
+  adapter: sqlite3
+  database: db/development.sqlite3
   pool: 5
   timeout: 5000
@@ -14,11 +13,13 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql2
-  database: gitlab_development
-  username: root
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
+  timeout: 5000
 production:
-  adatper: mysql2
-  database: gitlab_test
-  username: root
+  adapter: sqlite3
+  database: db/production.sqlite3
+  pool: 5
+  timeout: 5000
	@@ -681,3 +681,20 @@ tbody tr:nth-child(2n) td, tbody tr.even td {		@@ -681,3 +681,20 @@ tbody tr:nth-child(2n) td, tbody tr.even td {
681	}	681	}
682	}	682	}
683	}	683	}
		684	+
		685	+.top_panel_issues{
		686	+ #issue_search_form {
		687	+ margin:5px 0;
		688	+ input {
		689	+ border:1px solid #D3D3D3;
		690	+ padding: 3px;
		691	+ height: 20px;
		692	+ width: 300px;
		693	+
		694	+ &:focus {
		695	+ border-color:#c2e1ef;
		696	+ }
		697	+ }
		698	+ }
		699	+}
		700	+