Skip to content

Commit 3f1bec5

Browse files
author
Matthew McCullough
committed
Merge remote-tracking branch 'origin/dark-ship-style-tuning' into section-headers
2 parents f557c00 + 14e5e56 commit 3f1bec5

File tree

3 files changed

+50
-22
lines changed

3 files changed

+50
-22
lines changed

_layouts/curriculum-beta.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ <h2>{{ page.title }}</h2>
3636
</div>
3737
</div>
3838

39-
<div id="toc-wrapper">
40-
<div id="toc" data-spy="affix" data-offset-top="165">
41-
<ul id="toc-list" class="nav" role="tablist"></ul>
39+
<div class="curriculum">
40+
<div id="toc-wrapper">
41+
<div id="toc" data-spy="affix" data-offset-top="165">
42+
<ul id="toc-list" class="nav" role="tablist"></ul>
43+
</div>
4244
</div>
43-
</div>
4445

45-
<div class="curriculum">{{ content }}</div>
46+
{{ content }}
47+
</div>
4648

4749
{% include footer.html %}
4850
</body>

_stylesheets/curriculum-beta.css

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ body {
5454
font-size: 8pt; }
5555

5656
.curriculum {
57-
width: 960px;
57+
width: 760px;
58+
padding: 0 200px 0 0;
5859
margin: 0 auto;
5960
position: relative;
6061
/* General external link */
@@ -75,14 +76,20 @@ body {
7576
text-shadow: 0 1px rgba(0, 0, 0, 0.1);
7677
color: #454545;
7778
border-bottom: solid 1px #e8e8ea; }
78-
.curriculum pre {
79-
margin: 0 15%;
80-
background: white; }
81-
.curriculum pre:before {
82-
content: "\f0c8";
83-
font: normal normal 22px octicons;
84-
float: right;
85-
opacity: .4; }
79+
.curriculum pre, .curriculum table {
80+
background: #f9fafa;
81+
border: solid 1px #edeff0;
82+
border-radius: 3px;
83+
box-shadow: 0px 4px 0 0px #edeff0;
84+
line-height: 2em; }
85+
.curriculum pre:before {
86+
content: "\f0c8";
87+
font: normal normal 22px octicons;
88+
float: right;
89+
color: #c0c7ce; }
90+
.curriculum table th, .curriculum table td {
91+
text-align: left;
92+
padding: 0 1em; }
8693
.curriculum p {
8794
line-height: 1.75em;
8895
margin-bottom: 2em; }
@@ -98,8 +105,10 @@ body {
98105
.curriculum .slide h1, .curriculum .slide h2, .curriculum .slide h3, .curriculum .slide h4, .curriculum .slide h5, .curriculum .slide h6, .curriculum .slide p, .curriculum .slide ul, .curriculum .slide pre, .curriculum .slide svg {
99106
margin-left: 0;
100107
margin-right: 0; }
108+
.curriculum .slide pre code {
109+
font-size: 1.5em; }
101110
.curriculum .slide .alignment {
102-
padding: 0 20%;
111+
padding: 0 10%;
103112
display: table-cell;
104113
vertical-align: middle; }
105114
.curriculum a[href^="http://"],

_stylesheets/curriculum-beta.scss

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ body{
2525
}
2626

2727
.curriculum{
28-
width: $width-desktop;
29-
// width: 100%;
28+
width: $width-desktop - 200px;
29+
padding: 0 200px 0 0;
3030
margin: 0 auto;
3131
position: relative;
3232

@@ -51,15 +51,26 @@ body{
5151
border-bottom: solid 1px $mono-light;
5252
}
5353

54-
pre{
55-
margin: 0 15%;
56-
background: $mono-bright;
54+
pre, table{
55+
background: #f9fafa;
56+
border: solid 1px #edeff0;
57+
border-radius: 3px;
58+
box-shadow: 0px 4px 0 0px #edeff0;
59+
line-height: 2em;
60+
}
5761

62+
pre{
5863
&:before {
5964
content: "\f0c8";
6065
font: normal normal 22px octicons;
6166
float: right;
62-
opacity: .4;
67+
color: #c0c7ce;
68+
}
69+
}
70+
table{
71+
th, td{
72+
text-align: left;
73+
padding: 0 1em;
6374
}
6475
}
6576

@@ -87,8 +98,14 @@ body{
8798
margin-right: 0;
8899
}
89100

101+
pre{
102+
code{
103+
font-size: 1.5em;
104+
}
105+
}
106+
90107
.alignment{
91-
padding: 0 20%;
108+
padding: 0 10%;
92109
display: table-cell;
93110
vertical-align: middle;
94111
}

0 commit comments

Comments
 (0)