-
Notifications
You must be signed in to change notification settings - Fork 57
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature/navbar #14
Merged
Merged
Feature/navbar #14
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
73d8adf
remove bootstrap form styles.css
sithumonline cf4fd62
Add primer/css via CDN
sithumonline 89e30d3
navbar ⛳
sithumonline f207b17
footer ⛳
sithumonline 2f1a6a0
add fontawesome-free
sithumonline e05c972
remove fontawesome-free
sithumonline bff37f0
add fontawesome-svg-core n fontawesome-svg-core
sithumonline 857996d
add angular-fontawesome
sithumonline 0cae84f
add font-awesome via cdn
sithumonline e57b57f
remove fa pkgs
sithumonline 3ac7552
nav icons ⛳
sithumonline 379c33e
add foss logo to footer
sithumonline File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,25 @@ | ||
| .page-footer{ | ||
| color: white; | ||
| position:fixed; | ||
| bottom:0px; | ||
| width:100%; | ||
| .page-footer { | ||
| color: white; | ||
| position: fixed; | ||
| bottom: 0px; | ||
| width: 100%; | ||
| background-color: #222222; | ||
| } | ||
|
|
||
| .footer-copyright{ | ||
| background-color: black; | ||
| .sm-icons { | ||
| padding-right: 5px; | ||
| color: white; | ||
| } | ||
|
|
||
| .content { | ||
| padding-left: 20px; | ||
| } | ||
|
|
||
| .footer-copyright { | ||
| /* background-color: black;*/ | ||
| background-color: #222222; | ||
| } | ||
|
|
||
| ul { | ||
| list-style-type: none; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,54 @@ | ||
| <!-- Footer --> | ||
| <footer class="page-footer font-small bg-dark pt-4"> | ||
| <div class="container-fluid text-center text-md-left"> | ||
| <div class="row"> | ||
| <!-- Grid column --> | ||
| <div class="col-md-6 mt-md-0 mt-3"> | ||
| <h5 class="text-uppercase">Footer Content</h5> | ||
| <p>Here you can use rows and columns to organize your footer content.</p> | ||
| </div> | ||
| <!-- Grid column --> | ||
|
|
||
| <hr class="clearfix w-100 d-md-none pb-3"> | ||
|
|
||
| <div class="col-md-3 mb-md-0 mb-3"> | ||
| <h5 class="text-uppercase">Links</h5> | ||
| <ul class="list-unstyled"> | ||
| <li> | ||
| <a href="#!">Link 1</a> | ||
| </li> | ||
| <li> | ||
| <a href="#!">Link 2</a> | ||
| </li> | ||
| <li> | ||
| <a href="#!">Link 3</a> | ||
| </li> | ||
| <li> | ||
| <a href="#!">Link 4</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| <!-- Grid column --> | ||
| <div class="col-md-3 mb-md-0 mb-3"> | ||
| <h5 class="text-uppercase">Contact US</h5> | ||
| </div> | ||
| <!-- / Grid column --> | ||
| </div> | ||
| <footer class="page-footer font-small pt-4"> | ||
| <div class="content col-6 float-left"> | ||
| <img | ||
| src="https://i.postimg.cc/BbdQjxBG/logo-light-cut.png" | ||
| alt="SLIIT FOSS" | ||
| class="avatar avatar-7 mr-2" | ||
| style="width: 74px;" | ||
| /> | ||
| <p>Here you can use rows and columns to organize your footer content.</p> | ||
| <div> | ||
| <a href="https://www.facebook.com/sliitfoss" target="_blank" | ||
| ><i class="fab fa-facebook-square fa-3x sm-icons"></i | ||
| ></a> | ||
| <a href="https://instagram.com/sliitfoss" target="_blank" | ||
| ><i class="fab fa-instagram-square fa-3x sm-icons"></i | ||
| ></a> | ||
| <a | ||
| href="https://www.youtube.com/channel/UCPPO-QR0Dv13ewjhPsc_I3w" | ||
| target="_blank" | ||
| ><i class="fab fa-youtube-square fa-3x sm-icons"></i | ||
| ></a> | ||
| <a href="https://github.com/sliit-foss" target="_blank" | ||
| ><i class="fab fa-github-square fa-3x sm-icons"></i | ||
| ></a> | ||
| <a href="https://medium.com/sliit-foss" target="_blank" | ||
| ><i class="fab fa-medium fa-3x sm-icons"></i | ||
| ></a> | ||
| </div> | ||
|
|
||
| <!-- Copyright --> | ||
| <div class="footer-copyright text-center py-3">© 2020 Copyright: | ||
| <a href="#">SLIIT FOSS Community</a> | ||
| </div> | ||
| <!-- Copyright --> | ||
|
|
||
| </footer> | ||
| <!-- Footer --> | ||
| </div> | ||
| <div class="col-3 float-left"> | ||
| <h5 class="text-uppercase">Links</h5> | ||
| <ul> | ||
| <li> | ||
| <a href="#!">Link 1</a> | ||
| </li> | ||
| <li> | ||
| <a href="#!">Link 2</a> | ||
| </li> | ||
| <li> | ||
| <a href="#!">Link 3</a> | ||
| </li> | ||
| <li> | ||
| <a href="#!">Link 4</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="col-3 float-left"> | ||
| <h5 class="text-uppercase">Contact US</h5> | ||
| </div> | ||
| <div class="col-12 footer-copyright text-center py-3 float-left"> | ||
| © 2020 Copyright: | ||
| <a href="#">SLIIT FOSS Community</a> | ||
| </div> | ||
| </footer> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,17 @@ | ||
| <nav class="navbar navbar-expand-md navbar-dark bg-dark"> | ||
| <div class="navbar-collapse collapse w-100 order-1 order-md-0 dual-collapse2"> | ||
| <ul class="navbar-nav mr-auto"> | ||
| <li class="nav-item active"> | ||
| <a class="nav-link" href="#">LOGO</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| <div class="mx-auto order-0"> | ||
| <a class="navbar-brand mx-auto" href="#">SLIIT FOSS COMMUNITY</a> | ||
| <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".dual-collapse2"> | ||
| <span class="navbar-toggler-icon"></span> | ||
| </button> | ||
| </div> | ||
| <div class="navbar-collapse collapse w-100 order-3 dual-collapse2"> | ||
| <ul class="navbar-nav ml-auto"> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Home</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Events</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Blog</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">About</a> | ||
| </li> | ||
| <li class="nav-item"> | ||
| <a class="nav-link" href="#">Contact</a> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </nav> | ||
| <nav class="UnderlineNav UnderlineNav--right" aria-label="Foo bar"> | ||
| <div class="UnderlineNav-actions"> | ||
| <img | ||
| src="https://i.postimg.cc/KzrnWC0b/logo-dark-cut.png" | ||
| alt="SLIIT FOSS" | ||
| class="avatar avatar-7 mr-2" | ||
| style="width: 74px;" | ||
| /> | ||
| </div> | ||
| <div class="UnderlineNav-body"> | ||
| <a class="UnderlineNav-item" href="#" aria-current="page">Home</a> | ||
| <a class="UnderlineNav-item" href="#">Events</a> | ||
| <a class="UnderlineNav-item" href="#">Blog</a> | ||
| <a class="UnderlineNav-item" href="#">About</a> | ||
| <a class="UnderlineNav-item" href="#">Contact</a> | ||
| </div> | ||
| </nav> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,23 @@ | ||
| <!doctype html> | ||
| <!DOCTYPE html> | ||
| <html lang="en"> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>SLIIT FOSS</title> | ||
| <base href="/"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"> | ||
| <link rel="icon" type="image/x-icon" href="favicon.ico"> | ||
| </head> | ||
| <body> | ||
| <app-root></app-root> | ||
| </body> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
| <title>SLIIT FOSS</title> | ||
| <base href="/" /> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <link rel="icon" type="image/x-icon" href="favicon.ico" /> | ||
| <link | ||
| href="https://unpkg.com/@primer/css/dist/primer.css" | ||
| rel="stylesheet" | ||
| /> | ||
| <link | ||
| rel="stylesheet" | ||
| href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css" | ||
| integrity="sha512-+4zCK9k+qNFUR5X+cKL9EIR+ZOhtIloNl9GIKS57V1MyNsYpYcUrUeQc9vNfzsWfV28IaLL3i96P9sdNyeRssA==" | ||
| crossorigin="anonymous" | ||
| /> | ||
| </head> | ||
| <body> | ||
| <app-root></app-root> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1 @@ | ||
| /* You can add global styles to this file, and also import other style files */ | ||
|
|
||
| @import "../node_modules/bootstrap/dist/css/bootstrap.min.css"; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you add our social media links with icons
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done