Fixed Navbar on top, unified button color and size

shsu · Mar 23, 2014 · dab9c41 · dab9c41
1 parent fc5dd05
commit dab9c41
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 42 deletions.
diff --git a/src/main/webapp/Partials/assign-manager.html b/src/main/webapp/Partials/assign-manager.html
@@ -31,8 +31,12 @@ <h1 class="secondary">Assign Manager to Project</h1><br />
       </div>
     </div>
     <div class="row">
-      <a href="#" data-toggle="modal" data-target="#addModal" class="pull-right btn btn-primary">Select</a>
-      <button ng-click="cancel()" class="pull-right btn btn-primary">Cancel</button>
+        <div class="col-lg-2 col-lg-offset-8 ">
+            <a data-toggle="modal" data-target="#addModal" class="pull-right btn btn-primary btn-block">Select</a>
+        </div>
+        <div class="col-lg-2 ">
+            <button ng-click="cancel()" class="pull-right btn btn-primary btn-block">Cancel</button>
+        </div>
     </div>
 
   <div class="modal manager fade" id="addModal" tabindex="-1" role="dialog" aria-labelledby="editModalLabel" aria-hidden="true">

diff --git a/src/main/webapp/Partials/edit-pay-rates.html b/src/main/webapp/Partials/edit-pay-rates.html
@@ -2,23 +2,17 @@
   <div ng-controller="EditPayRatesController">
     <h1 class="secondary">Edit Pay Rates</h1><br />
     <div class="row">
-        <div class="col-lg-9 col-lg-offset-2">
-            <div class="btn-group btn-group-justified">
-                <div class="btn-group">
-                    <button class="btn btn-info btn-lg btn-block" ng-click="prior()"><span class="glyphicon glyphicon-chevron-left"></span> Previous</button>
-                </div>
-                <div class="btn-group">
-                    <button class="btn btn-info btn-lg btn-block"  ng-click="current()">Current</button>
-                </div>
-                <div class="btn-group">
-                    <button class="btn btn-info btn-lg btn-block" ng-click="next()">Next <span class="glyphicon glyphicon-chevron-right"></span></button>
-                </div>
-            </div>
+        <div class="col-lg-4 col-lg-offset-2 nopadding">
+            <button class="btn btn-info btn-lg btn-block" ng-click="prior()"><span class="glyphicon glyphicon-chevron-left"></span> Previous</button>
+        </div>
+        <div class="col-lg-3 nopadding">
+            <button class="btn btn-info btn-lg btn-block"  ng-click="current()">Current</button>
+        </div>
+        <div class="col-lg-3 nopadding">
+            <button class="btn btn-info btn-lg btn-block" ng-click="next()">Next <span class="glyphicon glyphicon-chevron-right"></span></button>
         </div>
-    </div>
-    <div class="row paytable">
       <div class="col-lg-4 col-lg-offset-2 nopadding">
-          <table class="table table-hover table-bordered table-condensed">
+          <table class="table table-hover table-bordered">
               <tr>
                 <th class="alignCenter">Pay Level</th>
                 <th class ="alignCenter">{{(index - 1)}}</th>
@@ -29,8 +23,8 @@ <h1 class="secondary">Edit Pay Rates</h1><br />
               </tr>
           </table>
       </div>
-      <div class="col-lg-2 nopadding">
-          <table class="table table-hover table-condensed">
+      <div class="col-lg-3 nopadding">
+          <table class="table table-hover ">
             <tbody>
             <tr>
               <th class="alignCenter">{{(index)}}</th>
@@ -41,8 +35,8 @@ <h1 class="secondary">Edit Pay Rates</h1><br />
             </tbody>
           </table>
       </div>
-      <div class="col-lg-2 nopaddingL">
-          <table class="table table-hover table-condensed">
+      <div class="col-lg-3 nopadding">
+          <table class="table table-hover ">
             <tbody>
               <tr> 
                 <th class="alignCenter">{{(index + 1)}}</th>
@@ -55,7 +49,7 @@ <h1 class="secondary">Edit Pay Rates</h1><br />
       </div>
     </div> 
     <div class="row">
-        <div class="col-lg-4 col-lg-offset-5">
+        <div class="col-lg-3 col-lg-offset-6 nopadding">
             <button class="btn btn-primary btn-lg btn-block" ng-click="edit()">Save</button>
         </div>
     </div>

diff --git a/src/main/webapp/Partials/manage-wp.html b/src/main/webapp/Partials/manage-wp.html
@@ -1,6 +1,6 @@
 <content>
 <div ng-controller="WPManagementController">
-  <h1 class="secondary">Manage WP</h1><br />
+  <h1 class="secondary">Manage Work Package</h1><br />
   <div class="row">
         <p class="col-lg-3">Project No. 
           <select ng-model="project" ng-change="listWP(project)" ng-options="p.projectNumber for p in projects">
@@ -45,8 +45,14 @@ <h1 class="secondary">Manage WP</h1><br />
     </div>
   </div>
   <div class="row">
-    <button class="pull-right btn btn-primary" ng-click="edit()">Save</button>
-    <button class="pull-right btn btn-primary">Create Work Package</button>
+    <div class="col-lg-2 col-lg-offset-10 ">
+        <button class="btn-block btn btn-success">Create Work Package</button>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-lg-2 col-lg-offset-10 ">
+        <button class="btn btn-primary btn-block" ng-click="edit()">Save</button>
+    </div>  
   </div>
 </div>
 </content>
diff --git a/src/main/webapp/Partials/timesheet.html b/src/main/webapp/Partials/timesheet.html
@@ -52,9 +52,11 @@ <h1 class="secondary col-xs-4">TimeSheet</h1>
           </tbody>
         </table>
         <footer>
-          <p class="col-xs-4">Overtime: {{timesheet.overTime}} </p>
-          <p class="col-xs-4">Flextime: {{user.totalFlexTime}} </p>
-          <button class="btn btn-primary" ng-click="add()">Add new row</button>
+          <div class="row"><p class="col-xs-4">Overtime: {{timesheet.overTime}} </p></div>
+          <div class="row">
+            <p class="col-xs-4">Flextime: {{user.totalFlexTime}} </p>
+            <div class="col-xs-2 col-xs-offset-6"><button class="btn btn-success btn-block" ng-click="add()">Add new row</button></div>
+          </div>
         </footer>
       </div>
     </div>
@@ -63,8 +65,8 @@ <h1 class="secondary col-xs-4">TimeSheet</h1>
         <p><input type="checkbox" ng-model="default" /><span> Make Default</span></p>
         <p><input type="checkbox" ng-model="timesheet.signed" /><span> Signature</span></p>
       </div>
-      <div class="col-xs-6">
-        <button class="btn btn-primary" ng-click="save()">Save</button>
+      <div class="col-xs-2 col-xs-offset-4">
+        <button class="btn btn-primary btn-block" ng-click="save()">Save</button>
       </div>    
     </footer>
   </div>

diff --git a/src/main/webapp/Partials/user-management-hr.html b/src/main/webapp/Partials/user-management-hr.html
@@ -9,7 +9,7 @@ <h1 class="secondary">User Management - HR</h1><br />
     <a href="#/edit-pay-rates" id="edit" class="pull-right">Edit Pay Rates</a>
 
     </div>
-  <div class="row usertable">
+  <div class="row">
     <div class="table-responsive">
       <table class="table table-striped table-hover table-bordered">
         <tbody>
@@ -40,10 +40,14 @@ <h1 class="secondary">User Management - HR</h1><br />
     </div>
   </div>
   <div class="row">
-    <button class="btn btn-primary pull-right">Add New Employee</button>
+    <div class="col-lg-2 col-lg-offset-10 ">
+        <button class="btn btn-success btn-block">Add New Employee</button>
+    </div>
   </div>
   <div class="row">
-    <button class="btn btn-primary pull-right" ng-click="edit()">Save</button>
+    <div class="col-lg-2 col-lg-offset-10 ">
+        <button class="btn btn-primary btn-block" ng-click="edit()">Save</button>
+    </div>  
   </div>
 </div>
 </content>
diff --git a/src/main/webapp/Partials/user-profile.html b/src/main/webapp/Partials/user-profile.html
@@ -1,8 +1,6 @@
 <content>
   <div ng-controller="UserProfileController">
-    <div class="row">
-      <h1 class="secondary">User Profile</h1>
-    </div>
+    <h1 class="secondary">User Profile</h1><br />
     <div class="row">
       <div class="table-responsive col-sm-6">
         <table class="table table-striped table-hover table-bordered">
@@ -50,8 +48,12 @@ <h1 class="secondary">User Profile</h1>
       </div>    
     </div>
     <div class="row">
-      <a href="#/assign-employee-project/{{mUser.Id}}" ng-hide=""class="btn btn-primary pull-left">Add to Project</a>
-      <button class="btn btn-primary pull-right">Save</button>
+        <div class="col-sm-2">
+            <a href="#/assign-employee-project/{{mUser.Id}}" ng-hide=""class="btn btn-success btn-block">Add to Project</a>
+        </div>
+        <div class="col-sm-2 col-sm-offset-8">
+            <button class="btn btn-primary btn-block">Save</button>
+        </div>
     </div>
     <div class="row">
       <h1>Assigned Projects and WPs</h1>

diff --git a/src/main/webapp/css/app.css b/src/main/webapp/css/app.css
@@ -4,6 +4,7 @@ body {
 	font-size: 16px;
     -webkit-font-smoothing: antialiased;
     -webkit-overflow-scrolling: touch;
+    padding-top: 70px;
 }
 
 /* Titles */
@@ -124,6 +125,7 @@ div.ng-scope {
   padding-top: 37px; }
 
 .timesheet {
+  overflow:auto;
   padding: 20px;
   border: 1px solid #dddddd; }
   .timesheet footer {
@@ -187,8 +189,7 @@ time {
 .manager .modal-dialog {
   width: 500px; }
 
-.usertable {
-  font-family: monospace; }
+
 
 .body .usertable table.table tr .th-narrow {
   width: 15%; }
@@ -208,4 +209,17 @@ time {
 
 .cursor-hand {
   cursor: pointer;
-}
+}
+.col-min-width{
+    min-width: 90px;
+}
+.alignCenter{
+    text-align: center;
+}
+.nopadding {
+   padding: 0 !important;
+
+}
+.nopaddingL {
+   margin-left: 16px !important;
+}
diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -15,7 +15,7 @@
 
 </head>
 <body class="body">
-  <nav class="navbar navbar-inverse bg-primary" ng-controller="NavigationController" ng-if="isAuthenticated" role="navigation">
+  <nav class="navbar navbar-inverse bg-primary navbar-fixed-top" ng-controller="NavigationController" ng-if="isAuthenticated" role="navigation">
     <div class="navbar-header">
       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
         <span class="sr-only">Toggle navigation</span>