Unverified Commit 89b2db66 authored by David Haynes's avatar David Haynes
Browse files

Refactor the navbar to look nicer on mobile

- also remove pages for the time being
parent d9d268a1
Pipeline #1037 passed with stage
in 2 minutes and 57 seconds
...@@ -13,22 +13,4 @@ build_css: ...@@ -13,22 +13,4 @@ build_css:
- grunt build - grunt build
artifacts: artifacts:
paths: paths:
- masonstrap/masonstrap.min.css - masonstrap/masonstrap.min.css
\ No newline at end of file
pages:
stage: deploy
script:
- npm install
- npm install -g grunt-cli
- npm install -g bower
- apt-get update
- apt-get install ruby -y
- gem install sass
- bower install --allow-root
- grunt build
- mkdir .public
- cp index.html ./masonstrap/masonstrap.min.css ./assets/css/custom.css ./bower_components/bootstrap/dist/js/bootstrap.min.js ./assets/js/custom.js .public
- mv .public public
artifacts:
paths:
- public
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<!-- Metatags --> <!-- Metatags -->
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
<!-- Chrome on Android navbar color --> <!-- Chrome on Android navbar color -->
<meta name="theme-color" content="#006633"> <meta name="theme-color" content="#006633">
<!-- Opengraph tags --> <!-- Opengraph tags -->
...@@ -44,28 +44,34 @@ ...@@ -44,28 +44,34 @@
<!-- Define the navbar with the primary background color --> <!-- Define the navbar with the primary background color -->
<div class="navbar navbar-toggleable-md fixed-top navbar-inverse bg-primary"> <div class="navbar navbar-toggleable-md fixed-top navbar-inverse bg-primary">
<!-- <div class="navbar-header">
<!-- Brand logo + name -->
<a class="navbar-brand" href="/">
<img src="/assets/img/SRCT_square.svg" width="30" height="30" class="d-inline-block align-top">&nbsp;&nbsp;Masonstrap
</a>
<!--
Mobile buton toggle for the navbar (only displays in responsive mode) Mobile buton toggle for the navbar (only displays in responsive mode)
--> -->
<button class="navbar-toggler" type="button" data-toggle="collapse" <button class="navbar-toggler-right" type="button" data-toggle="collapse"
data-target="#navbarResponsive" aria-controls="navbarResponsive" data-target="#navbarResponsive" aria-controls="navbarResponsive"
aria-expanded="false" aria-label="Toggle navigation"> aria-expanded="false" aria-label="Toggle navigation" style="
<span class="navbar-toggler-icon"></span> border-color: transparent;
background: transparent;"
>
<span class="navbar-toggler-icon" style="
margin-top: 0.3em;
"></span>
</button> </button>
<!-- Container used to center content on navbar --> </div>
<div class="container">
<!-- <!--
Div contains elements that get collapsed when responsive mode kicks in Div contains elements that get collapsed when responsive mode kicks in
--> -->
<div class="collapse navbar-collapse" id="navbarResponsive"> <div class="collapse navbar-collapse" id="navbarResponsive">
<!-- Brand logo + name -->
<a class="navbar-brand" href="/">
<img src="/assets/img/SRCT_square.svg" width="24" height="24" alt="">&nbsp;&nbsp;Masonstrap
</a>
<!-- main navbar content (left side) --> <!-- main navbar content (left side) -->
<ul class="navbar-nav"> <ul class="navbar-nav">
...@@ -97,7 +103,6 @@ ...@@ -97,7 +103,6 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
<!-- Begin giant container for the entirety of the page content --> <!-- Begin giant container for the entirety of the page content -->
<div class="container"> <div class="container">
...@@ -811,7 +816,7 @@ ...@@ -811,7 +816,7 @@
</div> </div>
</div> </div>
<div class="col-lg-6"> <!--<div class="col-lg-6">
<h2 id="pagination">Pagination</h2> <h2 id="pagination">Pagination</h2>
<div class="bs-component"> <div class="bs-component">
<div> <div>
...@@ -893,7 +898,7 @@ ...@@ -893,7 +898,7 @@
</div> </div>
</div> </div>
</div> </div>-->
</div> </div>
</div> </div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment