Skip to content

merge #33

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.

Sign up for GitHub

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

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

merge #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
fad0720
navbar start
jhatt3 Dec 30, 2017
29785b8
create navbar roughg
jhatt3 Dec 30, 2017
be80399
footer added
jhatt3 Dec 30, 2017
e52b425
done
jhatt3 Dec 30, 2017
e1a6f15
mail fix
jhatt3 Dec 30, 2017
14fa4b5
fixed carousel
jhatt3 Dec 30, 2017
8404923
added color
jhatt3 Dec 30, 2017
10c2742
style
jhatt3 Dec 30, 2017
12b7d49
grammer fix
jhatt3 Dec 30, 2017
7c8a001
none
jhatt3 Dec 30, 2017
b47ba7e
added logo
jhatt3 Dec 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added src/.final_jpg.jpg.icloud
View file
Open in desktop
Binary file not shown.
56 changes: 56 additions & 0 deletions src/about.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<!-- ******************************************
* Author : Author
* Created On : Sun Dec 31 2017
* File : test.html
******************************************* -->

<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="main.css">
<title>#[[$Title$]]#</title>
</head>
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#portfolio-collapse-menu">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">The Beginning Programmer</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="portfolio-collapse-menu">
<ul class="nav navbar-nav navbar-right">
<li><a href="index.html">Home</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="about.html">About</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>
<body>

#[[$END$]]#
<footer>
<div class="container">
<h3>Get In Touch</h3>
<p>email me <a href='mailto:[email protected]'>here</a> or follow me on twitter @tbprogrammer</p>
</div>
</footer>
<script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>

</body>

</html>
54 changes: 54 additions & 0 deletions src/blog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<!-- ******************************************
* Author : Author
* Created On : Sun Dec 31 2017
* File : blog.html
******************************************* -->

<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0;">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="main.css">
<title>#[[$Title$]]#</title>
</head>

<body>
<nav class="navbar navbar-default">
<div class="container">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#portfolio-collapse-menu">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">The Beginning Programmer</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="portfolio-collapse-menu">
<ul class="nav navbar-nav navbar-right">
<li><a href="index.html">Home</a></li>
<li><a href="blog.html">Blog</a></li>
<li><a href="about.html">About</a></li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container-fluid -->
</nav>
#[[$END$]]#
<footer>
<div class="container">
<h3>Get In Touch</h3>
<p>email me <a href='mailto:[email protected]'>here</a> or follow me on twitter @tbprogrammer</p>
</div>
</footer> <script src="https://code.jquery.com/jquery-3.1.0.min.js" integrity="sha256-cCueBR6CsyA4/9szpPfrX3s49M9vUU5BgtiJj06wt/s=" crossorigin="anonymous"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
</body>

</html>
2 changes: 2 additions & 0 deletions src/boot.sublime-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}
251 changes: 251 additions & 0 deletions src/boot.sublime-workspace
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
{
"auto_complete":
{
"selected_items":
[
[
"back",
"background-color"
],
[
"ali",
"text-align"
],
[
"text-de",
"text-decoration-color"
],
[
"HE",
"HEADER\tTag"
]
]
},
"buffers":
[
],
"build_system": "",
"build_system_choices":
[
],
"build_varint": "",
"command_palette":
{
"height": 392.0,
"last_filter": "stat",
"selected_items":
[
[
"stat",
"git: status"
],
[
"in",
"Package Control: Install Package"
],
[
"ins",
"Indexing Status"
],
[
"inss",
"Indexing Status"
],
[
"log",
"git: log"
],
[
"sta",
"git: status"
],
[
"i",
"git: init"
],
[
"branch",
"git: push to branch name"
],
[
"git stat",
"git: status"
],
[
"Snippet: ",
"Snippet: #!/usr/bin/env"
]
],
"width": 230.0
},
"console":
{
"height": 126.0,
"history":
[
]
},
"distraction_free":
{
"menu_visible": true,
"show_minimap": false,
"show_open_files": false,
"show_tabs": false,
"side_bar_visible": false,
"status_bar_visible": false
},
"file_history":
[
"/Users/user/Desktop/PortfolioProject/BootstrapPortfolioProject/src/main.css",
"/Users/user/Desktop/PortfolioProject/BootstrapPortfolioProject/src/index.html",
"/Users/user/Desktop/PortfolioProject/HTMLPortfolioProject/src/main.css",
"/Users/user/Desktop/PortfolioProject/HTMLPortfolioProject/src/index.html",
"/Users/user/Desktop/PortfolioProject/HTMLPortfolioProject/src/normalize.css",
"/Users/user/Desktop/PortfolioProject/HTMLPortfolioProject/src/index2.html",
"/Users/user/Desktop/practice/TBP_Head.jpg",
"/Users/user/Library/Application Support/Sublime Text 3/Packages/User/Emmet.sublime-settings",
"/Users/user/Library/Application Support/Sublime Text 3/Packages/Emmet/Emmet.sublime-settings",
"/Users/user/Desktop/practice/prac.html",
"/prac.html"
],
"find":
{
"height": 0.0
},
"find_in_files":
{
"height": 0.0,
"where_history":
[
]
},
"find_state":
{
"case_sensitive": false,
"find_history":
[
],
"highlight": true,
"in_selection": false,
"preserve_case": false,
"regex": false,
"replace_history":
[
],
"reverse": false,
"show_context": true,
"use_buffer2": true,
"whole_word": false,
"wrap": true
},
"groups":
[
{
"sheets":
[
]
},
{
"sheets":
[
]
}
],
"incremental_find":
{
"height": 0.0
},
"input":
{
"height": 31.0
},
"layout":
{
"cells":
[
[
0,
0,
1,
1
],
[
1,
0,
2,
1
]
],
"cols":
[
0.0,
0.5,
1.0
],
"rows":
[
0.0,
1.0
]
},
"menu_visible": true,
"output.GitSavvy":
{
"height": 100.0
},
"output.find_results":
{
"height": 0.0
},
"output.show_commit_info":
{
"height": 100.0
},
"pinned_build_system": "",
"project": "boot.sublime-project",
"replace":
{
"height": 0.0
},
"save_all_on_build": true,
"select_file":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"select_project":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"select_symbol":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"selected_group": 1,
"settings":
{
},
"show_minimap": true,
"show_open_files": true,
"show_tabs": true,
"side_bar_visible": false,
"side_bar_width": 98.0,
"status_bar_visible": true,
"template_settings":
{
}
}
Binary file added src/final_png.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions src/grid.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.grid {
display: grid;
grid-template-columns:3fr 1fr;
grid-template-rows:200px 100px;
grid-auto-rows:100px;
grid-gap: 2px;

}
.grid div {
border: 1px solid rgba(0,95,107);
border-radius: 3px;
background-color: rgba(0, 95, 107, 0.65);
padding: 0.2em;
color: #000;


}
.grid div:nth-child(1) {
grid-column:1 / -1;
}

Loading