Permalink
Browse files

move tag search into specific headers, remove from universal layout; …

…disable 'created by' for now
  • Loading branch information...
1 parent c3318d5 commit e1b5a62eea3b321ab0ecdc7f56fe65a8b82cec81 obfuscurity committed Jul 18, 2012
View
3 lib/descartes/public/css/style.css
@@ -16,7 +16,7 @@ body {
filter:alpha(opacity=10);
}
-.navbar-search {
+.search {
float: right;
}
@@ -30,7 +30,6 @@ body {
}
.header h1 {
- margin-top: 5px;
float: left;
}
View
5 lib/descartes/views/dashboards/profile.haml
@@ -1,6 +1,9 @@
.header
%h1= dashboard[:name]
- %span.info Created by <span class="owner">#{dashboard[:owner]}</span> on #{dashboard[:created_at]}
+ /%span.info Created by <span class="owner">#{dashboard[:owner]}</span> on #{dashboard[:created_at]}
+ %form{ :class => "search pull-left", :action => "" }
+ %i.reset-search.icon-remove-circle
+ %input{ :class => "search-query span2", :type => "text", :name => "tags", :placeholder => "Search tags" }
.well
.tools.btn-group
%button{ :class => "tools btn fullscreen", :title => "toggle fullscreen" }
View
5 lib/descartes/views/graphs/list.haml
@@ -1,3 +1,8 @@
+.header
+ %h1 Graphs
+ %form{ :class => "search pull-left", :action => "" }
+ %i.reset-search.icon-remove-circle
+ %input{ :class => "search-query span2", :type => "text", :name => "tags", :placeholder => "Search tags" }
.well
%a{ :class => "import btn", :"data-toggle" => "collapse", :"data-target" => "#import_form", :href => "#" } Import Graphs
%a{ :class => "dashboard btn", :"data-toggle" => "collapse", :"data-target" => "#dashboard_form", :href => "#" } New Dashboard
View
2 lib/descartes/views/graphs/profile.haml
@@ -1,6 +1,6 @@
.header
%h1.locked= graph[:name]
- %span.info Created by <span class="owner">#{graph[:owner]}</span> on #{graph[:created_at]}
+ /%span.info Created by <span class="owner">#{graph[:owner]}</span> on #{graph[:created_at]}
.well
.tools.btn-group
%button{ :class => "tools btn fullscreen", :title => "toggle fullscreen" }
View
4 lib/descartes/views/layout.haml
@@ -21,10 +21,6 @@
%a{ :href => "/graphs"} Graphs
%li.dashboards
%a{ :href => "/dashboards"} Dashboards
- %form{ :class => "navbar-search pull-left", :action => "" }
- %i.reset-search.icon-remove-circle.icon-white
- %input{ :class => "search-query span2", :type => "text", :name => "tags", :placeholder => "Search tags" }
-
.container
:javascript

0 comments on commit e1b5a62

Please sign in to comment.