Merge pull request #13 from rafaelbrg/bootstrap

added bootstrap to project
rafaelbrg · Nov 23, 2018 · 3bd4d36 · 3bd4d36
2 parents 570cdaf + 5234bf9
commit 3bd4d36
Show file tree

Hide file tree

Showing 18 changed files with 10,070 additions and 19 deletions.
diff --git a/css/bootstrap-theme.css b/css/bootstrap-theme.css
diff --git a/css/bootstrap-theme.css.map b/css/bootstrap-theme.css.map
diff --git a/css/bootstrap-theme.min.css b/css/bootstrap-theme.min.css
diff --git a/css/bootstrap-theme.min.css.map b/css/bootstrap-theme.min.css.map
diff --git a/css/bootstrap.css b/css/bootstrap.css
diff --git a/css/bootstrap.css.map b/css/bootstrap.css.map
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/css/bootstrap.min.css.map b/css/bootstrap.min.css.map
diff --git a/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot
diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg
diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf
diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff
diff --git a/fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2
diff --git a/js/bootstrap.js b/js/bootstrap.js
diff --git a/js/bootstrap.min.js b/js/bootstrap.min.js
diff --git a/js/jquery-3.3.1.min.js b/js/jquery-3.3.1.min.js
diff --git a/js/npm.js b/js/npm.js
@@ -0,0 +1,13 @@
+// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
+require('../../js/transition.js')
+require('../../js/alert.js')
+require('../../js/button.js')
+require('../../js/carousel.js')
+require('../../js/collapse.js')
+require('../../js/dropdown.js')
+require('../../js/modal.js')
+require('../../js/tooltip.js')
+require('../../js/popover.js')
+require('../../js/scrollspy.js')
+require('../../js/tab.js')
+require('../../js/affix.js')
diff --git a/popup.html b/popup.html
@@ -1,24 +1,26 @@
 <!DOCTYPE html>
 
 	<html>
-	
+
 		<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-			<link type="text/css" rel="stylesheet"
-			href="stylesheet.css">		
+		<link href="css/bootstrap.min.css" rel="stylesheet" type="text/css">
+		<link href="stylesheet.css" rel="stylesheet" type="text/css">
+		<script type="text.javascript" src="js/jquery-3.3.1.min.js"></script>
+		<script type="text/javascript" src="js/bootstrap.min.js"></script>
 		</head>
-	
+
 		<body>
 			<div id="top">
 				<h1 id="titulo">Nome da Extensão</h1>
 			</div>
-			
-			<div id="info"> 
+
+			<div id="info">
 				<h2 id="subtitulo">Hoje</h2>
-				<div id="grafico">	
-					<object data="graphicTest/empty-example/index.html" width="154" height="154" margin="0px"></object>	
+				<div id="grafico">
+					<object data="graphicTest/empty-example/index.html" width="154" height="154" margin="0px"></object>
 				</div>
-				
+
 				<div id="dados">
 					<h1 id="dado">
 						Tempo gasto em vídeos produtivos: 00:00hrs
@@ -31,13 +33,13 @@ <h3 id="dado">
 					</h3>
 				</div>
 			</div>
-			
-			<div id="info"> 
+
+			<div id="info">
 				<h2 id="subtitulo">Na Semana</h2>
-				<div id="grafico">	
-					<object data="graphicTest/empty-example/index.html" width="154" height="154" margin="0px"></object>	
+				<div id="grafico">
+					<object data="graphicTest/empty-example/index.html" width="154" height="154" margin="0px"></object>
 				</div>
-				
+
 				<div id="dados">
 					<h1 id="dado">
 						Tempo gasto em vídeos produtivos: 00:00hrs
@@ -50,22 +52,22 @@ <h3 id="dado">
 					</h3>
 				</div>
 			</div>
-			
+
 			<div id="info_final">
 				<p> Hoje você passou 0% de tempo a mais no Youtube do que ontem. </p>
 			</div>
-			
+
 			<div id="extra">
 				<ul>
 					<li> <a href="http://endereco/dados">Outros Graficos</a> </li>
 					<li> <a href="http://endereco/config">Configurações</a> </li>
 				</ul>
 			</div>
-			
+
 			<div id="final">
 				<p id="strawberry">STRAWBERRY ICECREAM</p>
 			</div>
-		
+
 		</body>
-	
+
 	</html>