Skip to content

Commit

Permalink
Merge pull request #2 from VickySteeves/master
Browse files Browse the repository at this point in the history 
Added Bootswatch theme, cleaned up the HTML  a bit
  • Loading branch information
@Protohedgehog
Protohedgehog committed Feb 1, 2018
2 parents cee9c07 + 3a3b5e2 commit ea26b87
Show file tree
Hide file tree
Showing 9 changed files with 577 additions and 398 deletions.
70 changes: 43 additions & 27 deletions blog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,37 @@
<meta charset="utf-8">
<title>PaleorXiv</title>

<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<!-- Latest compiled and minified CSS -- YETI from bootswatch theme -->
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/4.0.0-beta.3/yeti/bootstrap.min.css" rel="stylesheet" integrity="sha384-xpQNcoacYF/4TKVs2uD3sXyaQYs49wxwEmeFNkOUgun6SLWdEbaCOv8hGaB9jLxt" crossorigin="anonymous">

<!-- Latest compiled and minified FontAwesome -->
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">

<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>

<style>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js" integrity="sha384-VspmFJ2uqRrKr3en+IG0cIq1Cl/v/PHneDw6SQZYgrcr8ZZmZoQ3zhuGfMnSR/F2" crossorigin="anonymous"></script>

.main_logo {
<style>
.main_logo {
display: block;
margin-right: auto;
margin-left: auto;
width: 550px;
height: 297px;
}

.nav-item {
padding:3px;
}

.nav-link {
font-size:1.4em;
}

.navbar-nav {
float:none;
margin: auto;
/* vertical menu */
/* display: block; */
text-align: center;
}
.navbar .active { background: #cacdd1; }
.text { padding-top: 25px; }
</style>
</head>

Expand All @@ -40,16 +47,18 @@

<nav class="navbar navbar-toggleable-md navbar-light bg-faded">

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="index.html">Home
<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="faq.html">FAQ</a>
</li>
<li class="nav-item">
<li class="nav-item">
<a class="nav-link" href="submission_guidelines.html">Submission Guidelines</a>
</li>
<li class="nav-item">
Expand All @@ -58,24 +67,31 @@
<li class="nav-item">
<a class="nav-link" href="moderation.html">Moderation</a>
</li>
<li class="nav-item">
<a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item">
<a class="nav-link" href="blog.html">Blog</a>
</li>
<li class="nav-item">
<a class="nav-link" href="diversity_statement.html">Diversity Statement</a>
</li>
<li class="nav-item">
<a class="nav-link" href="code_of_conduct.html">Code of Conduct</a>
</li>
</div>

</nav>
<li class="nav-item">
<a class="nav-link" href="resources.html">Resources</a>
</li>
<li class="nav-item">
<a class="nav-link" href="faq.html">FAQ</a>
</li>
</ul>
</div>
</nav>

Coming soon!
<h2 style="padding-top:1em;">COMING SOON</h2>

<footer id="footer">
<hr/>

<!-- add a license here -->

<p>Contact email: <a href="mailto:jon.tennant.2@gmail.com">jon dot tennant dot 2 at gmail dot com</a>. Source code can found at <a href="https://github.com/paleorXiv/paleorXiv.github.io">paleorXiv/paleorXiv.github.io</a>. Based on <a href="https://getbootstrap.com" rel="nofollow">Bootstrap</a>. Theme is <a href="https://bootswatch.com/yeti/">Yeti</a> from <a href="https://bootswatch.com/">Bootswatch</a>. Icons from <a href="http://fontawesome.io/" rel="nofollow">Font Awesome</a>.</p>
</footer>
</div>
</body>
</html>
115 changes: 66 additions & 49 deletions code_of_conduct.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,37 @@
<meta charset="utf-8">
<title>PaleorXiv</title>

<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
<!-- Latest compiled and minified CSS -- YETI from bootswatch theme -->
<link href="https://maxcdn.bootstrapcdn.com/bootswatch/4.0.0-beta.3/yeti/bootstrap.min.css" rel="stylesheet" integrity="sha384-xpQNcoacYF/4TKVs2uD3sXyaQYs49wxwEmeFNkOUgun6SLWdEbaCOv8hGaB9jLxt" crossorigin="anonymous">

<!-- Latest compiled and minified FontAwesome -->
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">

<!-- Latest compiled and minified JavaScript -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/js/bootstrap.min.js" integrity="sha384-vBWWzlZJ8ea9aCX4pEW3rVHjgjt7zpkNpZk+02D9phzyeVkE+jo0ieGizqPLForn" crossorigin="anonymous"></script>

<style>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-beta.3/js/bootstrap.bundle.min.js" integrity="sha384-VspmFJ2uqRrKr3en+IG0cIq1Cl/v/PHneDw6SQZYgrcr8ZZmZoQ3zhuGfMnSR/F2" crossorigin="anonymous"></script>

.main_logo {
<style>
.main_logo {
display: block;
margin-right: auto;
margin-left: auto;
width: 550px;
height: 297px;
}

.nav-item {
padding:3px;
}

.nav-link {
font-size:1.4em;
}

.navbar-nav {
float:none;
margin: auto;
/* vertical menu */
/* display: block; */
text-align: center;
}
.navbar .active { background: #cacdd1; }
.text { padding-top: 25px; }
</style>
</head>

Expand All @@ -38,15 +45,18 @@

<div class="container">

<nav class="navbar navbar-toggleable-md navbar-light bg-faded">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<div class="collapse navbar-collapse" id="navbarColor01">
<ul class="navbar-nav mr-auto">
<li class="nav-item">
<a class="nav-link" href="index.html">Home
<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<li class="nav-item">
<a class="nav-link" href="submission_guidelines.html">Submission Guidelines</a>
</li>
<li class="nav-item">
Expand All @@ -67,47 +77,54 @@
<li class="nav-item">
<a class="nav-link" href="faq.html">FAQ</a>
</li>
</div>
</nav>
</ul>
</div>
</nav>

<br/><h4>paleorXiv Code of Conduct</h4>
<h3 style="padding-top:1em;">paleorXiv Code of Conduct</h3>

<p style="text-align: justify;">In the interest of fostering an open and welcoming environment, we as contributors and maintainers of paleorXiv pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.</p>

<h4 style="text-align: justify;">Our Standards</h4>
<p style="text-align: justify;">Examples of behavior that contributes to creating a positive environment include:</p>
<p>In the interest of fostering an open and welcoming environment, we as contributors and maintainers of paleorXiv pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.</p>

<ul style="text-align: justify;">
<li>Using welcoming and inclusive language</li>
<li>Being respectful of differing viewpoints and experiences</li>
<li>Gracefully accepting constructive criticism</li>
<li>Focusing on what is best for the community</li>
<li>Showing empathy towards other community members</li>
</ul>
<p style="text-align: justify;">Examples of unacceptable behavior by participants include:</p>

<ul style="text-align: justify;">
<li>The use of sexualized language or imagery and unwelcome sexual attention or advances</li>
<li>Trolling, insulting/derogatory comments, and personal or political attacks</li>
<li>Public or private harassment</li>
<li>Publishing others’ private information, such as a physical or electronic address, without explicit permission</li>
<li>Other conduct which could reasonably be considered inappropriate in a professional setting</li>
</ul>
<h4>Our Standards</h4>
<p>Examples of behavior that contributes to creating a positive environment include:</p>
<ul>
<li>Using welcoming and inclusive language</li>
<li>Being respectful of differing viewpoints and experiences</li>
<li>Gracefully accepting constructive criticism</li>
<li>Focusing on what is best for the community</li>
<li>Showing empathy towards other community members</li>
</ul>

<p>Examples of unacceptable behavior by participants include:</p>
<ul>
<li>The use of sexualized language or imagery and unwelcome sexual attention or advances</li>
<li>Trolling, insulting/derogatory comments, and personal or political attacks</li>
<li>Public or private harassment</li>
<li>Publishing others’ private information, such as a physical or electronic address, without explicit permission</li>
<li>Other conduct which could reasonably be considered inappropriate in a professional setting</li>
</ul>

<h4 style="text-align: justify;">Our Responsibilities</h4>
<p style="text-align: justify;">Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.</p>
<p style="text-align: justify;">Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.</p>
<h4>Our Responsibilities</h4>
<p>Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.</p>
<p>Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.</p>

<h4 style="text-align: justify;">Scope</h4>
<p style="text-align: justify;">This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.</p>
<h4>Scope</h4>
<p>This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.</p>

<h4 style="text-align: justify;">Enforcement</h4>
<p style="text-align: justify;">Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team <a href="mailto:jon.tennant.2@gmail.com">here</a>. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The paleorXiv team is obligated to maintain confidentiality, to the extent permissible by law, with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.</p>
<p style="text-align: justify;">Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership.</p>
<h4>Enforcement</h4>
<p>Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team <a href="mailto:jon.tennant.2@gmail.com">here</a>. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The paleorXiv team is obligated to maintain confidentiality, to the extent permissible by law, with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.</p>
<p>Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership.</p>

<h4 style="text-align: justify;">Attribution</h4>
<p style="text-align: justify;">This Code of Conduct is adapted from the <a href="https://www.contributor-covenant.org/">Contributor Covenant</a>, version 1.4, available at <a href="https://www.contributor-covenant.org/version/1/4/code-of-conduct.html">https://www.contributor-covenant.org/version/1/4/code-of-conduct.html</a></p>
<h4>Attribution</h4>
<p>This Code of Conduct is adapted from the <a href="https://www.contributor-covenant.org/">Contributor Covenant</a>, version 1.4, available at <a href="https://www.contributor-covenant.org/version/1/4/code-of-conduct.html">https://www.contributor-covenant.org/version/1/4/code-of-conduct.html</a></p>

<footer id="footer">
<hr/>

<!-- add a license here -->

<p>Contact email: <a href="mailto:jon.tennant.2@gmail.com">jon dot tennant dot 2 at gmail dot com</a>. Source code can found at <a href="https://github.com/paleorXiv/paleorXiv.github.io">paleorXiv/paleorXiv.github.io</a>. Based on <a href="https://getbootstrap.com" rel="nofollow">Bootstrap</a>. Theme is <a href="https://bootswatch.com/yeti/">Yeti</a> from <a href="https://bootswatch.com/">Bootswatch</a>. Icons from <a href="http://fontawesome.io/" rel="nofollow">Font Awesome</a>.</p>
</footer>

</div>
</body>
Expand Down
Loading

0 comments on commit ea26b87

Please sign in to comment.