Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
deb9022
Updates styles for sidebar and cleans up CSS
Apr 26, 2019
914f638
Cleans up bracket spacing
Apr 29, 2019
c032eb4
Fix the sidebar animation while opening & closing groups
Apr 30, 2019
ad97f12
Fixes social share sizes, and adds space to left btm sidebar
May 1, 2019
c9ca1c7
adds space between header and "core"
May 1, 2019
ebaafac
fixes line-height for nested nested nested nested nested items
May 1, 2019
64e5eba
Styles aria-pressed to limit spacing under subhead
May 2, 2019
b253cc6
indents items under recipes, but not sub items
May 2, 2019
d6c539b
first level sub indents on mobile
May 2, 2019
30ca15a
Fixes for spacing issues
May 3, 2019
5aabecb
Rolls back adding class `recipes` in docmap
May 3, 2019
2c14e21
Reduces sidebar spacing
May 3, 2019
3fef965
Rolls back spacing between headers and links
May 3, 2019
a65ef9a
Makes Guides and API links more similar, adds padding to recipes
May 3, 2019
ad13672
Fixes sub sub sub indents
May 3, 2019
25f5a4b
Resolves need for !importants in padding
May 6, 2019
d3628da
Merge branch 'master' into i505
May 6, 2019
24d741b
Adds padding back in to baseline version number
May 6, 2019
480c590
Sets space at bottom of sidebar
May 6, 2019
ba7e4b7
Removes light font-weight for CORE/INF/ECO
May 6, 2019
bb40f7a
FIxes spacing between items
May 6, 2019
69c8b1d
Fixes spacing 2, electric boogaloo
May 6, 2019
6037f78
Smooth transition on collapsable close
May 6, 2019
8824b2a
Removes indent from top line lists
May 6, 2019
feff81f
Scroll to the top when new pages are loaded
May 6, 2019
7b693c6
adds line to sidebar
May 6, 2019
cbf9203
Update the docMap
May 6, 2019
8c585d7
Fix an issue with searching in Chrome
May 10, 2019
03533cb
Merge branch 'master' into i505
May 13, 2019
a2880de
Make the sidebar a flexible width & fix scrolling issues
May 13, 2019
8b131b2
Fixes +/- icon to be more inline with text
May 13, 2019
725e3ce
Fixes nested nested nested ul top spacing
May 13, 2019
091afe5
adds `-ms-grid` support for IE11
May 13, 2019
a42487b
adds variable to where hearder height is used
May 13, 2019
ec2eb74
escapes header variable in LESS calc
May 13, 2019
f336699
Removes the recipes-specific class for top leve styling
May 13, 2019
bfff807
adds more space between top-level pages on mobile
May 13, 2019
29ab553
Minor style fixes
May 13, 2019
5570d63
Merge branch 'master' into i505
May 13, 2019
45ff279
Skip a test that was specific to the Recipes page
May 13, 2019
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
39,637 changes: 19,596 additions & 20,041 deletions docMap.json

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion sidebar/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ QUnit.test('Search map is parsed', function(assert) {
assert.ok(childrenLength > 1 && childrenLength < 10, 'rootPage has a reasonable number of children');
});

QUnit.test('Parents with @subchildren should show their grandchildren', function(assert) {
// This used to test how the Recipes page had groups underneath it,
// but that page was removed and Chasen couldn’t find another like it.
QUnit.skip('Parents with @subchildren should show their grandchildren', function(assert) {
var vm = new ViewModel({searchMap: searchMap});
var pageMap = vm.pageMap;
var guidesPage = pageMap['guides'];
Expand Down
2 changes: 1 addition & 1 deletion static/base.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body {
height: 100%;
overflow: hidden;
overflow: auto;
margin: 0px;
}
html {
Expand Down
2 changes: 1 addition & 1 deletion static/canjs.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function navigate(href, updateLocation) {
}

// Scroll to the top of the page
$articleContainer.scrollTop(0);
$('html').scrollTop(0);

var $article = $content.find("article");
var currentPage = $content.filter("#everything").attr("data-current-page");
Expand Down
4 changes: 4 additions & 0 deletions static/header.less
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
display: flex;
align-items: center;
flex-shrink: 0;
grid-area: header;
padding: 0 @gutter*2;
position: fixed;
width: 100%;
@media screen and (max-width: 499px){
padding: 0 @gutter;
}
Expand Down Expand Up @@ -88,6 +91,7 @@
align-items: center;
font-size: 12px;
height: @brand-height;
padding-top: 7px;
cursor: pointer;
.version-number::after {
display: inline-block;
Expand Down
36 changes: 18 additions & 18 deletions static/layout.less
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
#everything {
.flex;
-webkit-flex-flow: row wrap;
justify-content: flex-start;
align-items: stretch;
flex-wrap: nowrap;
box-sizing: border-box;
height: calc(~"100% - 53px");// 53px header
-webkit-overflow-scrolling: touch;
padding-bottom: 0;
transition: padding-bottom @transition-speed ease;
display:-ms-grid;
display: grid;
-ms-grid-columns: 300px 1fr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this look like when it’s cut off?

grid-template-columns: max-content 1fr;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realized max-content isn’t supported by Edge. Maybe we should also add a rule for fit-content(50%) or something else that would work? https://developer.mozilla.org/en-US/docs/Web/CSS/fit-content

grid-template-areas: "header header" "left-nav content";
}
#left {
-ms-grid-row: 2;
-ms-grid-column: 1;
-ms-grid-column-span: 1;
grid-area: left-nav;
height: calc(~"100vh - " @brand-height);// 53px header
overflow-y: scroll;
position: fixed;
scroll-behavior: smooth;
top: @brand-height;
width: @sidebar-width;
min-width: 0;
transition: min-width @transition-speed ease;
border-right: 3px solid #F4F4F4;
@media screen and (min-width: @breakpoint){
flex-shrink: 0;
padding: 0px;
position: relative;
.sticky;
margin: @brand-height 0 0;
width: auto;
}
}
#right {
height: 100%;
min-height: 100%;
max-height: 100%;
background: white;
display: flex;
-ms-grid-column: 2;
grid-area: content;
overflow-x: hidden;
// z-index: 90;
padding-top: @brand-height;
position: relative;
left: 0;
.transition-left;
flex-grow: 1;
@media screen and (min-width: @breakpoint){
display: flex;
flex-grow: 1;
}
}
.column {
height: 100%;
Expand Down
4 changes: 4 additions & 0 deletions static/mixins.less
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
font-size: .9em;
color: @code-color;
}
.sticky {
position: -webkit-sticky;
position: sticky;
}
.transition-left {
-webkit-transition: left .5s ;
-moz-transition: left .5s;
Expand Down
3 changes: 0 additions & 3 deletions static/mobile.less
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ label[for="nav-trigger"] {
label:hover{
background: @border-color;
}
.nav-trigger ~ #everything #right {
width: 100%;
}
.nav-trigger:checked ~ #everything #right {
@media screen and (max-width: @breakpoint){
flex-shrink: 0;
Expand Down
Loading