Skip to content
This repository was archived by the owner on Oct 29, 2020. It is now read-only.

Commit 899dbf7

Browse files
committed
Fix line numbers and missing font
1 parent 914bfb9 commit 899dbf7

File tree

3 files changed

+26
-23
lines changed

3 files changed

+26
-23
lines changed

_posts/2014-04-02-using-modules-and-the-resolver.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ functions, and templates that Ember needs to resolve its dependencies, for examp
1212

1313
In the past, Ember's Default Resolver worked by putting everything into a global namespace, so you will come across the following pattern:
1414

15-
{% highlight javascript linenos %}
15+
{% highlight javascript %}
1616
App.IndexRoute = Ember.Route.extend({
1717
model: function() {
1818
return ['red', 'yellow', 'blue'];
@@ -30,7 +30,7 @@ For example, this route definition in `app/routes/index.js` would result in a
3030
module called `your-app/routes/index`. Using the resolver, when Ember looks up
3131
the index route, it will find this module and use the object that it exports.
3232

33-
{% highlight javascript linenos %}
33+
{% highlight javascript %}
3434
// app/routes/index.js
3535
import Ember from "ember";
3636

@@ -44,15 +44,15 @@ export default Ember.Route.extend({
4444

4545
You can also require modules directly with the following syntax:
4646

47-
{% highlight javascript linenos %}
47+
{% highlight javascript %}
4848
import FooMixin from "./mixins/foo";
4949
{% endhighlight %}
5050

5151
You can reference a module by using either a relative or absolute path.
5252
If you would like to reference a module using absolute begin
5353
the path with the app name defined in `package.json`:
5454

55-
{% highlight javascript linenos %}
55+
{% highlight javascript %}
5656
import FooMixin from "appname/mixins/foo";
5757
{% endhighlight %}
5858

@@ -66,7 +66,7 @@ when doing so manually; see how the module `mixins/foo` is assigned to variable
6666

6767
To use `Ember` or `DS` (for Ember Data) in your modules you must import them:
6868

69-
{% highlight javascript linenos %}
69+
{% highlight javascript %}
7070
import Ember from "ember";
7171
import DS from "ember-data";
7272
{% endhighlight %}
@@ -101,9 +101,9 @@ For more information, see [Naming Conventions](#naming-conventions).
101101
Custom Handlebars helpers are one of the ways that you can use the same HTML multiple
102102
times in your web application. Registering your custom helper allows it to
103103
be invoked from any of your Handlebars templates. Custom helpers are located
104-
under `app/helpers`.
104+
under `app/helpers`.
105105

106-
{% highlight javascript linenos %}
106+
{% highlight javascript %}
107107
// app/helpers/upper-case.js
108108
import Ember from "ember";
109109

@@ -130,7 +130,7 @@ to use it). It is advised to leverage Components instead.
130130

131131
Do this:
132132

133-
{% highlight javascript linenos %}
133+
{% highlight javascript %}
134134
// Given... app/components/my-text-field.js
135135
import Ember from "ember";
136136

_sass/_mixins.scss

+14-15
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ really slow down your CSS. Don't overdo it.
4848

4949
/* @include css-gradient(#dfdfdf,#f8f8f8); */
5050
@mixin css-gradient($from: #dfdfdf, $to: #f8f8f8) {
51-
background-color: $to;
52-
background-image: -webkit-gradient(linear, left top, left bottom, from($from), to($to));
53-
background-image: -webkit-linear-gradient(top, $from, $to);
54-
background-image: -moz-linear-gradient(top, $from, $to);
55-
background-image: -o-linear-gradient(top, $from, $to);
56-
background-image: linear-gradient(to bottom, $from, $to);
51+
background-color: $to;
52+
background-image: -webkit-gradient(linear, left top, left bottom, from($from), to($to));
53+
background-image: -webkit-linear-gradient(top, $from, $to);
54+
background-image: -moz-linear-gradient(top, $from, $to);
55+
background-image: -o-linear-gradient(top, $from, $to);
56+
background-image: linear-gradient(to bottom, $from, $to);
5757
}
5858

5959
/*********************
@@ -64,10 +64,10 @@ BOX SIZING
6464
/* NOTE: value of "padding-box" is only supported in Gecko. So
6565
probably best not to use it. I mean, were you going to anyway? */
6666
@mixin box-sizing($type: border-box) {
67-
-webkit-box-sizing: $type;
68-
-moz-box-sizing: $type;
69-
-ms-box-sizing: $type;
70-
box-sizing: $type;
67+
-webkit-box-sizing: $type;
68+
-moz-box-sizing: $type;
69+
-ms-box-sizing: $type;
70+
box-sizing: $type;
7171
}
7272

7373
/*********************
@@ -77,10 +77,10 @@ BORDER RADIUS
7777
/* @include border-radius(5px); */
7878

7979
@mixin border-radius($type: 8px) {
80-
-webkit-border-radius: $type;
81-
-moz-border-radius: $type;
82-
-khtml-border-radius: $type;
83-
border-radius: $type;
80+
-webkit-border-radius: $type;
81+
-moz-border-radius: $type;
82+
-khtml-border-radius: $type;
83+
border-radius: $type;
8484
}
8585

8686
/*********************
@@ -94,7 +94,6 @@ FONT FACE
9494
font-family: $font-name;
9595
src: url("fonts/#{$file-name}.eot");
9696
src: url("fonts/#{$file-name}.eot?#iefix") format("embedded-opentype"),
97-
url("fonts/#{$file-name}.woff2") format("woff2"),
9897
url("fonts/#{$file-name}.woff") format("woff"),
9998
url("fonts/#{$file-name}.ttf") format("truetype"),
10099
url("fonts/#{$file-name}.svg#svg#{$file-name}") format("svg");

assets/main.scss

+4
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,10 @@ body {
310310
code {
311311
color: #efeaea;
312312

313+
span {
314+
color: inherit;
315+
}
316+
313317
.lineno {
314318
color: #ccc;
315319
}

0 commit comments

Comments
 (0)