Commit 8e1d2604 authored by Thomas Park's avatar Thomas Park
Browse files

refactor menu code

parent 547a8c57
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body class="preview" data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="../">Bootswatch</a> <a class="brand" href="../">Bootswatch</a>
<div class="nav-collapse"> <div class="nav-collapse" id="main-menu">
</div> </div>
</div> </div>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<!-- Headings & Paragraph Copy --> <!-- Headings & Paragraph Copy -->
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="well"> <div class="well">
<h1>h1. Heading 1</h1> <h1>h1. Heading 1</h1>
...@@ -98,13 +98,13 @@ ...@@ -98,13 +98,13 @@
<h6>h6. Heading 6</h6> <h6>h6. Heading 6</h6>
</div> </div>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example body text</h3> <h3>Example body text</h3>
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p> <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example addresses</h3> <h3>Example addresses</h3>
<address> <address>
...@@ -352,22 +352,22 @@ ...@@ -352,22 +352,22 @@
<div class="page-header"> <div class="page-header">
<h1>Forms</h1> <h1>Forms</h1>
</div> </div>
<div class="row"> <div class="row">
<div class="span7 offset1"> <div class="span7 offset1">
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-medium search-query"> <input type="text" class="input-medium search-query">
<button type="submit" class="btn">Search</button> <button type="submit" class="btn">Search</button>
</form> </form>
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-small" placeholder="Email"> <input type="text" class="input-small" placeholder="Email">
<input type="password" class="input-small" placeholder="Password"> <input type="password" class="input-small" placeholder="Password">
<button type="submit" class="btn">Go</button> <button type="submit" class="btn">Go</button>
</form> </form>
<form class="form-horizontal well"> <form class="form-horizontal well">
<fieldset> <fieldset>
<legend>Controls Bootstrap supports</legend> <legend>Controls Bootstrap supports</legend>
...@@ -562,14 +562,14 @@ ...@@ -562,14 +562,14 @@
<div class="span12"> <div class="span12">
<h3 id="labels">Labels</h3> <h3 id="labels">Labels</h3>
<span class="label">Default</span> <span class="label">Default</span>
<span class="label label-success">Success</span> <span class="label label-success">Success</span>
<span class="label label-warning">Warning</span> <span class="label label-warning">Warning</span>
<span class="label label-important">Important</span> <span class="label label-important">Important</span>
<span class="label label-info">Info</span> <span class="label label-info">Info</span>
</div> </div>
</div> </div>
<br /> <br />
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
<h3 id="progressbars">Progress bars</h3> <h3 id="progressbars">Progress bars</h3>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="progress"> <div class="progress">
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body class="preview" data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="../">Bootswatch</a> <a class="brand" href="../">Bootswatch</a>
<div class="nav-collapse"> <div class="nav-collapse" id="main-menu">
</div> </div>
</div> </div>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<!-- Headings & Paragraph Copy --> <!-- Headings & Paragraph Copy -->
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="well"> <div class="well">
<h1>h1. Heading 1</h1> <h1>h1. Heading 1</h1>
...@@ -98,13 +98,13 @@ ...@@ -98,13 +98,13 @@
<h6>h6. Heading 6</h6> <h6>h6. Heading 6</h6>
</div> </div>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example body text</h3> <h3>Example body text</h3>
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p> <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example addresses</h3> <h3>Example addresses</h3>
<address> <address>
...@@ -352,22 +352,22 @@ ...@@ -352,22 +352,22 @@
<div class="page-header"> <div class="page-header">
<h1>Forms</h1> <h1>Forms</h1>
</div> </div>
<div class="row"> <div class="row">
<div class="span7 offset1"> <div class="span7 offset1">
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-medium search-query"> <input type="text" class="input-medium search-query">
<button type="submit" class="btn">Search</button> <button type="submit" class="btn">Search</button>
</form> </form>
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-small" placeholder="Email"> <input type="text" class="input-small" placeholder="Email">
<input type="password" class="input-small" placeholder="Password"> <input type="password" class="input-small" placeholder="Password">
<button type="submit" class="btn">Go</button> <button type="submit" class="btn">Go</button>
</form> </form>
<form class="form-horizontal well"> <form class="form-horizontal well">
<fieldset> <fieldset>
<legend>Controls Bootstrap supports</legend> <legend>Controls Bootstrap supports</legend>
...@@ -562,14 +562,14 @@ ...@@ -562,14 +562,14 @@
<div class="span12"> <div class="span12">
<h3 id="labels">Labels</h3> <h3 id="labels">Labels</h3>
<span class="label">Default</span> <span class="label">Default</span>
<span class="label label-success">Success</span> <span class="label label-success">Success</span>
<span class="label label-warning">Warning</span> <span class="label label-warning">Warning</span>
<span class="label label-important">Important</span> <span class="label label-important">Important</span>
<span class="label label-info">Info</span> <span class="label label-info">Info</span>
</div> </div>
</div> </div>
<br /> <br />
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
<h3 id="progressbars">Progress bars</h3> <h3 id="progressbars">Progress bars</h3>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="progress"> <div class="progress">
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body class="preview" data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="../">Bootswatch</a> <a class="brand" href="../">Bootswatch</a>
<div class="nav-collapse"> <div class="nav-collapse" id="main-menu">
</div> </div>
</div> </div>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<!-- Headings & Paragraph Copy --> <!-- Headings & Paragraph Copy -->
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="well"> <div class="well">
<h1>h1. Heading 1</h1> <h1>h1. Heading 1</h1>
...@@ -98,13 +98,13 @@ ...@@ -98,13 +98,13 @@
<h6>h6. Heading 6</h6> <h6>h6. Heading 6</h6>
</div> </div>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example body text</h3> <h3>Example body text</h3>
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p> <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example addresses</h3> <h3>Example addresses</h3>
<address> <address>
...@@ -352,22 +352,22 @@ ...@@ -352,22 +352,22 @@
<div class="page-header"> <div class="page-header">
<h1>Forms</h1> <h1>Forms</h1>
</div> </div>
<div class="row"> <div class="row">
<div class="span7 offset1"> <div class="span7 offset1">
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-medium search-query"> <input type="text" class="input-medium search-query">
<button type="submit" class="btn">Search</button> <button type="submit" class="btn">Search</button>
</form> </form>
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-small" placeholder="Email"> <input type="text" class="input-small" placeholder="Email">
<input type="password" class="input-small" placeholder="Password"> <input type="password" class="input-small" placeholder="Password">
<button type="submit" class="btn">Go</button> <button type="submit" class="btn">Go</button>
</form> </form>
<form class="form-horizontal well"> <form class="form-horizontal well">
<fieldset> <fieldset>
<legend>Controls Bootstrap supports</legend> <legend>Controls Bootstrap supports</legend>
...@@ -562,14 +562,14 @@ ...@@ -562,14 +562,14 @@
<div class="span12"> <div class="span12">
<h3 id="labels">Labels</h3> <h3 id="labels">Labels</h3>
<span class="label">Default</span> <span class="label">Default</span>
<span class="label label-success">Success</span> <span class="label label-success">Success</span>
<span class="label label-warning">Warning</span> <span class="label label-warning">Warning</span>
<span class="label label-important">Important</span> <span class="label label-important">Important</span>
<span class="label label-info">Info</span> <span class="label label-info">Info</span>
</div> </div>
</div> </div>
<br /> <br />
...@@ -579,7 +579,7 @@ ...@@ -579,7 +579,7 @@
<h3 id="progressbars">Progress bars</h3> <h3 id="progressbars">Progress bars</h3>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="progress"> <div class="progress">
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body class="preview" data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="../">Bootswatch</a> <a class="brand" href="../">Bootswatch</a>
<div class="nav-collapse"> <div class="nav-collapse" id="main-menu">
</div> </div>
</div> </div>
</div> </div>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<!-- Headings & Paragraph Copy --> <!-- Headings & Paragraph Copy -->
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="well"> <div class="well">
<h1>h1. Heading 1</h1> <h1>h1. Heading 1</h1>
...@@ -97,13 +97,13 @@ ...@@ -97,13 +97,13 @@
<h6>h6. Heading 6</h6> <h6>h6. Heading 6</h6>
</div> </div>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example body text</h3> <h3>Example body text</h3>
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p> <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example addresses</h3> <h3>Example addresses</h3>
<address> <address>
...@@ -349,22 +349,22 @@ ...@@ -349,22 +349,22 @@
<div class="page-header"> <div class="page-header">
<h1>Forms</h1> <h1>Forms</h1>
</div> </div>
<div class="row"> <div class="row">
<div class="span7 offset1"> <div class="span7 offset1">
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-medium search-query"> <input type="text" class="input-medium search-query">
<button type="submit" class="btn">Search</button> <button type="submit" class="btn">Search</button>
</form> </form>
<form class="well form-search"> <form class="well form-search">
<input type="text" class="input-small" placeholder="Email"> <input type="text" class="input-small" placeholder="Email">
<input type="password" class="input-small" placeholder="Password"> <input type="password" class="input-small" placeholder="Password">
<button type="submit" class="btn">Go</button> <button type="submit" class="btn">Go</button>
</form> </form>
<form class="form-horizontal well"> <form class="form-horizontal well">
<fieldset> <fieldset>
<legend>Controls Bootstrap supports</legend> <legend>Controls Bootstrap supports</legend>
...@@ -559,14 +559,14 @@ ...@@ -559,14 +559,14 @@
<div class="span12"> <div class="span12">
<h3 id="labels">Labels</h3> <h3 id="labels">Labels</h3>
<span class="label">Default</span> <span class="label">Default</span>
<span class="label label-success">Success</span> <span class="label label-success">Success</span>
<span class="label label-warning">Warning</span> <span class="label label-warning">Warning</span>
<span class="label label-important">Important</span> <span class="label label-important">Important</span>
<span class="label label-info">Info</span> <span class="label label-info">Info</span>
</div> </div>
</div> </div>
<br /> <br />
...@@ -576,7 +576,7 @@ ...@@ -576,7 +576,7 @@
<h3 id="progressbars">Progress bars</h3> <h3 id="progressbars">Progress bars</h3>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="progress"> <div class="progress">
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</head> </head>
<body data-spy="scroll" data-target=".subnav" data-offset="50"> <body class="preview" data-spy="scroll" data-target=".subnav" data-offset="50">
<!-- Navbar <!-- Navbar
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</a> </a>
<a class="brand" href="../">Bootswatch</a> <a class="brand" href="../">Bootswatch</a>
<div class="nav-collapse"> <div class="nav-collapse" id="main-menu">
</div> </div>
</div> </div>
</div> </div>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<!-- Headings & Paragraph Copy --> <!-- Headings & Paragraph Copy -->
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<div class="well"> <div class="well">
<h1>h1. Heading 1</h1> <h1>h1. Heading 1</h1>
...@@ -98,13 +98,13 @@ ...@@ -98,13 +98,13 @@
<h6>h6. Heading 6</h6> <h6>h6. Heading 6</h6>
</div> </div>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example body text</h3> <h3>Example body text</h3>
<p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> <p>Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p>
<p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p> <p>Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec sed odio dui.</p>
</div> </div>