Skip to content

Commit

Permalink
Update logo. Update Header and Footer to use new style from bazel-web…
Browse files Browse the repository at this point in the history
…site.

Refactor CSS structure to only contain shared and docs CSS

RELNOTES: None
PiperOrigin-RevId: 159837919
  • Loading branch information
steren authored and hlopko committed Jun 26, 2017
1 parent 225c78b commit 505b78c
Show file tree
Hide file tree
Showing 20 changed files with 432 additions and 475 deletions.
37 changes: 37 additions & 0 deletions site/_includes/footer-content.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<div class="container">
<div class="row">
<div class="col-md-4">
<p>About</p>
<ul class="list-unstyled">
<li><a href="https://github.com/bazelbuild/bazel/wiki/Bazel-Users">Who's using Bazel</a></li>
<li><a href="{{ site.main_site_url }}/roadmap.html">Roadmap</a></li>
<li><a href="{{ site.main_site_url }}/contributing.html">Contribute</a></li>
<li><a href="{{ site.main_site_url }}/governance.html">Governance Plan</a></li>
</ul>
</div>
<div class="col-md-4">
<p>Support</p>
<ul class="list-unstyled">
<li><a href="http://stackoverflow.com/questions/tagged/bazel">Stack Overflow</a></li>
<li><a href="https://github.com/bazelbuild/bazel/issues">Issue Tracker</a></li>
<li><a href="https://docs.bazel.build">Documentation</a></li>
<li><a href="{{ site.main_site_url }}/faq.html">FAQ</a></li>
<li><a href="{{ site.main_site_url }}/support.html">Support Policy</a></li>
</ul>
</div>
<div class="col-md-4">
<p>Stay Connected</p>
<ul class="list-unstyled">
<li><a href="https://twitter.com/bazelbuild">Twitter</a></li>
<li><a href="https://blog.bazel.build">Blog</a></li>
<li><a href="https://github.com/bazelbuild/bazel">GitHub</a></li>
<li><a href="https://groups.google.com/forum/#!forum/bazel-discuss">Discussion group</a></li>
</ul>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<p class="text-muted">&copy; {{ 'now' | date: "%Y" }} Google</p>
</div>
</div>
</div>
8 changes: 1 addition & 7 deletions site/_includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<footer class="footer">
<div class="container">
<div class="row">
<div class="col-lg-12">
<p class="text-muted">&copy; {{ 'now' | date: "%Y" }} Google</p>
</div>
</div>
</div>
{% include footer-content.html %}
</footer>

<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
Expand Down
3 changes: 2 additions & 1 deletion site/_includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
<!-- Webfont -->
<link href="//fonts.googleapis.com/css?family=RobotoDraft:300,400,500|Source+Code+Pro:400,500,700" rel="stylesheet">

<link rel="shortcut icon" type="image/png" href="/images/favicon.ico">
<link rel="icon" type="image/png" href="/images/favicon-32x32.png" sizes="32x32" />
<link rel="icon" type="image/png" href="/images/favicon-16x16.png" sizes="16x16" />

<!-- Bootstrap -->
<link href="/assets/css/bootstrap.min.css" rel="stylesheet">
Expand Down
14 changes: 5 additions & 9 deletions site/_includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{{ site.main_site_url }}">
<img src="/images/bazel-navbar.png" height="30px">
<a class="navbar-brand" href="{{ site.main_site_url }}/">
<img class="navbar-logo" src="/images/bazel-navbar.svg">
</a>
</div>

Expand All @@ -28,21 +28,17 @@
</form>
<ul class="nav navbar-nav navbar-right">
<li{% if page.nav == "docs" %} class="active"{% endif %}>
<a href="/">Docs</a>
<a href="{{ site.docs_site_url }}">Documentation</a>
</li>
<li{% if page.nav == "contribute" %} class="active"{% endif %}>
<a href="{{ site.main_site_url }}/contributing.html">Contribute!</a>
<a href="{{ site.main_site_url }}/contributing.html">Contribute</a>
</li>
<li{% if page.nav == "faq" %} class="active"{% endif %}>
<a href="{{ site.main_site_url }}/faq.html">FAQ</a></li>
<li{% if page.nav == "blog" %} class="active"{% endif %}>
<a href="{{ site.blog_site_url }}">Blog</a>
</li>
<li><a href="http://stackoverflow.com/questions/tagged/bazel" class="nav-icon"><i class="fa fa-stack-overflow"></i></a></li>
<li><a href="https://groups.google.com/forum/#!forum/bazel-discuss" class="nav-icon"><i class="fa fa-envelope"></i></a></li>
<li><a href="https://twitter.com/bazelbuild" class="nav-icon"><i class="fa fa-twitter"></i></a></li>
<li><a href="http://stackoverflow.com/questions/tagged/bazel" class="nav-icon"><i class="fa fa-stack-overflow"></i></a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>

93 changes: 93 additions & 0 deletions site/_sass/be.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
// Build Encyclopedia and Skylark Library

pre.rule-signature {
white-space: normal;
word-wrap: break-word;
word-break: normal;
}

colgroup {
.col-param {
width: 25%;
}

.col-description {
width: 75%;
}
}

$table-params-border-color: #81c784;
$table-params-head-color: #fff;
$table-params-body-bg-color: #e8f5e9;

.table-params {
border: 1px solid $table-params-border-color;

thead > tr > th {
color: $table-params-head-color;
border: 1px solid $table-params-border-color;
background-color: $table-params-border-color;
}

tbody > tr > td {
background-color: $table-params-body-bg-color;
border: 1px solid $table-params-border-color;
}
}

$table-implicit-border-color: #c0c0c0;
$table-implicit-head-color: #fff;
$table-implicit-body-bg-color: #f0f0f0;

.table-implicit {
border: 1px solid $table-implicit-border-color;

thead > tr > th {
color: $table-implicit-head-color;
border: 1px solid $table-implicit-border-color;
background-color: $table-implicit-border-color;
}

tbody > tr > td {
background-color: $table-implicit-body-bg-color;
border: 1px solid $table-implicit-border-color;
}
}


$toc-border-color: #c8e6c9;
$toc-color: #757575;

.toc {
border-left: 4px solid $toc-border-color;
padding-left: 18px;
margin-bottom: 20px;

h1,
h2 {
font-size: 24px;
color: $toc-color;
margin-bottom: 12px;
}

ul {
list-style: none;
padding-left: 0;
margin-top: 0;

li {
line-height: 36px;
font-size: 16px;
font-weight: 400;
}
}
}

// Command-line Reference
dt {
margin-top: .5em;
}

dd {
margin-left: 2em;
}
26 changes: 26 additions & 0 deletions site/_sass/footer.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Footer styles

$footer-backgroud: #424242;
$footer-color: #fff;
$footer-link-color: #e0e0e0;

.footer {
margin-top: 40px;
background-color: $footer-backgroud;
color: $footer-color;
padding: 20px;

.text-muted {
color: $footer-link-color;
}

a {
color: $footer-link-color;

&:hover,
&:focus {
color: $footer-color;
text-decoration: none;
}
}
}
96 changes: 96 additions & 0 deletions site/_sass/navbar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
// Navbar styles
$navbar-bg-color: $bazel-green;
$navbar-hover-bg-color: $bazel-green-light;
$navbar-color: $color-on-bazel-green;
$navbar-hover-color: #444;
$navbar-input-bg-color: $bazel-green-light;
$navbar-input-focus-bg-color: $color-on-bazel-green;
$navbar-input-border-color: $bazel-green;

.navbar-inverse {
margin-bottom: 0;
background-color: $navbar-bg-color;
border-bottom: 1px solid $navbar-bg-color;

.navbar-brand {
.navbar-logo {
height: 22px;
}
}

a.navbar-brand {
color: $navbar-color;

&:focus,
&:hover {
color: $navbar-hover-color;
background-color: $navbar-bg-color;
}
}

.navbar-nav > li > a {
color: $navbar-color;

&:focus,
&:hover {
color: $navbar-hover-color;
background-color: $navbar-hover-bg-color;
}

&.nav-icon {
font-size: 18px;
}
}

.navbar-nav > li.active > a {
background-color: $navbar-hover-bg-color;

&:focus,
&:hover {
background-color: $navbar-hover-bg-color;
}
}

.navbar-form {
border-color: $navbar-bg-color;

.input-sm {
margin-top: 2px;
}

input[type="search"] {
background-color: $navbar-input-bg-color;
border-color: $navbar-input-border-color;

&::placeholder {
color: $navbar-color;
}

&:focus,
&:active {
background-color: $navbar-input-focus-bg-color;
}
}
}

.navbar-toggle {
border: 1px solid $navbar-bg-color;

&.active,
&:focus,
&:hover {
background-color: $navbar-hover-bg-color;
}
}

.navbar-collapse {
border-color: $navbar-bg-color;
}
}

@media (max-width: 768px) {
#cse-search-box {
margin-top: 0;
margin-bottom: 0;
}
}
65 changes: 65 additions & 0 deletions site/_sass/sidebar.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
$sidebar-border-color: #fff;
$sidebar-hover-border-color: #66bb6a;

.sidebar {
margin-top: 40px;

ul.sidebar-nav {
list-style-type: none;
padding: 0;

li {
&.sidebar-nav-heading {
padding: 10px 0;
margin: 0;
display: block;
font-size: 16px;
font-weight: 300;
}

a {
padding: 4px 0;
display: block;
border-right: 2px solid $sidebar-border-color;;

&:focus {
text-decoration: none;
}

&:active,
&:hover {
border-right: 2px solid $sidebar-hover-border-color;
text-decoration: none;
}

.caret {
float: right;
margin-top: 8px;
margin-right: 10px;
}
}

&.active {
a {
border-right: 2px solid $sidebar-hover-border-color;
}
}
}

ul.sidebar-nav {
padding-left: 10px;
}
}
}

@media (min-width: 992px) {
.sidebar-toggle {
display: none;
}

.sidebar {
&.collapse {
display: block;
}
}
}
Loading

0 comments on commit 505b78c

Please sign in to comment.