trying new bootstrap version
This commit is contained in:
		
							
								
								
									
										5
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							@@ -3124,6 +3124,11 @@
 | 
				
			|||||||
      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
 | 
					      "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=",
 | 
				
			||||||
      "dev": true
 | 
					      "dev": true
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    "bootstrap": {
 | 
				
			||||||
 | 
					      "version": "5.0.1",
 | 
				
			||||||
 | 
					      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.0.1.tgz",
 | 
				
			||||||
 | 
					      "integrity": "sha512-Fl79+wsLOZKoiU345KeEaWD0ik8WKRI5zm0YSPj2oF1Qr+BO7z0fco6GbUtqjoG1h4VI89PeKJnMsMMVQdKKTw=="
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
    "boxen": {
 | 
					    "boxen": {
 | 
				
			||||||
      "version": "1.3.0",
 | 
					      "version": "1.3.0",
 | 
				
			||||||
      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
 | 
					      "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,6 +23,7 @@
 | 
				
			|||||||
    "@angular/router": "~12.0.1",
 | 
					    "@angular/router": "~12.0.1",
 | 
				
			||||||
    "@angular/service-worker": "~12.0.1",
 | 
					    "@angular/service-worker": "~12.0.1",
 | 
				
			||||||
    "angular-gauge": "^4.0.0",
 | 
					    "angular-gauge": "^4.0.0",
 | 
				
			||||||
 | 
					    "bootstrap": "^5.0.1",
 | 
				
			||||||
    "chart.js": "^2.9.4",
 | 
					    "chart.js": "^2.9.4",
 | 
				
			||||||
    "firebase": "^8.6.8",
 | 
					    "firebase": "^8.6.8",
 | 
				
			||||||
    "ng2-charts": "^2.4.2",
 | 
					    "ng2-charts": "^2.4.2",
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,22 +1,19 @@
 | 
				
			|||||||
<!doctype html>
 | 
					<!doctype html>
 | 
				
			||||||
<html lang="en">
 | 
					<html lang="en">
 | 
				
			||||||
<head>
 | 
					<head>
 | 
				
			||||||
  <title>Home Front</title>
 | 
					 | 
				
			||||||
  <base href="/">
 | 
					  <base href="/">
 | 
				
			||||||
 | 
					  <title>Home Front</title>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <meta charset="utf-8">
 | 
					  <meta charset="utf-8">
 | 
				
			||||||
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 | 
					  <meta name="viewport" content="width=device-width, initial-scale=1">
 | 
				
			||||||
  <meta name="theme-color" content="#000000">
 | 
					  <meta name="theme-color" content="#000000">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <link rel="icon" type="image/x-icon" href="assets/icon.png">
 | 
					  <link rel="icon" type="image/x-icon" href="assets/icon.png">
 | 
				
			||||||
  <link rel="stylesheet" type="text/css" href="assets/bootstrap.min.css">
 | 
					 | 
				
			||||||
  <link rel="manifest" href="src/manifest.json">
 | 
					  <link rel="manifest" href="src/manifest.json">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <script src="https://bernii.github.io/gauge.js/dist/gauge.min.js"></script>
 | 
					  <script src="https://bernii.github.io/gauge.js/dist/gauge.min.js"></script>
 | 
				
			||||||
  <link rel="manifest" href="manifest.json">
 | 
					 | 
				
			||||||
  <meta name="theme-color" content="#1976d2">
 | 
					 | 
				
			||||||
</head>
 | 
					</head>
 | 
				
			||||||
<body style="background-color: #2F323A;" class="mat-typography">
 | 
					<body style="background-color: #2F323A;">
 | 
				
			||||||
<app-root>
 | 
					<app-root>
 | 
				
			||||||
  <div style="position: fixed; left: 50%; top: 50%; transform: translate(-50%, -50%);">
 | 
					  <div style="position: fixed; left: 50%; top: 50%; transform: translate(-50%, -50%);">
 | 
				
			||||||
    <div class="text-center">
 | 
					    <div class="text-center">
 | 
				
			||||||
@@ -27,6 +24,5 @@
 | 
				
			|||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
  </div>
 | 
					  </div>
 | 
				
			||||||
</app-root>
 | 
					</app-root>
 | 
				
			||||||
<noscript>Please enable JavaScript to continue using this application.</noscript>
 | 
					 | 
				
			||||||
</body>
 | 
					</body>
 | 
				
			||||||
</html>
 | 
					</html>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,7 @@
 | 
				
			|||||||
/* You can add global styles to this file, and also import other style files */
 | 
					/* You can add global styles to this file, and also import other style files */
 | 
				
			||||||
 | 
					@import '~bootstrap/dist/css/bootstrap.min.css';
 | 
				
			||||||
@import url('https://fonts.googleapis.com/css?family=Roboto|Material+Icons');
 | 
					@import url('https://fonts.googleapis.com/css?family=Roboto|Material+Icons');
 | 
				
			||||||
@import "~@angular/material/prebuilt-themes/indigo-pink.css";
 | 
					@import '~@angular/material/prebuilt-themes/indigo-pink.css';
 | 
				
			||||||
@import url('https://cdnjs.cloudflare.com/ajax/libs/weather-icons/2.0.9/css/weather-icons.min.css');
 | 
					@import url('https://cdnjs.cloudflare.com/ajax/libs/weather-icons/2.0.9/css/weather-icons.min.css');
 | 
				
			||||||
@import url('https://cdnjs.cloudflare.com/ajax/libs/weather-icons/2.0.9/css/weather-icons-wind.min.css');
 | 
					@import url('https://cdnjs.cloudflare.com/ajax/libs/weather-icons/2.0.9/css/weather-icons-wind.min.css');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -29,7 +30,7 @@ html, body {
 | 
				
			|||||||
  height: 100%;
 | 
					  height: 100%;
 | 
				
			||||||
  width: 100%;
 | 
					  width: 100%;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  font-family: 'Archivo', sans-serif;
 | 
					  font-family: 'Roboto', sans-serif;
 | 
				
			||||||
  background-color: #2F323A;
 | 
					  background-color: #2F323A;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user