mirror of https://github.com/twbs/bootstrap.git
				
				
				
			Refactor Dashboard example. (#21140)
This commit is contained in:
		
							parent
							
								
									d315c9499d
								
							
						
					
					
						commit
						91f70c538a
					
				|  | @ -7,96 +7,64 @@ body { | ||||||
|   padding-top: 50px; |   padding-top: 50px; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| /* | /* | ||||||
|  * Global add-ons |  * Typography | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| .sub-header { | h1 { | ||||||
|   padding-bottom: 10px; |   margin-bottom: 20px; | ||||||
|  |   padding-bottom: 9px; | ||||||
|   border-bottom: 1px solid #eee; |   border-bottom: 1px solid #eee; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| /* |  | ||||||
|  * Top navigation |  | ||||||
|  * Hide default border to remove 1px line. |  | ||||||
|  */ |  | ||||||
| .navbar-fixed-top { |  | ||||||
|   border: 0; |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| /* | /* | ||||||
|  * Sidebar |  * Sidebar | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
| /* Hide for mobile, show later */ |  | ||||||
| .sidebar { |  | ||||||
|   display: none; |  | ||||||
| } |  | ||||||
| @media (min-width: 768px) { |  | ||||||
| .sidebar { | .sidebar { | ||||||
|   position: fixed; |   position: fixed; | ||||||
|   top: 51px; |   top: 51px; | ||||||
|   bottom: 0; |   bottom: 0; | ||||||
|   left: 0; |   left: 0; | ||||||
|   z-index: 1000; |   z-index: 1000; | ||||||
|     display: block; |  | ||||||
|   padding: 20px; |   padding: 20px; | ||||||
|   overflow-x: hidden; |   overflow-x: hidden; | ||||||
|   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ |   overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */ | ||||||
|     background-color: #f5f5f5; |  | ||||||
|   border-right: 1px solid #eee; |   border-right: 1px solid #eee; | ||||||
| } | } | ||||||
| } |  | ||||||
| 
 | 
 | ||||||
| /* Sidebar navigation */ | /* Sidebar navigation */ | ||||||
| .nav-sidebar { | .sidebar { | ||||||
|   margin-right: -21px; /* 20px padding + 1px border */ |   padding-left: 0; | ||||||
|  |   padding-right: 0; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .sidebar .nav { | ||||||
|   margin-bottom: 20px; |   margin-bottom: 20px; | ||||||
|   margin-left: -20px; |  | ||||||
| } |  | ||||||
| .nav-sidebar > li > a { |  | ||||||
|   padding-right: 20px; |  | ||||||
|   padding-left: 20px; |  | ||||||
| } |  | ||||||
| .nav-sidebar > .active > a, |  | ||||||
| .nav-sidebar > .active > a:hover, |  | ||||||
| .nav-sidebar > .active > a:focus { |  | ||||||
|   color: #fff; |  | ||||||
|   background-color: #428bca; |  | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | .sidebar .nav-item { | ||||||
|  |   width: 100%; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .sidebar .nav-item + .nav-item { | ||||||
|  |   margin-left: 0; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | .sidebar .nav-link { | ||||||
|  |   border-radius: 0; | ||||||
|  | } | ||||||
| 
 | 
 | ||||||
| /* | /* | ||||||
|  * Main content |  * Dashboard | ||||||
|  */ |  | ||||||
| 
 |  | ||||||
| .main { |  | ||||||
|   padding: 20px; |  | ||||||
| } |  | ||||||
| @media (min-width: 768px) { |  | ||||||
|   .main { |  | ||||||
|     padding-right: 40px; |  | ||||||
|     padding-left: 40px; |  | ||||||
|   } |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| 
 |  | ||||||
| /* |  | ||||||
|  * Placeholder dashboard ideas |  | ||||||
|  */ |  */ | ||||||
| 
 | 
 | ||||||
|  |  /* Placeholders */ | ||||||
| .placeholders { | .placeholders { | ||||||
|   margin-bottom: 30px; |   padding-bottom: 3rem; | ||||||
|   text-align: center; |  | ||||||
| } |  | ||||||
| .placeholders h4 { |  | ||||||
|   margin-bottom: 0; |  | ||||||
| } |  | ||||||
| .placeholder { |  | ||||||
|   margin-bottom: 20px; |  | ||||||
| } | } | ||||||
|  | 
 | ||||||
| .placeholder img { | .placeholder img { | ||||||
|   display: inline-block; |   padding-top: 1.5rem; | ||||||
|   border-radius: 50%; |   padding-bottom: 1.5rem; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -19,70 +19,101 @@ | ||||||
|   </head> |   </head> | ||||||
| 
 | 
 | ||||||
|   <body> |   <body> | ||||||
| 
 |     <nav class="navbar navbar-fixed-top navbar-dark bg-inverse"> | ||||||
|     <nav class="navbar navbar-dark navbar-fixed-top bg-inverse"> |       <button class="navbar-toggler hidden-md-up" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation"></button> | ||||||
|       <button type="button" class="navbar-toggler hidden-sm-up" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar" aria-label="Toggle navigation"></button> |       <div class="collapse navbar-toggleable-sm" id="navbar"> | ||||||
|         <a class="navbar-brand" href="#">Project name</a> |         <a class="navbar-brand" href="#">Project name</a> | ||||||
|       <div id="navbar"> |         <ul class="nav navbar-nav float-sm-right"> | ||||||
|         <nav class="nav navbar-nav float-xs-left"> |           <li class="nav-item active"> | ||||||
|           <a class="nav-item nav-link" href="#">Dashboard</a> |             <a class="nav-link" href="#">Dashboard <span class="sr-only">(current)</span></a> | ||||||
|           <a class="nav-item nav-link" href="#">Settings</a> |           </li> | ||||||
|           <a class="nav-item nav-link" href="#">Profile</a> |           <li class="nav-item"> | ||||||
|           <a class="nav-item nav-link" href="#">Help</a> |             <a class="nav-link" href="#">Settings</a> | ||||||
|         </nav> |           </li> | ||||||
|         <form class="float-xs-right"> |           <li class="nav-item"> | ||||||
|           <input type="text" class="form-control" placeholder="Search..."> |             <a class="nav-link" href="#">Profile</a> | ||||||
|  |           </li> | ||||||
|  |           <li class="nav-item"> | ||||||
|  |             <a class="nav-link" href="#">Help</a> | ||||||
|  |           </li> | ||||||
|  |         </ul> | ||||||
|  |         <form class="form-inline float-sm-right mr-3"> | ||||||
|  |           <input class="form-control" type="text" placeholder="Search"> | ||||||
|         </form> |         </form> | ||||||
|       </div> |       </div> | ||||||
|     </nav> |     </nav> | ||||||
| 
 | 
 | ||||||
|     <div class="container-fluid"> |     <div class="container-fluid"> | ||||||
|       <div class="row"> |       <div class="row"> | ||||||
|         <div class="col-sm-3 col-md-2 sidebar"> |         <nav class="col-sm-3 col-md-2 hidden-xs-down bg-faded sidebar"> | ||||||
|           <ul class="nav nav-sidebar"> |           <ul class="nav nav-pills"> | ||||||
|             <li class="active"><a href="#">Overview <span class="sr-only">(current)</span></a></li> |             <li class="nav-item"> | ||||||
|             <li><a href="#">Reports</a></li> |               <a class="nav-link active" href="#">Overview <span class="sr-only">(current)</span></a> | ||||||
|             <li><a href="#">Analytics</a></li> |             </li> | ||||||
|             <li><a href="#">Export</a></li> |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">Reports</a> | ||||||
|  |             </li> | ||||||
|  |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">Analytics</a> | ||||||
|  |             </li> | ||||||
|  |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">Export</a> | ||||||
|  |             </li> | ||||||
|           </ul> |           </ul> | ||||||
|           <ul class="nav nav-sidebar"> | 
 | ||||||
|             <li><a href="">Nav item</a></li> |           <ul class="nav nav-pills"> | ||||||
|             <li><a href="">Nav item again</a></li> |             <li class="nav-item"> | ||||||
|             <li><a href="">One more nav</a></li> |               <a class="nav-link" href="#">Nav item</a> | ||||||
|             <li><a href="">Another nav item</a></li> |             </li> | ||||||
|             <li><a href="">More navigation</a></li> |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">Nav item again</a> | ||||||
|  |             </li> | ||||||
|  |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">One more nav</a> | ||||||
|  |             </li> | ||||||
|  |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">Another nav item</a> | ||||||
|  |             </li> | ||||||
|           </ul> |           </ul> | ||||||
|           <ul class="nav nav-sidebar"> | 
 | ||||||
|             <li><a href="">Nav item again</a></li> |           <ul class="nav nav-pills"> | ||||||
|             <li><a href="">One more nav</a></li> |             <li class="nav-item"> | ||||||
|             <li><a href="">Another nav item</a></li> |               <a class="nav-link" href="#">Nav item again</a> | ||||||
|  |             </li> | ||||||
|  |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">One more nav</a> | ||||||
|  |             </li> | ||||||
|  |             <li class="nav-item"> | ||||||
|  |               <a class="nav-link" href="#">Another nav item</a> | ||||||
|  |             </li> | ||||||
|           </ul> |           </ul> | ||||||
|         </div> |         </nav> | ||||||
|         <div class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 main"> | 
 | ||||||
|  |         <main class="col-sm-9 offset-sm-3 col-md-10 offset-md-2 pt-3"> | ||||||
|           <h1>Dashboard</h1> |           <h1>Dashboard</h1> | ||||||
| 
 | 
 | ||||||
|           <div class="row placeholders"> |           <section class="row text-xs-center placeholders"> | ||||||
|             <div class="col-6 col-sm-3 placeholder"> |             <div class="col-6 col-sm-3 placeholder"> | ||||||
|               <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-fluid" alt="Generic placeholder thumbnail"> |               <img src="data:image/gif;base64,R0lGODlhAQABAIABAAJ12AAAACwAAAAAAQABAAACAkQBADs=" width="200" height="200" class="img-fluid rounded-circle" alt="Generic placeholder thumbnail"> | ||||||
|  |               <h4>Label</h4> | ||||||
|  |               <div class="text-muted">Something else</div> | ||||||
|  |             </div> | ||||||
|  |             <div class="col-6 col-sm-3 placeholder"> | ||||||
|  |               <img src="data:image/gif;base64,R0lGODlhAQABAIABAADcgwAAACwAAAAAAQABAAACAkQBADs=" width="200" height="200" class="img-fluid rounded-circle" alt="Generic placeholder thumbnail"> | ||||||
|               <h4>Label</h4> |               <h4>Label</h4> | ||||||
|               <span class="text-muted">Something else</span> |               <span class="text-muted">Something else</span> | ||||||
|             </div> |             </div> | ||||||
|             <div class="col-6 col-sm-3 placeholder"> |             <div class="col-6 col-sm-3 placeholder"> | ||||||
|               <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-fluid" alt="Generic placeholder thumbnail"> |               <img src="data:image/gif;base64,R0lGODlhAQABAIABAAJ12AAAACwAAAAAAQABAAACAkQBADs=" width="200" height="200" class="img-fluid rounded-circle" alt="Generic placeholder thumbnail"> | ||||||
|               <h4>Label</h4> |               <h4>Label</h4> | ||||||
|               <span class="text-muted">Something else</span> |               <span class="text-muted">Something else</span> | ||||||
|             </div> |             </div> | ||||||
|             <div class="col-6 col-sm-3 placeholder"> |             <div class="col-6 col-sm-3 placeholder"> | ||||||
|               <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-fluid" alt="Generic placeholder thumbnail"> |               <img src="data:image/gif;base64,R0lGODlhAQABAIABAADcgwAAACwAAAAAAQABAAACAkQBADs=" width="200" height="200" class="img-fluid rounded-circle" alt="Generic placeholder thumbnail"> | ||||||
|               <h4>Label</h4> |               <h4>Label</h4> | ||||||
|               <span class="text-muted">Something else</span> |               <span class="text-muted">Something else</span> | ||||||
|             </div> |             </div> | ||||||
|             <div class="col-6 col-sm-3 placeholder"> |           </section> | ||||||
|               <img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-fluid" alt="Generic placeholder thumbnail"> |  | ||||||
|               <h4>Label</h4> |  | ||||||
|               <span class="text-muted">Something else</span> |  | ||||||
|             </div> |  | ||||||
|           </div> |  | ||||||
| 
 | 
 | ||||||
|           <h2>Section title</h2> |           <h2>Section title</h2> | ||||||
|           <div class="table-responsive"> |           <div class="table-responsive"> | ||||||
|  | @ -212,7 +243,7 @@ | ||||||
|               </tbody> |               </tbody> | ||||||
|             </table> |             </table> | ||||||
|           </div> |           </div> | ||||||
|         </div> |         </main> | ||||||
|       </div> |       </div> | ||||||
|     </div> |     </div> | ||||||
| 
 | 
 | ||||||
|  | @ -223,8 +254,6 @@ | ||||||
|     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script> |     <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script> | ||||||
|     <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script> |     <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script> | ||||||
|     <script src="../../dist/js/bootstrap.min.js"></script> |     <script src="../../dist/js/bootstrap.min.js"></script> | ||||||
|     <!-- Just to make our placeholder images work. Don't actually copy the next line! --> |  | ||||||
|     <script src="../../assets/js/vendor/holder.min.js"></script> |  | ||||||
|     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> |     <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> | ||||||
|     <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> |     <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> | ||||||
|   </body> |   </body> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue