Skip to content

[prototype/WIP] widened side grid #3205

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

Closed
j-low wants to merge 1 commit into from
Closed

[prototype/WIP] widened side grid #3205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion _includes/sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="col-md-3 col-sidebar">
<div class="col-sidebar">
<script>
$(document).ready(function() {
// Initialize navgoco with default options
Expand Down
6 changes: 3 additions & 3 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
{% include topnav.html %}
<div id="content">
<div id="main-content" class="container">
<div class="row sidebar-row">
<div class=" sidebar-row">
{% if page.no_sidebar == true %}
<div class="col-md-10 col-md-offset-1 content-col">
<div class="col-md-offset-1 content-col">
{% else %}
{% include sidebar.html %}
<div class="col-md-9 content-col content-col-border {% if page.url == '/' %}content-col--landing{% endif %}">
<div class="content-col content-col-border {% if page.url == '/' %}content-col--landing{% endif %}">
{% endif %}
{{content}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion css/components/_search.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

@media (min-width: $screen-md) {
width: 90%;
width: 100%;
margin-bottom: 30px;
}
}
Expand Down
19 changes: 11 additions & 8 deletions css/customstyles.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/customstyles.css.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions css/layouts/_content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@

@include at-query($min, $screen-md){
#main-content {
max-width: 100%;
min-height: 625px;
padding: 0 30px 0 45px;

.content-col {
min-height: 625px;
Expand Down
11 changes: 8 additions & 3 deletions css/layouts/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ body.sidenav-open {
.col-sidebar {
background-color: $cl_gray_light;
position: relative;
padding: 0 0 0 15px;

@include at-query($max, $screen-md) {
position: fixed;
Expand All @@ -33,6 +34,8 @@ body.sidenav-open {

@include at-query($min, $screen-md) {
top: 70px;
min-width: 290px;
padding: 0;
}

@include at-query($min, $screen-md){
Expand Down Expand Up @@ -293,8 +296,10 @@ a:not([href]) {
border-radius: 0px;
padding-bottom: 5px;

@include at-query($min, $screen-md) { padding: 0; }
@include at-query($min, $screen-lg) { width: 260px; }
@include at-query($min, $screen-md) {
width: 260px;
padding: 0;
}

li.tier-1 {
margin-top: 5px;
Expand Down Expand Up @@ -350,7 +355,7 @@ a:not([href]) {
left: auto;
}

@include at-query($min, $screen-lg) {width: 260px; }
@include at-query($min, $screen-md) {width: 260px; }

&.open {
border-bottom: 1px solid $cl_gray_medium;
Expand Down