tanmoythander · Apr 16, 2018
diff --git a/‎components/controllers/list.controller.js
+1-1 b/‎components/controllers/list.controller.js
+1-1
diff --git a/‎components/directives/carousel.html
+1-1 b/‎components/directives/carousel.html
+1-1
diff --git a/‎images/bootstrap-stack.png
50.9 KB b/‎images/bootstrap-stack.png
50.9 KB
diff --git a/‎images/bootstrap.jpg
-33.1 KB b/‎images/bootstrap.jpg
-33.1 KB
diff --git a/‎index.html
+5-4 b/‎index.html
+5-4
diff --git a/‎js/nonangular/bootstrap.js
-2,377 b/‎js/nonangular/bootstrap.js
-2,377
diff --git a/‎js/nonangular/jquery-1.11.2.min.js
-4 b/‎js/nonangular/jquery-1.11.2.min.js
-4
diff --git a/‎js/nonangular/jquery-3.2.1.js
-10,253 b/‎js/nonangular/jquery-3.2.1.js
-10,253
diff --git a/‎js/nonangular/npm.js
-13 b/‎js/nonangular/npm.js
-13
diff --git a/‎package-lock.json
+10 b/‎package-lock.json
+10
diff --git a/‎package.json
+2 b/‎package.json
+2
diff --git a/‎styles/directive.css
+1 b/‎styles/directive.css
+1
@@ -14,7 +14,7 @@
 			'ESlint',
 			'jQuery',
 			'lodash',
-			'Bootstrap',
+			'Bootstrap 4.1',
 			'font-awesome',
 			'owl-carousel-2'
 		];
 
@@ -6,7 +6,7 @@
 		<img src="images/angularJS.jpg">
 	</div>
 	<div class="item">
-		<img src="images/bootstrap.jpg">
+		<img height="380px" src="images/bootstrap-stack.png">
 	</div>
 	<div class="item">
 		<img src="images/gulpjs.jpg">
 
@@ -20,8 +20,9 @@
 		<!-- build:css css/style.min.css -->
 
 		<!-- Library -->
-		<link rel="stylesheet" type="text/css" href="styles/bootstrap.css" />
-		<link rel="stylesheet" type="text/css" href="styles/bootstrap-theme.css" />
+		<link rel="stylesheet" type="text/css" href="node_modules/bootstrap/dist/css/bootstrap.css" />
+		<link rel="stylesheet" type="text/css" href="node_modules/bootstrap/dist/css/bootstrap-grid.css" />
+		<link rel="stylesheet" type="text/css" href="node_modules/bootstrap/dist/css/bootstrap-reboot.css" />
 		<link rel="stylesheet" type="text/css" href="styles/font-awesome.css" />
 		<link rel="stylesheet" type="text/css" href="styles/owl.carousel.css" />
 		<link rel="stylesheet" type="text/css" href="styles/owl.theme.default.css" />
@@ -44,8 +45,8 @@
 
 		<!-- Vendors -->
 		<!-- build:nonangularlibs js/nonangularlibs.js -->
-		<script type="text/javascript" src="js/nonangular/jquery-3.2.1.js"></script>
-		<script type="text/javascript" src="js/nonangular/bootstrap.js"></script>
+		<script type="text/javascript" src="node_modules/jquery/dist/jquery.js"></script>
+		<script type="text/javascript" src="node_modules/bootstrap/dist/js/bootstrap.bundle.js"></script>
 		<!-- endbuild -->
 
 		<!-- Non-angular libraries -->
 
@@ -51,8 +51,10 @@
     "angular": "1.5.11",
     "angular-resource": "~1.5.8",
     "angular-ui-router": "^0.4.3",
+    "bootstrap": "^4.1.0",
     "gulp-imagemin": "^3.4.0",
     "gulp-sass": "^3.1.0",
+    "jquery": "^3.3.1",
     "ngstorage": "^0.3.11"
   }
 }
@@ -10,4 +10,5 @@
 	background: #0f1f3d;
 	color: white;
 	padding-top: 7px;
+	padding-bottom: 1px;
 }
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,10 @@`
`51`	`51`	`"angular": "1.5.11",`
`52`	`52`	`"angular-resource": "~1.5.8",`
`53`	`53`	`"angular-ui-router": "^0.4.3",`
	`54`	`+ "bootstrap": "^4.1.0",`
`54`	`55`	`"gulp-imagemin": "^3.4.0",`
`55`	`56`	`"gulp-sass": "^3.1.0",`
	`57`	`+ "jquery": "^3.3.1",`
`56`	`58`	`"ngstorage": "^0.3.11"`
`57`	`59`	`}`
`58`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,5 @@`
`10`	`10`	`background: #0f1f3d;`
`11`	`11`	`color: white;`
`12`	`12`	`padding-top: 7px;`
	`13`	`+ padding-bottom: 1px;`
`13`	`14`	`}`