Skip to content

Commit

Permalink
Merge pull request #48 from SEARCAPhil/Fixes-#43-webpack
Browse files Browse the repository at this point in the history
Fixes #43 webpack
  • Loading branch information
jkga authored Aug 15, 2018
2 parents 5065857 + b569cc3 commit 6117af8
Show file tree
Hide file tree
Showing 439 changed files with 14,624 additions and 24,005 deletions.
11 changes: 11 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@
"devDependencies": {
"adal-angular": "^1.0.17",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.4",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-preset-env": "^1.6.1",
"babel-preset-es2015": "^6.24.1",
"babelify": "^8.0.0",
Expand All @@ -123,13 +126,21 @@
"gulp-uglify": "^3.0.0",
"gulp-uglifyes": "^0.1.2",
"highcharts": "^6.1.0",
"html-loader": "^0.5.5",
"node-glob": "^1.2.0",
"popup-es": "0.2.1",
"quill": "^1.3.6",
"rimraf": "^2.6.2",
"run-sequence": "^2.2.0",
"sha1": "^1.1.1",
"style-loader": "^0.21.0",
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
"uglifyjs-webpack-plugin": "^1.2.7",
"url-loader": "^1.0.1",
"vinyl-buffer": "^1.0.0",
"vinyl-source-stream": "^1.1.0",
"webpack": "^4.14.0",
"workbox-build": "^2.1.1"
},
"postinstall": "install-app-deps"
Expand Down
36 changes: 0 additions & 36 deletions src/assets/css/default.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,44 +32,8 @@ summary{
outline:none;
}

.navbar-top{
background: rgb(60,60,60) !important;
margin-bottom: 0;
}
.nav-top-menu li a{
color: rgb(255,184,12) !important;
}
/*main menu*/
.main-menu{
margin-top: 50px;
}

.main-menu li{
padding: 10px 5px 10px 5px;
margin-bottom: 2px;
cursor:pointer;
font-size: 13px;
}

.main-menu li.sub {
color: #bbbbbb;
}

.main-menu li.sub .material-icons {
font-size: 20px !important;
}

.main-menu li.active{
background: rgb(255,184,12);
color: #000;
}

.main-menu li.deactivated{
opacity: 0.5;
}
.main-menu-list{
color: rgb(240,240,240);
}

.btn-group-xs > .btn, .btn-xs {
padding : .25rem .4rem;
Expand Down
21 changes: 1 addition & 20 deletions src/assets/css/modules/suppliers/list.css
Original file line number Diff line number Diff line change
Expand Up @@ -148,26 +148,7 @@

}

.dropdown-section{
position: absolute;
width: 150px;
height: 200px;
background: #fff;
z-index: 3;
right:0px;
display: none;
visibility:hidden;
opacity: 0;
transition: all 0.3s ease-in-out;
box-shadow: 0 0 7px rgba(0,0,0,.4)
}

.dropdown-section.open{
transition: opacity 0.3s ease-in-out;
visibility: visible;
display: block;
opacity: 1;
}


.bidding-status-info{
float: left;
Expand Down
Binary file added src/assets/img/mail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
112 changes: 0 additions & 112 deletions src/assets/js/_default.js

This file was deleted.

Loading

0 comments on commit 6117af8

Please sign in to comment.