Product Title header updated and Company name moved with the user name

bcgov · May 5, 2017 · 6900e74 · 6900e74
1 parent 938e183
commit 6900e74
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 7 deletions.
diff --git a/assets/css/app.css b/assets/css/app.css
@@ -2272,7 +2272,7 @@ i.active {
 }
 
 .header-profile {
-  line-height: 71px;
+  padding-top: 15px;
 }
 
 .header-profile > span {

diff --git a/static/css/app.css b/static/css/app.css
@@ -2121,8 +2121,6 @@ a.accordion-btn:hover{
 
 .panel>.panel-heading {
     background-color: #f1f1f3;
-    border-color: #f1f1f3;
-    padding: 8px;
     cursor: pointer;
 }
 .panel-heading{
@@ -2240,6 +2238,7 @@ h5.twitterUserName a{
 
 .notification-list > a {
   text-decoration: none;
+  height: 42px;
 }
 
 .transaction-item {
@@ -2249,3 +2248,43 @@ h5.twitterUserName a{
 .notification-item {
   width: calc(100% - 70px);
 }
+
+.horizontal-line {
+  height: 1px;
+  background-color: rgb(204, 204, 204);
+}
+
+.notifications-header {
+  background-color: #f5f5f5;
+}
+
+.notifications-header > span {
+  font-weight: bold;
+}
+
+i.active {
+  color: red;
+}
+
+.company-header {
+  font-size: 50px;
+  font-weight: bold;
+}
+
+.header-profile {
+  padding-top: 15px;
+}
+
+.header-profile > span {
+  font-size: 20px;
+}
+
+.header-profile > i {
+  font-size: 22px;
+  padding-left: 5px;
+}
+
+.more-link {
+  float: right;
+  text-decoration: none !important;
+}
diff --git a/tfrs/templates/base.html b/tfrs/templates/base.html
@@ -115,10 +115,12 @@ <h1>Transportation Fuels Reporting System</h1>
                 <li><a id="collapse-navbar-home-fuel-supplier-compliance" href="http://www2.gov.bc.ca/gov/content/industry/electricity-alternative-energy/transportation-energies/renewable-low-carbon-fuels/fuel-supplier-compliance">Fuel Supplier Compliance</a></li>
 				<li><a id="collapse-navbar-home-credits-transfers" href="http://www2.gov.bc.ca/gov/content/industry/electricity-alternative-energy/transportation-energies/renewable-low-carbon-fuels/credits-transfers">Credit Transfers</a></li>
                 <li><a id="collapse-navbar-dashboard" href="/">Dashboard</a></li>
-				<li><a id="collapse-navbar-new-transaction" href="/new-transaction">New Transaction</a></li>
+                <li><a id="navbar-fuelsupplier" href="/fuel-suppliers">Fuel Suppliers</a></li>
+			    <li><a id="navbar-offers" href="/offers">Offers</a></li>
 				<li><a id="collapse-navbar-account-activity" href="/account-activity">Account Activity</a></li>
 				<li><a id="collapse-navbar-notifications" href="/notifications">Notifications</a></li>
                 <li><a id="collapse-navbar-settings" href="/settings">Settings</a></li>
+                <!--Remove this menu item and add a "New Transaction" button to the dashboard--><li><a id="collapse-navbar-new-transaction" href="/new-transaction">New Transaction</a></li>
               </ul>
             </div>
             <!-- /COLLAPSING NAVBAR -->
@@ -130,10 +132,13 @@ <h1>Transportation Fuels Reporting System</h1>
               <a id="navbar-home-fuel-supplier-compliance" href="http://www2.gov.bc.ca/gov/content/industry/electricity-alternative-energy/transportation-energies/renewable-low-carbon-fuels/fuel-supplier-compliance">Fuel Supplier Compliance</a>
 			  <a id="navbar-home-credits-transfers" href="http://www2.gov.bc.ca/gov/content/industry/electricity-alternative-energy/transportation-energies/renewable-low-carbon-fuels/credits-transfers">Credit Transfers</a>
               <a id="navbar-dashboard" href="/">Dashboard</a>
-              <a id="navbar-new-transaction" href="/new-transaction">New Transaction</a>
+              <a id="navbar-fuelsupplier" href="/fuel-suppliers">Fuel Suppliers</a>
+			  <a id="navbar-offers" href="/offers">Offers</a>
               <a id="navbar-account-activity" href="/account-activity">Account Activity</a>
               <a id="navbar-notifications" href="/notifications">Notifications</a>
               <a id="navbar-settings" href="/settings">Settings</a>
+			  <a id="navbar-fuelsupplier" href="/administration">Administration</a>
+			  <!--Remove this menu item and add a "New Transaction" button to the dashboard--><a id="navbar-new-transaction" href="/new-transaction">New Transaction</a>
             </div>
           </div>
         </div>
@@ -146,11 +151,12 @@ <h1>Transportation Fuels Reporting System</h1>
       <div class="row">
         <div class="row">
           <div class="col-xs-12">
-            <span class="pull-left company-header">BC EveryFuel</span>
+            <span class="pull-left h1">Credits</span>
             <span class="pull-right header-profile">
-              <span>Every User</span>
+              <span>Every User</br>BC Every Fuel</span>
               <i class="fa fa-user" aria-hidden="true"></i>
               <i class="fa fa-cog" aria-hidden="true"></i>
+
             </span>
           </div>
         </div>