Skip to content

Commit 1887740

Browse files
rtorrrtorr
committed
cleaing up website branch
2 parents 6993695 + 6db8a64 commit 1887740

File tree

5 files changed

+86
-172
lines changed

5 files changed

+86
-172
lines changed

‎Gruntfile.js

+10-86
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,6 @@ module.exports = function (grunt) {
2525
grunt.initConfig({
2626
yeoman: yeomanConfig,
2727
watch: {
28-
coffee: {
29-
files: ['<%= yeoman.app %>/scripts/{,*/}*.coffee'],
30-
tasks: ['coffee:dist']
31-
},
32-
coffeeTest: {
33-
files: ['test/spec/{,*/}*.coffee'],
34-
tasks: ['coffee:test']
35-
},
36-
compass: {
37-
files: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
38-
tasks: ['compass:server']
39-
},
4028
livereload: {
4129
options: {
4230
livereload: LIVERELOAD_PORT
@@ -125,75 +113,6 @@ module.exports = function (grunt) {
125113
}
126114
}
127115
},
128-
coffee: {
129-
dist: {
130-
files: [
131-
{
132-
expand: true,
133-
cwd: '<%= yeoman.app %>/scripts',
134-
src: '{,*/}*.coffee',
135-
dest: '.tmp/scripts',
136-
ext: '.js'
137-
}
138-
]
139-
},
140-
test: {
141-
files: [
142-
{
143-
expand: true,
144-
cwd: 'test/spec',
145-
src: '{,*/}*.coffee',
146-
dest: '.tmp/spec',
147-
ext: '.js'
148-
}
149-
]
150-
}
151-
},
152-
compass: {
153-
options: {
154-
sassDir: '<%= yeoman.app %>/styles',
155-
cssDir: '.tmp/styles',
156-
generatedImagesDir: '.tmp/images/generated',
157-
imagesDir: '<%= yeoman.app %>/images',
158-
javascriptsDir: '<%= yeoman.app %>/scripts',
159-
fontsDir: '<%= yeoman.app %>/styles/fonts',
160-
importPath: '<%= yeoman.app %>/bower_components',
161-
httpImagesPath: '/images',
162-
httpGeneratedImagesPath: '/images/generated',
163-
httpFontsPath: '/styles/fonts',
164-
relativeAssets: false
165-
},
166-
dist: {},
167-
server: {
168-
options: {
169-
debugInfo: true
170-
}
171-
}
172-
},
173-
// not used since Uglify task does concat,
174-
// but still available if needed
175-
/*concat: {
176-
dist: {}
177-
},*/
178-
requirejs: {
179-
dist: {
180-
// Options: https://github.com/jrburke/r.js/blob/master/build/example.build.js
181-
options: {
182-
// `name` and `out` is set by grunt-usemin
183-
baseUrl: yeomanConfig.app + '/scripts',
184-
optimize: 'none',
185-
// TODO: Figure out how to make sourcemaps work with grunt-usemin
186-
// https://github.com/yeoman/grunt-usemin/issues/30
187-
//generateSourceMaps: true,
188-
// required to support SourceMaps
189-
// http://requirejs.org/docs/errors.html#sourcemapcomments
190-
preserveLicenseComments: false,
191-
useStrict: true,
192-
wrap: true
193-
//uglify2: {} // https://github.com/mishoo/UglifyJS2
194-
}
195-
}
196-
},
197116
rev: {
198117
dist: {
199118
files: {
@@ -285,6 +204,15 @@ module.exports = function (grunt) {
285204
// Put files not handled in other tasks here
286205
copy: {
287206
dist: {
207+
styles: {
208+
expand: true,
209+
cwd: '<%= yeoman.app %>',
210+
dest: '.tmp/',
211+
src: [
212+
'styles/{,*/}*.css',
213+
'bower_components/bootstrap/dist/css/bootstrap.min.css'
214+
]
215+
},
288216
files: [
289217
{
290218
expand: true,
@@ -311,15 +239,11 @@ module.exports = function (grunt) {
311239
},
312240
concurrent: {
313241
server: [
314-
'compass',
315-
'coffee:dist'
242+
316243
],
317244
test: [
318-
'coffee'
319245
],
320246
dist: [
321-
'coffee',
322-
'compass',
323247
'imagemin',
324248
'svgmin',
325249
'htmlmin'

‎app/index.html

+62-71
Original file line numberDiff line numberDiff line change
@@ -19,107 +19,108 @@
1919
<div class="clearfix">
2020
<div class="container">
2121
<div class="row">
22-
<div class="col-lg-12">
22+
<div class="col-lg-12 col-md-12">
2323
<h1>VIM</h1>
2424
</div>
2525
</div> <!-- end row -->
2626
<div class="row">
27-
<div class="col-lg-4">
27+
<div class="col-lg-4 col-md-4">
2828
<h2>Cursor movement</h2>
2929
<ul>
30-
<li><kbd>h</kbd> - move left</li>
31-
<li><kbd>j</kbd> - move down</li>
32-
<li><kbd>k</kbd> - move up</li>
33-
<li><kbd>l</kbd> - move right</li>
34-
<li><kbd>w</kbd> - jump by start of words (punctuation considered words)</li>
35-
<li><kbd>W</kbd> - jump by words (spaces separate words)</li>
36-
<li><kbd>e</kbd> - jump to end of words (punctuation considered words)</li>
37-
<li><kbd>E</kbd> - jump to end of words (no punctuation)</li>
38-
<li><kbd>b</kbd> - jump backward by words (punctuation considered words)</li>
39-
<li><kbd>B</kbd> - jump backward by words (no punctuation)</li>
40-
<li><kbd>0</kbd> - (zero) start of line</li>
41-
<li><kbd>^</kbd> - first non-blank character of line</li>
42-
<li><kbd>$</kbd> - end of line</li>
43-
<li><kbd>G</kbd> - go to command (prefix with number - <kbd>5G</kbd> goes to line 5)</li>
30+
<li><kbd>h</kbd> - move cursor left</li>
31+
<li><kbd>j</kbd> - move cursor down</li>
32+
<li><kbd>k</kbd> - move cursor up</li>
33+
<li><kbd>l</kbd> - move cursor right</li>
34+
<li><kbd>w</kbd> - jump forwards to the start of a word</li>
35+
<li><kbd>W</kbd> - jump forwards to the start of a word (words can contain punctuation)</li>
36+
<li><kbd>e</kbd> - jump forwards to the end of a word</li>
37+
<li><kbd>E</kbd> - jump forwards to the end of a word (words can contain punctuation)</li>
38+
<li><kbd>b</kbd> - jump backwards to the start of a word</li>
39+
<li><kbd>B</kbd> - jump backwards to the start of a word (words can contain punctuation)</li>
40+
<li><kbd>0</kbd> - jump to the start of the line</li>
41+
<li><kbd>^</kbd> - jump to the first non-blank character of the line</li>
42+
<li><kbd>$</kbd> - jump to the end of the line</li>
43+
<li><kbd>G</kbd> - go to the last line of the document</li>
44+
<li><kbd>5G</kbd> - go to line 5</li>
4445
</ul>
4546
<div class="well">
4647
<small><strong>Tip</strong> Prefix a cursor movement command with a number to repeat it. For example, <kbd>4j</kbd> moves down 4 lines.</small>
4748
</div>
48-
<h2>Insert Mode - Inserting/Appending text</h2>
49+
<h2>Insert mode - inserting/appending text</h2>
4950
<ul>
50-
<li><kbd>i</kbd> - start insert mode at cursor</li>
51+
<li><kbd>i</kbd> - insert before the cursor</li>
5152
<li><kbd>I</kbd> - insert at the beginning of the line</li>
52-
<li><kbd>a</kbd> - append after the cursor</li>
53-
<li><kbd>A</kbd> - append at the end of the line</li>
54-
<li><kbd>o</kbd> - open (append) blank line below current line (no need to press return)</li>
55-
<li><kbd>O</kbd> - open blank line above current line</li>
56-
<li><kbd>ea</kbd> - append at end of word</li>
53+
<li><kbd>a</kbd> - insert (append) after the cursor</li>
54+
<li><kbd>A</kbd> - insert (append) at the end of the line</li>
55+
<li><kbd>o</kbd> - append (open) a new line below the current line</li>
56+
<li><kbd>O</kbd> - append (open) a new line above the current line</li>
57+
<li><kbd>ea</kbd> - insert (append) at the end of the word</li>
5758
<li><kbd>Esc</kbd> - exit insert mode</li>
5859
</ul>
5960
</div>
60-
<div class="col-lg-4">
61+
<div class="col-lg-4 col-md-4">
6162
<h2>Editing</h2>
6263
<ul>
63-
<li><kbd>r</kbd> - replace a single character (does not use insert mode)</li>
64+
<li><kbd>r</kbd> - replace a single character</li>
6465
<li><kbd>J</kbd> - join line below to the current one</li>
65-
<li><kbd>cc</kbd> - change (replace) an entire line</li>
66-
<li><kbd>cw</kbd> - change (replace) to the end of word</li>
67-
<li><kbd>c$</kbd> - change (replace) to the end of line</li>
68-
<li><kbd>s</kbd> - delete character at cursor and substitute text</li>
69-
<li><kbd>S</kbd> - delete line at cursor and substitute text (same as cc)</li>
70-
<li><kbd>xp</kbd> - transpose two letter (delete and paste, technically)</li>
66+
<li><kbd>cc</kbd> - change (replace) entire line</li>
67+
<li><kbd>cw</kbd> - change (replace) to the end of the word</li>
68+
<li><kbd>c$</kbd> - change (replace) to the end of the line</li>
69+
<li><kbd>s</kbd> - delete character and substitute text</li>
70+
<li><kbd>S</kbd> - delete line and substitute text (same as cc)</li>
71+
<li><kbd>xp</kbd> - transpose two letters (delete and paste)</li>
7172
<li><kbd>u</kbd> - undo</li>
7273
<li><kbd>Ctrl</kbd> + <kbd>r</kbd> - redo</li>
7374
<li><kbd>.</kbd> - repeat last command</li>
7475
</ul>
7576
<h2>Marking text (visual mode)</h2>
7677
<ul>
77-
<li><kbd>v</kbd> - start visual mode, mark lines, then do command (such as y-yank)</li>
78+
<li><kbd>v</kbd> - start visual mode, mark lines, then do a command (like y-yank)</li>
7879
<li><kbd>V</kbd> - start linewise visual mode</li>
7980
<li><kbd>o</kbd> - move to other end of marked area</li>
8081
<li><kbd>Ctrl</kbd> + <kbd>v</kbd> - start visual block mode</li>
8182
<li><kbd>O</kbd> - move to other corner of block</li>
8283
<li><kbd>aw</kbd> - mark a word</li>
83-
<li><kbd>ab</kbd> - a () block (with braces)</li>
84-
<li><kbd>aB</kbd> - a {} block (with brackets)</li>
85-
<li><kbd>ib</kbd> - inner () block</li>
86-
<li><kbd>iB</kbd> - inner {} block</li>
84+
<li><kbd>ab</kbd> - a block with ()</li>
85+
<li><kbd>aB</kbd> - a block with {}</li>
86+
<li><kbd>ib</kbd> - inner block with ()</li>
87+
<li><kbd>iB</kbd> - inner block with {}</li>
8788
<li><kbd>Esc</kbd> - exit visual mode</li>
8889
</ul>
8990
<h2>Visual commands</h2>
9091
<ul>
91-
<li><kbd>&#62;</kbd> - shift right</li>
92-
<li><kbd>&#60;</kbd> - shift left</li>
92+
<li><kbd>&#62;</kbd> - shift text right</li>
93+
<li><kbd>&#60;</kbd> - shift text left</li>
9394
<li><kbd>y</kbd> - yank (copy) marked text</li>
9495
<li><kbd>d</kbd> - delete marked text</li>
9596
<li><kbd>~</kbd> - switch case</li>
9697
</ul>
9798
</div>
98-
<div class="col-lg-4">
99-
<h2>Cut and Paste</h2>
99+
<div class="col-lg-4 col-md-4">
100+
<h2>Cut and paste</h2>
100101
<ul>
101102
<li><kbd>yy</kbd> - yank (copy) a line</li>
102-
<li><kbd>2yy</kbd> - yank 2 lines</li>
103-
<li><kbd>yw</kbd> - yank word</li>
104-
<li><kbd>y$</kbd> - yank to end of line</li>
103+
<li><kbd>2yy</kbd> - yank (copy) 2 lines</li>
104+
<li><kbd>yw</kbd> - yank (copy) word</li>
105+
<li><kbd>y$</kbd> - yank (copy) to end of line</li>
105106
<li><kbd>p</kbd> - put (paste) the clipboard after cursor</li>
106107
<li><kbd>P</kbd> - put (paste) before cursor</li>
107108
<li><kbd>dd</kbd> - delete (cut) a line</li>
108109
<li><kbd>2dd</kbd> - delete (cut) 2 lines</li>
109-
<li><kbd>dw</kbd> - delete (cut) the current word</li>
110-
<li><kbd>D</kbd> - delete (cut) to the end of line</li>
110+
<li><kbd>dw</kbd> - delete (cut) word</li>
111+
<li><kbd>D</kbd> - delete (cut) to the end of the line</li>
111112
<li><kbd>d$</kbd> - delete (cut) to the end of the line</li>
112-
<li><kbd>x</kbd> - delete (cut) current character</li>
113+
<li><kbd>x</kbd> - delete (cut) character</li>
113114
</ul>
114115
<h2>Exiting</h2>
115116
<ul>
116117
<li><kbd>:w</kbd> - write (save) the file, but don't exit</li>
117118
<li><kbd>:wq</kbd> - write (save) and quit</li>
118119
<li><kbd>:x</kbd> - write (save) and quit</li>
119-
<li><kbd>:q</kbd> - quit (fails if anything has changed)</li>
120-
<li><kbd>:q!</kbd> - quit and throw away changes</li>
120+
<li><kbd>:q</kbd> - quit (fails if there are unsaved changes)</li>
121+
<li><kbd>:q!</kbd> - quit and throw away unsaved changes</li>
121122
</ul>
122-
<h2>Search/Replace</h2>
123+
<h2>Search and replace</h2>
123124
<ul>
124125
<li><kbd>/pattern</kbd> - search for pattern</li>
125126
<li><kbd>?pattern</kbd> - search backward for pattern</li>
@@ -131,32 +132,32 @@ <h2>Search/Replace</h2>
131132
</div>
132133
</div> <!-- end row -->
133134
<div class="row">
134-
<div class="col-lg-4">
135+
<div class="col-lg-4 col-md-4">
135136
<h2>Working with multiple files</h2>
136137
<ul>
137138
<li><kbd>:e</kbd> filename - edit a file in a new buffer</li>
138-
<li><kbd>:bnext</kbd> or <kbd>:bn</kbd> - go to next buffer</li>
139-
<li><kbd>:bprev</kbd> or <kbd>:bp</kbd> - go to previous buffer</li>
139+
<li><kbd>:bnext</kbd> or <kbd>:bn</kbd> - go to the next buffer</li>
140+
<li><kbd>:bprev</kbd> or <kbd>:bp</kbd> - go to the previous buffer</li>
140141
<li><kbd>:bd</kbd> - delete a buffer (close a file)</li>
141142
<li><kbd>:sp</kbd> filename - open a file in a new buffer and split window</li>
142143
<li><kbd>:vsp</kbd> filename - open a file in a new buffer and vertically split window </li>
143-
<li><kbd>Ctrl</kbd> + <kbd>ws</kbd> - split windows</li>
144+
<li><kbd>Ctrl</kbd> + <kbd>ws</kbd> - split window</li>
144145
<li><kbd>Ctrl</kbd> + <kbd>ww</kbd> - switch windows</li>
145146
<li><kbd>Ctrl</kbd> + <kbd>wq</kbd> - quit a window</li>
146-
<li><kbd>Ctrl</kbd> + <kbd>wv</kbd> - split windows vertically</li>
147+
<li><kbd>Ctrl</kbd> + <kbd>wv</kbd> - split window vertically</li>
147148
</ul>
148149
</div>
149-
<div class="col-lg-4">
150+
<div class="col-lg-4 col-md-4">
150151
<h2>Tabs</h2>
151152
<ul>
152-
<li><kbd>:tabnew</kbd> filename or <kbd>:tabn</kbd> filename - open file in a new tab</li>
153-
<li><kbd>Ctrl+W T</kbd> - move current split window into its own tab</li>
154-
<li><kbd>gt</kbd> or <kbd>:tabnext</kbd> or <kbd>:tabn</kbd> - move to next tab</li>
155-
<li><kbd>gT</kbd> or <kbd>:tabprev</kbd> or <kbd>:tabp</kbd> - move to previous tab</li>
153+
<li><kbd>:tabnew</kbd> filename or <kbd>:tabn</kbd> filename - open a file in a new tab</li>
154+
<li><kbd>Ctrl</kbd> + <kbd>wt</kbd> - move the current split window into its own tab</li>
155+
<li><kbd>gt</kbd> or <kbd>:tabnext</kbd> or <kbd>:tabn</kbd> - move to the next tab</li>
156+
<li><kbd>gT</kbd> or <kbd>:tabprev</kbd> or <kbd>:tabp</kbd> - move to the previous tab</li>
156157
<li><kbd>#gt</kbd> - move to tab number #</li>
157158
<li><kbd>:tabmove #</kbd> - move current tab to the #th position (indexed from 0)</li>
158159
<li><kbd>:tabclose</kbd> or <kbd>:tabc</kbd> - close the current tab and all its windows</li>
159-
<li><kbd>:tabonly</kbd> or <kbd>:tabo</kbd> - close all other tabs except for the current one</li>
160+
<li><kbd>:tabonly</kbd> or <kbd>:tabo</kbd> - close all tabs except for the current one</li>
160161
</ul>
161162
</div>
162163
</div> <!-- end row -->
@@ -171,15 +172,5 @@ <h2>Tabs</h2>
171172
</div>
172173
</div>
173174
</div>
174-
<script type="text/javascript">
175-
var _gaq = _gaq || [];
176-
_gaq.push(['_setAccount', 'UA-25408695-1']);
177-
_gaq.push(['_trackPageview']);
178-
(function() {
179-
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
180-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
181-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
182-
})();
183-
</script>
184175
</body>
185-
</html>
176+
</html>

‎app/styles/main.css

+12-10
Original file line numberDiff line numberDiff line change
@@ -26,32 +26,34 @@ h2 {
2626

2727
ul {
2828
padding: 0;
29-
padding-left: 5px;
3029
}
3130

3231
li {
3332
list-style-type: none;
3433
}
3534

36-
.well {
37-
border-radius: 0;
38-
}
39-
40-
#footer {
41-
text-align: center;
42-
}
43-
4435
kbd {
4536
font-family: monospace,serif;
4637
font-size: 1em;
4738
color: #333;
4839
background-color: #fafafa;
4940
border-radius: 0;
5041
box-shadow: none;
51-
font-weight: 700;
42+
font-weight: bold;
5243
padding: 0;
5344
}
5445

46+
.well {
47+
border-radius: 0;
48+
}
49+
50+
#footer {
51+
margin-top: 15px;
52+
text-align: center;
53+
}
54+
55+
56+
5557
#footer .well {
5658
margin-bottom: 0;
5759
}

0 commit comments

Comments
 (0)