Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jeffdavidgordon/wet-boew into grids
Browse files Browse the repository at this point in the history
Conflicts:
	demos/grids/grid-utilities-eng.html
	demos/grids/grid-utilities-fra.html
	demos/grids/grid-utilities-leftmenu-eng.html
	demos/grids/grid-utilities-leftmenu-fra.html
	demos/grids/old/grid-utilities-eng.html
	demos/grids/old/grid-utilities-fra.html
	demos/grids/old/grid-utilities-leftmenu-eng.html
	demos/grids/old/grid-utilities-leftmenu-fra.html
  • Loading branch information
LaurentGoderre committed Aug 23, 2012
2 parents 030b890 + 5afd1fe commit 9a72d04
Show file tree
Hide file tree
Showing 42 changed files with 8,535 additions and 37,109 deletions.
2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-apollo.js

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

18 changes: 18 additions & 0 deletions demos/grids/google-code-prettify/lang-clj.js
@@ -0,0 +1,18 @@
/*
Copyright (C) 2011 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
var a=null;
PR.registerLangHandler(PR.createSimpleLexer([["opn",/^[([{]+/,a,"([{"],["clo",/^[)\]}]+/,a,")]}"],["com",/^;[^\n\r]*/,a,";"],["pln",/^[\t\n\r \xa0]+/,a,"\t\n\r \xa0"],["str",/^"(?:[^"\\]|\\[\S\s])*(?:"|$)/,a,'"']],[["kwd",/^(?:def|if|do|let|quote|var|fn|loop|recur|throw|try|monitor-enter|monitor-exit|defmacro|defn|defn-|macroexpand|macroexpand-1|for|doseq|dosync|dotimes|and|or|when|not|assert|doto|proxy|defstruct|first|rest|cons|defprotocol|deftype|defrecord|reify|defmulti|defmethod|meta|with-meta|ns|in-ns|create-ns|import|intern|refer|alias|namespace|resolve|ref|deref|refset|new|set!|memfn|to-array|into-array|aset|gen-class|reduce|map|filter|find|nil?|empty?|hash-map|hash-set|vec|vector|seq|flatten|reverse|assoc|dissoc|list|list?|disj|get|union|difference|intersection|extend|extend-type|extend-protocol|prn)\b/,a],
["typ",/^:[\dA-Za-z-]+/]]),["clj"]);
2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-css.js

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

1 change: 1 addition & 0 deletions demos/grids/google-code-prettify/lang-go.js

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

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-hs.js

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

3 changes: 3 additions & 0 deletions demos/grids/google-code-prettify/lang-lisp.js

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

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-lua.js

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

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-ml.js

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

4 changes: 4 additions & 0 deletions demos/grids/google-code-prettify/lang-n.js

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

1 change: 1 addition & 0 deletions demos/grids/google-code-prettify/lang-proto.js

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

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-scala.js

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

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-sql.js

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

1 change: 1 addition & 0 deletions demos/grids/google-code-prettify/lang-tex.js

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

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-vb.js

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

3 changes: 3 additions & 0 deletions demos/grids/google-code-prettify/lang-vhdl.js

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

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-wiki.js

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

3 changes: 3 additions & 0 deletions demos/grids/google-code-prettify/lang-xq.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions demos/grids/google-code-prettify/lang-yaml.js

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

112 changes: 112 additions & 0 deletions demos/grids/google-code-prettify/prettify.css
@@ -0,0 +1,112 @@
.pln
{
color: #000;
}
@media screen
{
.str
{
color: #3F7D3F;
}
.kwd
{
color: #226B8E; /*from 008*/
}
.com
{
color: #800;
}
.typ
{
color: #606;
}
.lit
{
color: #066;
}
.pun,.opn,.clo
{
color: #660;
}
.tag
{
color: #226B8E;
}
.atn
{
color: #606; /*from 606*/
}
.atv
{
color: #3F7D3F; /*from 3F7D3F*/
}
.dec,.var
{
color: #606;
}
.fun
{
color: red;
}
}
@media print,projection
{
.str
{
color: #060;
}
.kwd
{
color: #006;
font-weight: bold;
}
.com
{
color: #600;
font-style: italic;
}
.typ
{
color: #404;
font-weight: bold;
}
.lit
{
color: #044;
}
.pun,.opn,.clo
{
color: #440;
}
.tag
{
color: #006;
font-weight: bold;
}
.atn
{
color: #404;
}
.atv
{
color: #060;
}
}
pre.prettyprint
{
background-color: #f5f5f5;
border: 1px solid #ddd;
border-radius: 3px;
box-shadow: 40px 0 0 #FBFBFC inset, 41px 0 0 #eee inset;
color: #707070;
font-size: 95%;
padding: 8px;
}
ol.linenums
{
margin: 0 0 0 32px !important;
}
ol.linenums li {
padding-left: 10px;
text-shadow: 0 1px 0 #fff;
}

0 comments on commit 9a72d04

Please sign in to comment.