Skip to content

M
mytime
Commit f86fb483 authored by Prayas Jain's avatar Prayas Jain
Browse files
Options

Updated_Css

parent 39158fcc
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
src/main/webapp/WEB-INF/controllers/ExportDataController.js
View file @ f86fb483
...@@ -37,7 +37,7 @@ myApp ...@@ -37,7 +37,7 @@ myApp
showProgressDialog('Please wait while data is imported from file...!!!'); showProgressDialog('Please wait while data is imported from file...!!!');
var formData = new FormData(); var formData = new FormData();
formData.append('file', file); formData.append('file', file);
$http.post(appConfig.appUri+ "/employee/fileUpload?empId="+empId, $http.post(appConfig.appUri+ "employee/fileUpload?empId="+empId,
formData,{ formData,{
transformRequest : angular.identity, transformRequest : angular.identity,
headers : {'Content-Type' : undefined }, headers : {'Content-Type' : undefined },
......
src/main/webapp/WEB-INF/css/custom-theme.css
View file @ f86fb483
...@@ -160,11 +160,6 @@ i.fa.fa-refresh:hover { ...@@ -160,11 +160,6 @@ i.fa.fa-refresh:hover {
list-style: none; list-style: none;
padding: 0; padding: 0;
} }
.sidebar-nav {
overflow-y: scroll;
position: relative;
height: 555px;
}
#sidebar-wrapper .sidebar-nav li { #sidebar-wrapper .sidebar-nav li {
border-bottom: 1px dotted #34495e; border-bottom: 1px dotted #34495e;
line-height: normal; line-height: normal;
...@@ -257,6 +252,7 @@ i.fa.fa-refresh:hover { ...@@ -257,6 +252,7 @@ i.fa.fa-refresh:hover {
display: flex; display: flex;
/* height: calc(100% - 105px); need to test and enable*/ /* height: calc(100% - 105px); need to test and enable*/
overflow: hidden; overflow: hidden;
height:100%;
} }
/* .main-container #sidebar-left, .main-container #main { /* .main-container #sidebar-left, .main-container #main {
flex: 1; flex: 1;
......
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