Skip to content

Commit

Permalink
Updated starter components from adminlte.io
Browse files Browse the repository at this point in the history
Font Awesome sccs files imported, instead off all.min.css
  • Loading branch information
Felix Angehrn committed Mar 15, 2020
1 parent 3bedc00 commit 065857d
Show file tree
Hide file tree
Showing 11 changed files with 638 additions and 321 deletions.
10 changes: 6 additions & 4 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@
"src/assets"
],
"stylePreprocessorOptions": {
"includePaths": ["src/styles"]
"includePaths": [
"src/styles"
]
},
"styles": [
"src/styles.scss",
"node_modules/@fortawesome/fontawesome-free/css/all.min.css"
"src/styles.scss"
],
"scripts": [
"node_modules/jquery/dist/jquery.js",
Expand Down Expand Up @@ -131,6 +132,7 @@
}
}
}
}},
}
},
"defaultProject": "angularAdminLTE"
}
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@angular/platform-browser": "~9.0.6",
"@angular/platform-browser-dynamic": "~9.0.6",
"@angular/router": "~9.0.6",
"@fortawesome/fontawesome-free": "^5.12.0",
"@fortawesome/fontawesome-free": "^5.12.1",
"admin-lte": "^3.0.1",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",
Expand Down
138 changes: 69 additions & 69 deletions src/app/starter/starter/content/content.component.html
Original file line number Diff line number Diff line change
@@ -1,82 +1,82 @@
<!-- Content Header (Page header) -->
<div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="m-0 text-dark">Starter Page</h1>
</div><!-- /.col -->
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Starter Page</li>
</ol>
</div><!-- /.col -->
</div><!-- /.row -->
</div><!-- /.container-fluid -->
</div>
<!-- /.content-header -->
<!-- Content Header (Page header) -->
<div class="content-header">
<div class="container-fluid">
<div class="row mb-2">
<div class="col-sm-6">
<h1 class="m-0 text-dark">Starter Page</h1>
</div><!-- /.col -->
<div class="col-sm-6">
<ol class="breadcrumb float-sm-right">
<li class="breadcrumb-item"><a href="#">Home</a></li>
<li class="breadcrumb-item active">Starter Page</li>
</ol>
</div><!-- /.col -->
</div><!-- /.row -->
</div><!-- /.container-fluid -->
</div>
<!-- /.content-header -->

<!-- Main content -->
<div class="content">
<div class="container-fluid">
<div class="row">
<div class="col-lg-6">
<div class="card">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<!-- Main content -->
<div class="content">
<div class="container-fluid">
<div class="row">
<div class="col-lg-6">
<div class="card">
<div class="card-body">
<h5 class="card-title">Card title</h5>

<p class="card-text">
Some quick example text to build on the card title and make up the bulk of the card's
content.
</p>
<p class="card-text">
Some quick example text to build on the card title and make up the bulk of the card's
content.
</p>

<a href="#" class="card-link">Card link</a>
<a href="#" class="card-link">Another link</a>
</div>
<a href="#" class="card-link">Card link</a>
<a href="#" class="card-link">Another link</a>
</div>
</div>

<div class="card card-primary card-outline">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<div class="card card-primary card-outline">
<div class="card-body">
<h5 class="card-title">Card title</h5>

<p class="card-text">
Some quick example text to build on the card title and make up the bulk of the card's
content.
</p>
<a href="#" class="card-link">Card link</a>
<a href="#" class="card-link">Another link</a>
</div>
</div><!-- /.card -->
</div>
<!-- /.col-md-6 -->
<div class="col-lg-6">
<div class="card">
<div class="card-header">
<h5 class="m-0">Featured</h5>
</div>
<div class="card-body">
<h6 class="card-title">Special title treatment</h6>
<p class="card-text">
Some quick example text to build on the card title and make up the bulk of the card's
content.
</p>
<a href="#" class="card-link">Card link</a>
<a href="#" class="card-link">Another link</a>
</div>
</div><!-- /.card -->
</div>
<!-- /.col-md-6 -->
<div class="col-lg-6">
<div class="card">
<div class="card-header">
<h5 class="m-0">Featured</h5>
</div>
<div class="card-body">
<h6 class="card-title">Special title treatment</h6>

<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
</div>

<div class="card card-primary card-outline">
<div class="card-header">
<h5 class="m-0">Featured</h5>
</div>
<div class="card-body">
<h6 class="card-title">Special title treatment</h6>
<div class="card card-primary card-outline">
<div class="card-header">
<h5 class="m-0">Featured</h5>
</div>
<div class="card-body">
<h6 class="card-title">Special title treatment</h6>

<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
<p class="card-text">With supporting text below as a natural lead-in to additional content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
</div>
<!-- /.col-md-6 -->
</div>
<!-- /.row -->
</div><!-- /.container-fluid -->
</div>
<!-- /.content -->
<!-- /.col-md-6 -->
</div>
<!-- /.row -->
</div><!-- /.container-fluid -->
</div>
<!-- /.content -->
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<aside class="main-sidebar sidebar-dark-primary elevation-4">
<!-- Brand Logo -->
<a href="index3.html" class="brand-link">
<a href="/" class="brand-link">
<img src="assets/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
style="opacity: .8">
style="opacity: .8">
<span class="brand-text font-weight-light">AdminLTE 3</span>
</a>

Expand Down Expand Up @@ -61,4 +61,3 @@
</div>
<!-- /.sidebar -->
</aside>

6 changes: 3 additions & 3 deletions src/app/starter/starter/nav-bar/nav-bar.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<!-- Left navbar links -->
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" data-widget="pushmenu" href="#"><i class="fas fa-bars"></i></a>
<a class="nav-link" data-widget="pushmenu" href="#" role="button"><i class="fas fa-bars"></i></a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="index3.html" class="nav-link">Home</a>
<a href="/" class="nav-link">Home</a>
</li>
<li class="nav-item d-none d-sm-inline-block">
<a href="#" class="nav-link">Contact</a>
Expand Down Expand Up @@ -112,7 +112,7 @@ <h3 class="dropdown-item-title">
</div>
</li>
<li class="nav-item">
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#"><i
<a class="nav-link" data-widget="control-sidebar" data-slide="true" href="#" role="button"><i
class="fas fa-th-large"></i></a>
</li>
</ul>
Expand Down
1 change: 1 addition & 0 deletions src/app/starter/starter/starter.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
<!-- Main Footer -->
<app-starter-footer></app-starter-footer>
</div>
<!-- ./wrapper -->
20 changes: 15 additions & 5 deletions src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,23 @@ Admin LTE customization

// bootstrap functions customization
@import "./styles/bootstrap-functions";
// bootstrap variables customizacion

// bootstrap variables customization
@import "./styles/bootstrap-variables";

//build boostrap librery
//build boostrap library
@import "../node_modules/bootstrap/scss/bootstrap";

//build Admin LTE styles
@import "../node_modules/admin-lte/build/scss/AdminLTE-raw";
@import "./styles/variables";

// build Font Awesome Icons
@import "../node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
@import "../node_modules/@fortawesome/fontawesome-free/scss/solid";
@import "../node_modules/@fortawesome/fontawesome-free/scss/regular";
@import "../node_modules/@fortawesome/fontawesome-free/scss/brands";

// build AdminLTE theme styles
@import "../node_modules/admin-lte/build/scss/AdminLTE";

@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic');
// Google Font: Source Sans Pro
@import url('https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,700');
Loading

0 comments on commit 065857d

Please sign in to comment.