diff --git a/templates/base.html b/templates/base.html deleted file mode 100644 index c465a9caf01ff14f8c64ecc1ed09ea6a4f5eac7a..0000000000000000000000000000000000000000 --- a/templates/base.html +++ /dev/null @@ -1,84 +0,0 @@ - - - {% block head %} - - {% include 'head.html' %} - - {% endblock %} - -
- {% block nav %} - - {% endblock %} -
-
- {% include 'about.html' %} -
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
- {% block content %} - - {% endblock %} -
-
-
- {% block footer %} - - {% endblock %} -
- - diff --git a/templates/head.html b/templates/head.html deleted file mode 100644 index 9af59ec34267cfa90a3cff29f0d04d0c9bffdbee..0000000000000000000000000000000000000000 --- a/templates/head.html +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - -{% block title %} - -What's Open - George Mason University - -{% endblock %} diff --git a/templates/layout/base.html b/templates/layout/base.html new file mode 100644 index 0000000000000000000000000000000000000000..b93d63d710d7ce41df75d814a25df4da2317e2ce --- /dev/null +++ b/templates/layout/base.html @@ -0,0 +1,20 @@ + + + {% include 'layout/head.html' %} + +
+ {% include 'layout/navbar.html' %} +
+
+
+ {% block content %} + {% endblock %} +
+
+
+ +
+ + diff --git a/templates/layout/footer.html b/templates/layout/footer.html new file mode 100644 index 0000000000000000000000000000000000000000..4d944c38dcab1de2d3d9272cf06ee6011bc09180 --- /dev/null +++ b/templates/layout/footer.html @@ -0,0 +1,7 @@ + + diff --git a/templates/layout/head.html b/templates/layout/head.html new file mode 100644 index 0000000000000000000000000000000000000000..a273d674c32d6dcaff19cafeed07f5e77c51a23b --- /dev/null +++ b/templates/layout/head.html @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + {% block title %} + What's Open - George Mason University + {% endblock %} + + diff --git a/templates/layout/navbar.html b/templates/layout/navbar.html new file mode 100644 index 0000000000000000000000000000000000000000..955d4bdd09e4299f5eb10296a5198a77aaeacd5e --- /dev/null +++ b/templates/layout/navbar.html @@ -0,0 +1,59 @@ + + + +
+
+ {% include 'about.html' %} +
+
+ + +
+
+
+ +
+
+
+
+
+
+
+
diff --git a/templates/location_grid.html b/templates/location_grid.html index 0a898507e52bd3e2ba28c93a7c9fcc99b0ba18fb..bc1e686839cdf5b76e2120b4cf3cbead24117df5 100644 --- a/templates/location_grid.html +++ b/templates/location_grid.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'layout/base.html' %} diff --git a/templates/restaurant_grid.html b/templates/restaurant_grid.html index 2cf867bbe3262987d8f80da05c0627e665a94738..a408873986a33ee701bbf770e4e2c8c632e284cd 100644 --- a/templates/restaurant_grid.html +++ b/templates/restaurant_grid.html @@ -1,4 +1,4 @@ -{% extends 'base.html' %} +{% extends 'layout/base.html' %} {% block campus %} diff --git a/website/static/css/style.css b/website/static/css/style.css index a405177b34d5c40d4bc63a13c92c26aae3d2a756..6aa33943c85164ab4b8a73c6d250195019214131 100644 --- a/website/static/css/style.css +++ b/website/static/css/style.css @@ -1,220 +1,220 @@ /*Bootstrap*/ .navbar-default { - background-color: rgba(252,252,255,0.96); - margin-bottom: 0; + background-color: rgba(252,252,255,0.96); + margin-bottom: 0; } .navbar-toggle { - background-color: white; + background-color: white; } .navbar-brand { - padding: 13px 18px; - font-size: 26px; + padding: 13px 18px; + font-size: 26px; } .navbar-default .navbar-nav > .active > a { - background: rgba(255,255,255,0.50); + background: rgba(255,255,255,0.50); } .navbar-default .navbar-nav > .active > a:hover { - background: rgba(255,255,255,0.50); - color: #000; + background: rgba(255,255,255,0.50); + color: #000; } /*Styles*/ body, html { - height: 100%; + height: 100%; } a{ - color: #006633; + color: #006633; } a:hover{ - color: Green; + color: Green; } a:visited{ - color: #003C00; + color: #003C00; } .holder{ - min-height: 100%; - position: relative; + min-height: 100%; + position: relative; } body { - background: url(/static/img/southside.jpg) center top no-repeat fixed; - background-size: cover; - padding-top: 50px; + background: url(/static/img/southside.jpg) center top no-repeat fixed; + background-size: cover; + padding-top: 50px; } .title{ - text-align: center; - font-size: 50px; - font-weight: 900; - margin-top:30px; - line-height: 50px; + text-align: center; + font-size: 50px; + font-weight: 900; + margin-top:30px; + line-height: 50px; } #grid{ - display: none; + display: none; } #grid div[class*='span']{ - margin-top:10px; - margin-bottom:10px; - line-height:1; + margin-top:10px; + margin-bottom:10px; + line-height:1; } .grid-box{ - margin-top: 10px; - margin-bottom: 10px; - cursor: pointer; + margin-top: 10px; + margin-bottom: 10px; + cursor: pointer; } .grid-box .restaurant{ - text-align:center; - background-color: white; - padding: 10px 2px; - margin-top: 5px; - margin-bottom: 5px; - height: 50px; - font-size: 21px; - overflow-y: hidden; + text-align:center; + background-color: white; + padding: 10px 2px; + margin-top: 5px; + margin-bottom: 5px; + height: 50px; + font-size: 21px; + overflow-y: hidden; } .opened{ - color:#141414; + color:#141414; } .restaurant.closing{ - color: #FFCC33; + color: #FFCC33; } .restaurant.closed{ - color: rgba(81,81,81,0.9); - background-color: rgba(255,255,255,0.65); + color: rgba(81,81,81,0.9); + background-color: rgba(255,255,255,0.65); } .restaurant .building{ - font-size: 15px; - padding-left: 2px; + font-size: 15px; + padding-left: 2px; } .search-row{ - text-align: center; - padding-top: 15px; + text-align: center; + padding-top: 15px; } ul.ui-autocomplete { - list-style: none; - visibility: hidden; + list-style: none; + visibility: hidden; } .campusDropdown{ - font-size: 20px; - margin-top: 10px; + font-size: 20px; + margin-top: 10px; } .gmu-brand { - padding: 0px 5px 0px 12px; - margin: none; - display: block; - text-align: center; + padding: 0px 5px 0px 12px; + margin: none; + display: block; + text-align: center; } .gmu-logo { - width: 150px; - height: auto; + width: 150px; + height: auto; } .main-container{ - padding-bottom: 200px; - margin-top: 20px; + padding-bottom: 200px; + margin-top: 20px; } #footer{ - background-color: rgba(252,252,255,0.96); - position: absolute; - bottom: 0; - left: 0; - right: 0; - height: 165px; - text-align: center; - font-size: 15px; + background-color: rgba(252,252,255,0.96); + position: absolute; + bottom: 0; + left: 0; + right: 0; + height: 165px; + text-align: center; + font-size: 15px; } .footer-row { - margin: 0; - background-color: rgba(252,252,255,0.96);; + margin: 0; + background-color: rgba(252,252,255,0.96);; } .footer-text{ - width:100%; - text-align:center; - margin-top: 12px; + width:100%; + text-align:center; + margin-top: 12px; } #footer-line { - display: none; + display: none; } #info-body { - width: 100%; - background-color: #FFF; - padding-top: 10px; - padding-bottom: 10px; - position: fixed; - top: 51px; - bottom: 0; - z-index: 1030; - display: none; - overflow-y: scroll; + width: 100%; + background-color: #FFF; + padding-top: 10px; + padding-bottom: 10px; + position: fixed; + top: 51px; + bottom: 0; + z-index: 1030; + display: none; + overflow-y: scroll; } #info-name { - font-size: 22px; - margin-bottom: 5px; + font-size: 22px; + margin-bottom: 5px; } #info-close, #about-close { - position: absolute; - right: 0; - padding: 6px 19px 19px 19px; - cursor: pointer; - z-index: 10; - opacity: 0.4; + position: absolute; + right: 0; + padding: 6px 19px 19px 19px; + cursor: pointer; + z-index: 10; + opacity: 0.4; } #about-close-nav { - opacity: 0.5; - padding: 2px 15px 0px 15px; - display: none; + opacity: 0.5; + padding: 2px 15px 0px 15px; + display: none; } #info-close:hover, #about-close:hover, #about-close-nav:hover { - opacity: 1; + opacity: 1; } #about-body{ - position: fixed; - z-index: 1040; - top: 51px; - width: 100%; - bottom: 0; - overflow: scroll; - display: none; + position: fixed; + z-index: 1040; + top: 51px; + width: 100%; + bottom: 0; + overflow: scroll; + display: none; } #about-container { - width: 100%; - overflow-y: auto; + width: 100%; + overflow-y: auto; } .about-content { - background-color: #FFF; - padding-bottom: 20px; + background-color: #FFF; + padding-bottom: 20px; } #about-example{ - background-color: rgba(255,255,255,0.4); + background-color: rgba(255,255,255,0.4); } .about-top-p{ - margin-top: 20px; + margin-top: 20px; } #about-link{ - cursor: pointer; + cursor: pointer; } .grid-blur{ - opacity: 0.54; - -webkit-filter: blur(3px); - -moz-filter: blur(3px); - -o-filter: blur(3px); - -ms-filter: blur(3px); - filter: blur(3px); + opacity: 0.54; + -webkit-filter: blur(3px); + -moz-filter: blur(3px); + -o-filter: blur(3px); + -ms-filter: blur(3px); + filter: blur(3px); } .main-container{ - /* Transitions for .grid-blur */ - -webkit-transition: opacity 356ms ease-in-out, -webkit-filter 356ms ease-in-out; - -moz-transition: opacity 356ms ease-in-out, -moz-filter 356ms ease-in-out;; - -o-transition: opacity 356ms ease-in-out, -o-filter 356ms ease-in-out;; - -ms-transition: opacity 356ms ease-in-out, -ms-filter 356ms ease-in-out; - transition: opacity 356ms ease-in-out, "filter" 356ms ease-in-out; + /* Transitions for .grid-blur */ + -webkit-transition: opacity 356ms ease-in-out, -webkit-filter 356ms ease-in-out; + -moz-transition: opacity 356ms ease-in-out, -moz-filter 356ms ease-in-out;; + -o-transition: opacity 356ms ease-in-out, -o-filter 356ms ease-in-out;; + -ms-transition: opacity 356ms ease-in-out, -ms-filter 356ms ease-in-out; + transition: opacity 356ms ease-in-out, "filter" 356ms ease-in-out; } .clip-height{ - max-height: 60%; + max-height: 60%; } /* Custom Responsive Classes */ /* xs */ @@ -223,55 +223,55 @@ ul.ui-autocomplete { } /* sm */ @media (min-width: 768px) { - #info-close { - padding: 6px 31px 31px 31px; - } - #about-close { - display: none; - } + #info-close { + padding: 6px 31px 31px 31px; + } + #about-close { + display: none; + } } /* md */ @media (min-width: 992px) { - #footer-line { - display: inline; - } - .gmu-brand { - position: absolute; - right: 15px; - } - .main-container{ - padding-bottom: 150px; - } - #footer { - height: 100px; - background-color: rgba(252,252,255,0.82) - } - .navbar { - position: relative; - } - body{ - padding-top: 0px; - } - .navbar-default { - background-color: rgba(252,252,255,0.82); - } - #info-body { - position: static; - cursor: pointer; - overflow-y: auto; - } - #info-close { - display: none; - } - #about-body { - bottom: 100px; - } - .navbar-nav li{ - margin-left: 10px; - margin-right: 10px; - } + #footer-line { + display: inline; + } + .gmu-brand { + position: absolute; + right: 15px; + } + .main-container{ + padding-bottom: 150px; + } + #footer { + height: 100px; + background-color: rgba(252,252,255,0.82) + } + .navbar { + position: relative; + } + body{ + padding-top: 0px; + } + .navbar-default { + background-color: rgba(252,252,255,0.82); + } + #info-body { + position: static; + cursor: pointer; + overflow-y: auto; + } + #info-close { + display: none; + } + #about-body { + bottom: 100px; + } + .navbar-nav li{ + margin-left: 10px; + margin-right: 10px; + } } /* lg */ @media (min-width: 1200px) { -} \ No newline at end of file +}