diff --git a/.DS_Store b/.DS_Store index d541d72..e0f31e4 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/About.html b/About.html new file mode 100644 index 0000000..c96296a --- /dev/null +++ b/About.html @@ -0,0 +1,47 @@ + + + + + Brigitta's Site + + + + +
+ +
+ Home + Timeline + About +
+ +
+
+

A Little About Me

+

I grew up in Missoula, left for a number of years, but now have moved back to town. + I decided to do the Montana Code Camp because higher education, the sector in which I had been working, + is increasingly being transformed by new web technologies and the use of other kinds of software. + I wanted to learn more about it so that I might find new ways of applying it in teaching and research.

+ +

Having made the decision to move back to Missoula, I also knew I needed to be more flexible in looking + for jobs outside of education. I heard that Missoula's tech scene is growing, so given my interests, I + thought it would be good to develop some technical proficiency.

+
+
+ + +
+
+

Here is a list of some things I like in Missoula (in no particular order):

+
    +
  • Black Coffee Roasting Company
    • +
  • University of Montana
    • +
  • Bearcussions Studio
    • +
+ +
+
+ +
+ + diff --git a/README.md b/README.md index 2bcbaf4..437c967 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,37 @@ -# Our First Demo Site +## Welcome to GitHub Pages -This site serves as a simple introduction to HTML, CSS, and you can feel free to use it as a starting point for your simple HTML, CSS, and JS websites. Make the site your introduction, fill it -with pictures, facts, a bio, etc. +You can use the [editor on GitHub](https://github.com/AcademicPilot/test-website/edit/master/README.md) to maintain and preview the content for your website in Markdown files. ---- +Whenever you commit to this repository, GitHub Pages will run [Jekyll](https://jekyllrb.com/) to rebuild the pages in your site, from the content in your Markdown files. -## Standards +### Markdown -### File Structure +Markdown is a lightweight and easy-to-use syntax for styling your writing. It includes conventions for -You will always want to keep all of your files organized properly. I would recommend you follow this structure while we work on basic projects. You can feel free to name the files and the project root as whatever you would like, but keep this structure: +```markdown +Syntax highlighted code block -``` -My-Project-Folder (folder) - - img (folder) - myImage.jpg +# Header 1 +## Header 2 +### Header 3 - css (folder) - style.css +- Bulleted +- List - js (folder) - main.js +1. Numbered +2. List - index.html +**Bold** and _Italic_ and `Code` text +[Link](url) and ![Image](src) ``` -"My-Project-Folder" is considered **the root project folder**, which is a term you will see often (I.E Navigate to your project root). - -### Spaces vs Dashes - -Along with this, I would like to see you all use dashes in folder and filenames, in place of -spaces. Spaces don't work as well when you are navigating using the command line. [You can find a great discussion about this over at Jeff Atwood's blog.](https://blog.codinghorror.com/of-spaces-underscores-and-dashes/) - -(You should bookmark this blog, he is a great blogger, and co-founder of [Stack Overflow](http://stackoverflow.com)) - -### Previewing your Site - -You can preview your site by dragging the html file into your browser, or right-clicking on it and selecting "Open With Chrome". +For more details see [GitHub Flavored Markdown](https://guides.github.com/features/mastering-markdown/). ---- +### Jekyll Themes -## Resources +Your Pages site will use the layout and styles from the Jekyll theme you have selected in your [repository settings](https://github.com/AcademicPilot/test-website/settings). The name of this theme is saved in the Jekyll `_config.yml` configuration file. -Some resources that will be helpful as you work on your introduction website. +### Support or Contact -* [W3Schools](https://www.w3schools.com) -* [Stack Overflow](http://stackoverflow.com) -* [CSS Tricks](https://css-tricks.com) +Having trouble with Pages? Check out our [documentation](https://help.github.com/categories/github-pages-basics/) or [contact support](https://github.com/contact) and we’ll help you sort it out. diff --git a/css/style.css b/css/style.css index c6fcc0e..0f079ed 100644 --- a/css/style.css +++ b/css/style.css @@ -1,3 +1,142 @@ -.myDiv{ - +body { +background-color: #5b9aa0; +width: 100%; +} + +main { + width: 100%; + text-align: center; +} + +/* Add a black background color to the top navigation */ +.topnav { + background-color: #333; + overflow: hidden; +} + +/* Style the links inside the navigation bar */ +.topnav a { + -webkit-transition: height 2s; /* Safari */ + transition: height 2s; + float: left; + display: block; + color: #f2f2f2; + text-align: center; + padding: 14px 16px; + text-decoration: none; + font-size: 17px; +} + +/* Change the color of links on hover */ +.topnav a:hover { + height: 200px; + background-color: #ddd; + color: black; +} + +/* Add a color to the active/current link */ +.topnav a.active { + background-color: #4CAF50; + color: white; +} + +h1 { + position: relative; + text-align: center; + font-family: 'Fascinate Inline', cursive; + font-size: 2.5em; + +} + +p { + font-family: 'Roboto', sans-serif; + font-size: 1.25em; + text-align:left; +} + +p.center { + text-align: center; + +} + +h2 { + font-family: 'Fascinate Inline', cursive; + font-size: 1.75em; + text-align: center; + +} + +h3 { + font-family: 'Roboto', sans-serif; + font-size: 1.5em; + text-align: center; + font-weight: "strong"; + +} + +ul { + + font-family: 'Roboto', sans-serif; + font-size: 1.25em; +} + +li { + +font-family: 'Roboto', sans-serif; +font-size:1em; +text-align: left; +} + +#header { + height: auto; + padding: 20px; + margin: auto; + width: 60%; +} + +#middlebox { + margin: auto; + width: 80%; + height: auto; + padding: 20px; +} + +#bottombox { + margin: auto; + width: 40%; + height: auto; + padding: 20px; + +} + +.boxStyle { + padding: 50px; + margin: 10px; + border: 10px; + border-style: groove; + border-color: #622569; + background-color: #d6d4e0; +} + +.imgStyle { + margin: auto; + width: 70%; +} + +.captionStyle { + font-family: 'Roboto', sans-serif; + font-size: 1em; +} + +.button { + background-color: #b8a9c9; + border: none; + color: #d6d4e0; + text-decoration-color: #622569; + display: inline-block; + text-align: center; + font-size: 16px; + margin: 4px 2px; + cursor: pointer; + } diff --git a/img/IMG_0299_copy.jpg b/img/IMG_0299_copy.jpg new file mode 100644 index 0000000..0454b38 Binary files /dev/null and b/img/IMG_0299_copy.jpg differ diff --git a/img/Peggy.jpg b/img/Peggy.jpg deleted file mode 100644 index 65aac62..0000000 Binary files a/img/Peggy.jpg and /dev/null differ diff --git a/index.html b/index.html index a71ad31..7596817 100644 --- a/index.html +++ b/index.html @@ -2,89 +2,25 @@ - My Site Title - - + Brigitta's Site - + - - -
-
- - -

My Page Title

- - - A picture of my grumpy cat, Peggy - - -

- This is a paragraph. It will have line breaks if there is enough text. This is a fundamental element for creating page content. - Sometimes you will need bold text, and sometimes you will need italicized text. -

-
- -
-

My Second Most Important Heading

- - - - - -
    -
  1. My first list item
    2. -
  2. My second list item
    3. -
  3. My third list item
    4. -
+
+ +
+ Home + Timeline + About +
+ - - - +
- + diff --git a/js/main.js b/js/main.js new file mode 100644 index 0000000..e69de29 diff --git a/js/script.js b/js/script.js deleted file mode 100644 index 03ff95b..0000000 --- a/js/script.js +++ /dev/null @@ -1,8 +0,0 @@ -/* - Below, we are simply using JavaScript to trigger a console - message when we click within the main container div. -*/ - -document.getElementById('container').onclick = function(){ - console.log("You've triggered an onclick event!"); -} diff --git a/style.css b/style.css deleted file mode 100644 index ebd3a4e..0000000 --- a/style.css +++ /dev/null @@ -1,23 +0,0 @@ -body{ - color:orange; -} - -.myDiv-1{ - background-color:red; -} - -.myDiv-1 h1{ - -} - -.myDiv-1 p{ - -} - -.myDiv-2{ - background-color:green; -} - -.myDiv-2 h2{ - -}