Commit 84086a22 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

Merge branch 'master' of https://github.com/mborromeo/fnordmetric

parents d0107aeb e9c87698
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@

  %body
    .topbar
      %ul
        -namespaces.each do |key,namespace|
          %li{:class => namespace.token == current_namespace.token ? 'active' : nil}
            %a{:href=>"/#{namespace.token}"}=h namespace.token

    #wrap
      #tabs
+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ class FnordMetric::App < Sinatra::Base
      request.env["SCRIPT_NAME"]
    end

    def namespaces
      @namespaces
    end

    def current_namespace          
      @namespaces[@namespaces.keys.detect{ |k|
        k.to_s == params[:namespace]
+8 −3
Original line number Diff line number Diff line
body, html{ height:100%; padding:0px;}
body{ background:#3b3e45; color:#333; margin:0; padding:0; overflow-y:scroll; font: 12px/20px "Helvetica Neue", Helvetica, Arial, sans-serif; }

.topbar{ height:43px; background:#24272c; display:none; }

#wrap{ margin:0 20px; }
.topbar{ height:38px; background:#24272c; position:fixed; top:0px; width:100%;}
.topbar ul { list-style-type:none; margin:0; }
.topbar ul li { padding: 5px 10px 5px 10px; background-color:#3b3e45; display:inline; height:38px; line-height:38px; border-radius:3px; margin-right:5px;}
.topbar ul li a { color:#ccc; font-size:13px; text-decoration:none; }
.topbar ul li a:hover { color:#fff; }
.topbar ul li.active a { color:#fff; }

#wrap{ margin:25px 20px; }

#tabs{ width:150px; position:fixed; height:100%; margin-top:70px; }
#tabs ul{ list-style-type:none; padding:0; margin:0; width:156px;}