Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:mde/geddy

  • Loading branch information...
commit bc1eae9ab11806df0bf99d0de117c76d16e880a7 2 parents 4884fe9 + 0f52157
mde authored
Showing with 3,473 additions and 2,535 deletions.
  1. +0 −73 deps/qs/History.md
  2. +0 −5 deps/qs/Makefile
  3. +0 −54 deps/qs/Readme.md
  4. +0 −17 deps/qs/benchmark.js
  5. +0 −51 deps/qs/examples.js
  6. +0 −2  deps/qs/test/mocha.opts
  7. +0 −167 deps/qs/test/parse.js
  8. +0 −103 deps/qs/test/stringify.js
  9. +1 −1  docs/3-controllers.md
  10. +3 −0  docs/8-deployment.md
  11. +567 −298 examples/related_models/public/css/bootstrap.css
  12. +2 −2 examples/related_models/public/css/bootstrap.min.css
  13. +56 −8 examples/related_models/public/css/bootstrap.responsive.css
  14. +2 −2 examples/related_models/public/css/bootstrap.responsive.min.css
  15. BIN  examples/related_models/public/img/glyphicons-halflings-white.png
  16. BIN  examples/related_models/public/img/glyphicons-halflings.png
  17. +107 −109 examples/related_models/public/js/bootstrap.js
  18. +1 −1  examples/related_models/public/js/bootstrap.min.js
  19. +2 −2 examples/related_models/public/js/jquery.min.js
  20. +567 −298 examples/socket_io/public/css/bootstrap.css
  21. +2 −2 examples/socket_io/public/css/bootstrap.min.css
  22. +56 −8 examples/socket_io/public/css/bootstrap.responsive.css
  23. +2 −2 examples/socket_io/public/css/bootstrap.responsive.min.css
  24. BIN  examples/socket_io/public/img/glyphicons-halflings-white.png
  25. BIN  examples/socket_io/public/img/glyphicons-halflings.png
  26. +107 −109 examples/socket_io/public/js/bootstrap.js
  27. +1 −1  examples/socket_io/public/js/bootstrap.min.js
  28. +2 −2 examples/socket_io/public/js/jquery.min.js
  29. +567 −298 examples/todo_app/public/css/bootstrap.css
  30. +2 −2 examples/todo_app/public/css/bootstrap.min.css
  31. +56 −8 examples/todo_app/public/css/bootstrap.responsive.css
  32. +2 −2 examples/todo_app/public/css/bootstrap.responsive.min.css
  33. BIN  examples/todo_app/public/img/glyphicons-halflings-white.png
  34. BIN  examples/todo_app/public/img/glyphicons-halflings.png
  35. +107 −109 examples/todo_app/public/js/bootstrap.js
  36. +1 −1  examples/todo_app/public/js/bootstrap.min.js
  37. +2 −2 examples/todo_app/public/js/jquery.min.js
  38. +567 −298 examples/todo_app_coffee/public/css/bootstrap.css
  39. +2 −2 examples/todo_app_coffee/public/css/bootstrap.min.css
  40. +56 −8 examples/todo_app_coffee/public/css/bootstrap.responsive.css
  41. +2 −2 examples/todo_app_coffee/public/css/bootstrap.responsive.min.css
  42. BIN  examples/todo_app_coffee/public/img/glyphicons-halflings-white.png
  43. BIN  examples/todo_app_coffee/public/img/glyphicons-halflings.png
  44. +107 −109 examples/todo_app_coffee/public/js/bootstrap.js
  45. +1 −1  examples/todo_app_coffee/public/js/bootstrap.min.js
  46. +2 −2 examples/todo_app_coffee/public/js/jquery.min.js
  47. +1 −1  templates/Jakefile
  48. +377 −258 templates/base/public/css/bootstrap.css
  49. +2 −2 templates/base/public/css/bootstrap.min.css
  50. +33 −3 templates/base/public/css/bootstrap.responsive.css
  51. +2 −2 templates/base/public/css/bootstrap.responsive.min.css
  52. +105 −107 templates/base/public/js/bootstrap.js
  53. +1 −1  templates/base/public/js/bootstrap.min.js
73 deps/qs/History.md
View
@@ -1,73 +0,0 @@
-
-0.4.2 / 2012-02-08
-==================
-
- * Fixed: ensure objects are created when appropriate not arrays [aheckmann]
-
-0.4.1 / 2012-01-26
-==================
-
- * Fixed stringify()ing numbers. Closes #23
-
-0.4.0 / 2011-11-21
-==================
-
- * Allow parsing of an existing object (for `bodyParser()`) [jackyz]
- * Replaced expresso with mocha
-
-0.3.2 / 2011-11-08
-==================
-
- * Fixed global variable leak
-
-0.3.1 / 2011-08-17
-==================
-
- * Added `try/catch` around malformed uri components
- * Add test coverage for Array native method bleed-though
-
-0.3.0 / 2011-07-19
-==================
-
- * Allow `array[index]` and `object[property]` syntaxes [Aria Stewart]
-
-0.2.0 / 2011-06-29
-==================
-
- * Added `qs.stringify()` [Cory Forsyth]
-
-0.1.0 / 2011-04-13
-==================
-
- * Added jQuery-ish array support
-
-0.0.7 / 2011-03-13
-==================
-
- * Fixed; handle empty string and `== null` in `qs.parse()` [dmit]
- allows for convenient `qs.parse(url.parse(str).query)`
-
-0.0.6 / 2011-02-14
-==================
-
- * Fixed; support for implicit arrays
-
-0.0.4 / 2011-02-09
-==================
-
- * Fixed `+` as a space
-
-0.0.3 / 2011-02-08
-==================
-
- * Fixed case when right-hand value contains "]"
-
-0.0.2 / 2011-02-07
-==================
-
- * Fixed "=" presence in key
-
-0.0.1 / 2011-02-07
-==================
-
- * Initial release
5 deps/qs/Makefile
View
@@ -1,5 +0,0 @@
-
-test:
- @./node_modules/.bin/mocha
-
-.PHONY: test
54 deps/qs/Readme.md
View
@@ -1,54 +0,0 @@
-# node-querystring
-
- query string parser for node supporting nesting, as it was removed from `0.3.x`, so this library provides the previous and commonly desired behaviour (and twice as fast). Used by [express](http://expressjs.com), [connect](http://senchalabs.github.com/connect) and others.
-
-## Installation
-
- $ npm install qs
-
-## Examples
-
-```js
-var qs = require('qs');
-
-qs.parse('user[name][first]=Tobi&user[email]=tobi@learnboost.com');
-// => { user: { name: { first: 'Tobi' }, email: 'tobi@learnboost.com' } }
-
-qs.stringify({ user: { name: 'Tobi', email: 'tobi@learnboost.com' }})
-// => user[name]=Tobi&user[email]=tobi%40learnboost.com
-```
-
-## Testing
-
-Install dev dependencies:
-
- $ npm install -d
-
-and execute:
-
- $ make test
-
-## License
-
-(The MIT License)
-
-Copyright (c) 2010 TJ Holowaychuk <tj@vision-media.ca>
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
17 deps/qs/benchmark.js
View
@@ -1,17 +0,0 @@
-
-var qs = require('./');
-
-var times = 100000
- , start = new Date
- , n = times;
-
-console.log('times: %d', times);
-
-while (n--) qs.parse('foo=bar');
-console.log('simple: %dms', new Date - start);
-
-var start = new Date
- , n = times;
-
-while (n--) qs.parse('user[name][first]=tj&user[name][last]=holowaychuk');
-console.log('nested: %dms', new Date - start);
51 deps/qs/examples.js
View
@@ -1,51 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var qs = require('./');
-
-var obj = qs.parse('foo');
-console.log(obj)
-
-var obj = qs.parse('foo=bar=baz');
-console.log(obj)
-
-var obj = qs.parse('users[]');
-console.log(obj)
-
-var obj = qs.parse('name=tj&email=tj@vision-media.ca');
-console.log(obj)
-
-var obj = qs.parse('users[]=tj&users[]=tobi&users[]=jane');
-console.log(obj)
-
-var obj = qs.parse('user[name][first]=tj&user[name][last]=holowaychuk');
-console.log(obj)
-
-var obj = qs.parse('users[][name][first]=tj&users[][name][last]=holowaychuk');
-console.log(obj)
-
-var obj = qs.parse('a=a&a=b&a=c');
-console.log(obj)
-
-var obj = qs.parse('user[tj]=tj&user[tj]=TJ');
-console.log(obj)
-
-var obj = qs.parse('user[names]=tj&user[names]=TJ&user[names]=Tyler');
-console.log(obj)
-
-var obj = qs.parse('user[name][first]=tj&user[name][first]=TJ');
-console.log(obj)
-
-var obj = qs.parse('user[0]=tj&user[1]=TJ');
-console.log(obj)
-
-var obj = qs.parse('user[0]=tj&user[]=TJ');
-console.log(obj)
-
-var obj = qs.parse('user[0]=tj&user[foo]=TJ');
-console.log(obj)
-
-var str = qs.stringify({ user: { name: 'Tobi', email: 'tobi@learnboost.com' }});
-console.log(str);
2  deps/qs/test/mocha.opts
View
@@ -1,2 +0,0 @@
---require should
---ui exports
167 deps/qs/test/parse.js
View
@@ -1,167 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var qs = require('../');
-
-module.exports = {
- 'test basics': function(){
- qs.parse('0=foo').should.eql({ '0': 'foo' });
-
- qs.parse('foo=c++')
- .should.eql({ foo: 'c ' });
-
- qs.parse('a[>=]=23')
- .should.eql({ a: { '>=': '23' }});
-
- qs.parse('a[<=>]==23')
- .should.eql({ a: { '<=>': '=23' }});
-
- qs.parse('a[==]=23')
- .should.eql({ a: { '==': '23' }});
-
- qs.parse('foo')
- .should.eql({ foo: '' });
-
- qs.parse('foo=bar')
- .should.eql({ foo: 'bar' });
-
- qs.parse('foo%3Dbar=baz')
- .should.eql({ foo: 'bar=baz' });
-
- qs.parse(' foo = bar = baz ')
- .should.eql({ ' foo ': ' bar = baz ' });
-
- qs.parse('foo=bar=baz')
- .should.eql({ foo: 'bar=baz' });
-
- qs.parse('foo=bar&bar=baz')
- .should.eql({ foo: 'bar', bar: 'baz' });
-
- qs.parse('foo=bar&baz')
- .should.eql({ foo: 'bar', baz: '' });
-
- qs.parse('cht=p3&chd=t:60,40&chs=250x100&chl=Hello|World')
- .should.eql({
- cht: 'p3'
- , chd: 't:60,40'
- , chs: '250x100'
- , chl: 'Hello|World'
- });
- },
-
- 'test nesting': function(){
- qs.parse('ops[>=]=25')
- .should.eql({ ops: { '>=': '25' }});
-
- qs.parse('user[name]=tj')
- .should.eql({ user: { name: 'tj' }});
-
- qs.parse('user[name][first]=tj&user[name][last]=holowaychuk')
- .should.eql({ user: { name: { first: 'tj', last: 'holowaychuk' }}});
- },
-
- 'test escaping': function(){
- qs.parse('foo=foo%20bar')
- .should.eql({ foo: 'foo bar' });
- },
-
- 'test arrays': function(){
- qs.parse('images[]')
- .should.eql({ images: [] });
-
- qs.parse('user[]=tj')
- .should.eql({ user: ['tj'] });
-
- qs.parse('user[]=tj&user[]=tobi&user[]=jane')
- .should.eql({ user: ['tj', 'tobi', 'jane'] });
-
- qs.parse('user[names][]=tj&user[names][]=tyler')
- .should.eql({ user: { names: ['tj', 'tyler'] }});
-
- qs.parse('user[names][]=tj&user[names][]=tyler&user[email]=tj@vision-media.ca')
- .should.eql({ user: { names: ['tj', 'tyler'], email: 'tj@vision-media.ca' }});
-
- qs.parse('items=a&items=b')
- .should.eql({ items: ['a', 'b'] });
-
- qs.parse('user[names]=tj&user[names]=holowaychuk&user[names]=TJ')
- .should.eql({ user: { names: ['tj', 'holowaychuk', 'TJ'] }});
-
- qs.parse('user[name][first]=tj&user[name][first]=TJ')
- .should.eql({ user: { name: { first: ['tj', 'TJ'] }}});
-
- var o = qs.parse('existing[fcbaebfecc][name][last]=tj')
- o.should.eql({ existing: { 'fcbaebfecc': { name: { last: 'tj' }}}})
- Array.isArray(o.existing).should.be.false;
- },
-
- 'test right-hand brackets': function(){
- qs.parse('pets=["tobi"]')
- .should.eql({ pets: '["tobi"]' });
-
- qs.parse('operators=[">=", "<="]')
- .should.eql({ operators: '[">=", "<="]' });
-
- qs.parse('op[>=]=[1,2,3]')
- .should.eql({ op: { '>=': '[1,2,3]' }});
-
- qs.parse('op[>=]=[1,2,3]&op[=]=[[[[1]]]]')
- .should.eql({ op: { '>=': '[1,2,3]', '=': '[[[[1]]]]' }});
- },
-
- 'test duplicates': function(){
- qs.parse('items=bar&items=baz&items=raz')
- .should.eql({ items: ['bar', 'baz', 'raz'] });
- },
-
- 'test empty': function(){
- qs.parse('').should.eql({});
- qs.parse(undefined).should.eql({});
- qs.parse(null).should.eql({});
- },
-
- 'test arrays with indexes': function(){
- qs.parse('foo[0]=bar&foo[1]=baz').should.eql({ foo: ['bar', 'baz'] });
- qs.parse('foo[1]=bar&foo[0]=baz').should.eql({ foo: ['baz', 'bar'] });
- qs.parse('foo[base64]=RAWR').should.eql({ foo: { base64: 'RAWR' }});
- qs.parse('foo[64base]=RAWR').should.eql({ foo: { '64base': 'RAWR' }});
- },
-
- 'test arrays becoming objects': function(){
- qs.parse('foo[0]=bar&foo[bad]=baz').should.eql({ foo: { 0: "bar", bad: "baz" }});
- qs.parse('foo[bad]=baz&foo[0]=bar').should.eql({ foo: { 0: "bar", bad: "baz" }});
- },
-
- 'test bleed-through of Array native properties/methods': function(){
- Array.prototype.protoProperty = true;
- Array.prototype.protoFunction = function () {};
- qs.parse('foo=bar').should.eql({ foo: 'bar' });
- },
-
- 'test malformed uri': function(){
- qs.parse('{%:%}').should.eql({ '{%:%}': '' });
- qs.parse('foo=%:%}').should.eql({ 'foo': '%:%}' });
- },
-
- 'test semi-parsed': function(){
- qs.parse({ 'user[name]': 'tobi' })
- .should.eql({ user: { name: 'tobi' }});
-
- qs.parse({ 'user[name]': 'tobi', 'user[email][main]': 'tobi@lb.com' })
- .should.eql({ user: { name: 'tobi', email: { main: 'tobi@lb.com' } }});
- }
-
- // 'test complex': function(){
- // qs.parse('users[][name][first]=tj&users[foo]=bar')
- // .should.eql({
- // users: [ { name: 'tj' }, { name: 'tobi' }, { foo: 'bar' }]
- // });
- //
- // qs.parse('users[][name][first]=tj&users[][name][first]=tobi')
- // .should.eql({
- // users: [ { name: 'tj' }, { name: 'tobi' }]
- // });
- // }
-};
103 deps/qs/test/stringify.js
View
@@ -1,103 +0,0 @@
-
-/**
- * Module dependencies.
- */
-
-var qs = require('../')
- , should = require('should')
- , str_identities = {
- 'basics': [
- { str: 'foo=bar', obj: {'foo' : 'bar'}},
- { str: 'foo=%22bar%22', obj: {'foo' : '\"bar\"'}},
- { str: 'foo=', obj: {'foo': ''}},
- { str: 'foo=1&bar=2', obj: {'foo' : '1', 'bar' : '2'}},
- { str: 'my%20weird%20field=q1!2%22\'w%245%267%2Fz8)%3F', obj: {'my weird field': "q1!2\"'w$5&7/z8)?"}},
- { str: 'foo%3Dbaz=bar', obj: {'foo=baz': 'bar'}},
- { str: 'foo=bar&bar=baz', obj: {foo: 'bar', bar: 'baz'}}
- ],
- 'escaping': [
- { str: 'foo=foo%20bar', obj: {foo: 'foo bar'}},
- { str: 'cht=p3&chd=t%3A60%2C40&chs=250x100&chl=Hello%7CWorld', obj: {
- cht: 'p3'
- , chd: 't:60,40'
- , chs: '250x100'
- , chl: 'Hello|World'
- }}
- ],
- 'nested': [
- { str: 'foo[]=bar&foo[]=quux', obj: {'foo' : ['bar', 'quux']}},
- { str: 'foo[]=bar', obj: {foo: ['bar']}},
- { str: 'foo[]=1&foo[]=2', obj: {'foo' : ['1', '2']}},
- { str: 'foo=bar&baz[]=1&baz[]=2&baz[]=3', obj: {'foo' : 'bar', 'baz' : ['1', '2', '3']}},
- { str: 'foo[]=bar&baz[]=1&baz[]=2&baz[]=3', obj: {'foo' : ['bar'], 'baz' : ['1', '2', '3']}},
- { str: 'x[y][z]=1', obj: {'x' : {'y' : {'z' : '1'}}}},
- { str: 'x[y][z][]=1', obj: {'x' : {'y' : {'z' : ['1']}}}},
- { str: 'x[y][z]=2', obj: {'x' : {'y' : {'z' : '2'}}}},
- { str: 'x[y][z][]=1&x[y][z][]=2', obj: {'x' : {'y' : {'z' : ['1', '2']}}}},
- { str: 'x[y][][z]=1', obj: {'x' : {'y' : [{'z' : '1'}]}}},
- { str: 'x[y][][z][]=1', obj: {'x' : {'y' : [{'z' : ['1']}]}}},
- { str: 'x[y][][z]=1&x[y][][w]=2', obj: {'x' : {'y' : [{'z' : '1', 'w' : '2'}]}}},
- { str: 'x[y][][v][w]=1', obj: {'x' : {'y' : [{'v' : {'w' : '1'}}]}}},
- { str: 'x[y][][z]=1&x[y][][v][w]=2', obj: {'x' : {'y' : [{'z' : '1', 'v' : {'w' : '2'}}]}}},
- { str: 'x[y][][z]=1&x[y][][z]=2', obj: {'x' : {'y' : [{'z' : '1'}, {'z' : '2'}]}}},
- { str: 'x[y][][z]=1&x[y][][w]=a&x[y][][z]=2&x[y][][w]=3', obj: {'x' : {'y' : [{'z' : '1', 'w' : 'a'}, {'z' : '2', 'w' : '3'}]}}},
- { str: 'user[name][first]=tj&user[name][last]=holowaychuk', obj: { user: { name: { first: 'tj', last: 'holowaychuk' }}}}
- ],
- 'errors': [
- { obj: 'foo=bar', message: 'stringify expects an object' },
- { obj: ['foo', 'bar'], message: 'stringify expects an object' }
- ],
- 'numbers': [
- { str: 'limit[]=1&limit[]=2&limit[]=3', obj: { limit: [1, 2, '3'] }},
- { str: 'limit=1', obj: { limit: 1 }}
- ]
- };
-
-
-// Assert error
-function err(fn, msg){
- var err;
- try {
- fn();
- } catch (e) {
- should.equal(e.message, msg);
- return;
- }
- throw new Error('no exception thrown, expected "' + msg + '"');
-}
-
-function test(type) {
- var str, obj;
- for (var i = 0; i < str_identities[type].length; i++) {
- str = str_identities[type][i].str;
- obj = str_identities[type][i].obj;
- qs.stringify(obj).should.eql(str);
- }
-}
-
-module.exports = {
- 'test basics': function() {
- test('basics');
- },
-
- 'test escaping': function() {
- test('escaping');
- },
-
- 'test nested': function() {
- test('nested');
- },
-
- 'test numbers': function(){
- test('numbers');
- },
-
- 'test errors': function() {
- var obj, message;
- for (var i = 0; i < str_identities['errors'].length; i++) {
- message = str_identities['errors'][i].message;
- obj = str_identities['errors'][i].obj;
- err(function(){ qs.stringify(obj) }, message);
- }
- }
-};
2  docs/3-controllers.md
View
@@ -146,7 +146,7 @@ Respond to a request with an appropriate HTTP error-code. If a status-code is se
##### err
- `statusCode [number]` the code to send to the client
-- `msg [string]` the message to send to the client
+- `message [string]` the message to send to the client
##### examples
```
3  docs/8-deployment.md
View
@@ -8,6 +8,9 @@ We use the following example as a reference. There will be some differences with
3. Create a Nodejitsu account(Not required: we'll go over creating one from the CLI)
4. Have an app ready to be deployed
+##### Notes
+* Nodejitsu reads the deployed .gitignore file, so if you have the config/secrets.json file in there(you should), then you'll encounter errors about needing to do `geddy secret` if you need the secrets for sessions, etc. To circumvent this, create a .npmignore file and include all the contents from the .gitignore _except_ the config/secrets.json line. Nodejitsu ignores the .gitignore file only if a .npmignore file is included as well.
+
If you haven't already you'll need to sign up and log in to Nodejitsu which you can do from the jitsu executable.
```
jitsu signup
865 examples/related_models/public/css/bootstrap.css
View
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v2.1.0
+ * Bootstrap v2.2.1
*
* Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -67,6 +67,7 @@ sub {
}
img {
+ width: auto\9;
height: auto;
max-width: 100%;
vertical-align: middle;
@@ -74,7 +75,8 @@ img {
-ms-interpolation-mode: bicubic;
}
-#map_canvas img {
+#map_canvas img,
+.google-maps img {
max-width: none;
}
@@ -100,7 +102,7 @@ input::-moz-focus-inner {
}
button,
-input[type="button"],
+html input[type="button"],
input[type="reset"],
input[type="submit"] {
cursor: pointer;
@@ -215,6 +217,7 @@ a:hover {
[class*="span"] {
float: left;
+ min-height: 1px;
margin-left: 20px;
}
@@ -353,6 +356,10 @@ a:hover {
margin-left: 0;
}
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+ margin-left: 2.127659574468085%;
+}
+
.row-fluid .span12 {
width: 100%;
*width: 99.94680851063829%;
@@ -583,7 +590,7 @@ p {
.lead {
margin-bottom: 20px;
- font-size: 20px;
+ font-size: 21px;
font-weight: 200;
line-height: 30px;
}
@@ -608,6 +615,38 @@ cite {
color: #999999;
}
+.text-warning {
+ color: #c09853;
+}
+
+a.text-warning:hover {
+ color: #a47e3c;
+}
+
+.text-error {
+ color: #b94a48;
+}
+
+a.text-error:hover {
+ color: #953b39;
+}
+
+.text-info {
+ color: #3a87ad;
+}
+
+a.text-info:hover {
+ color: #2d6987;
+}
+
+.text-success {
+ color: #468847;
+}
+
+a.text-success:hover {
+ color: #356635;
+}
+
h1,
h2,
h3,
@@ -617,7 +656,7 @@ h6 {
margin: 10px 0;
font-family: inherit;
font-weight: bold;
- line-height: 1;
+ line-height: 20px;
color: inherit;
text-rendering: optimizelegibility;
}
@@ -633,42 +672,42 @@ h6 small {
color: #999999;
}
-h1 {
- font-size: 36px;
+h1,
+h2,
+h3 {
line-height: 40px;
}
+h1 {
+ font-size: 38.5px;
+}
+
h2 {
- font-size: 30px;
- line-height: 40px;
+ font-size: 31.5px;
}
h3 {
- font-size: 24px;
- line-height: 40px;
+ font-size: 24.5px;
}
h4 {
- font-size: 18px;
- line-height: 20px;
+ font-size: 17.5px;
}
h5 {
font-size: 14px;
- line-height: 20px;
}
h6 {
- font-size: 12px;
- line-height: 20px;
+ font-size: 11.9px;
}
h1 small {
- font-size: 24px;
+ font-size: 24.5px;
}
h2 small {
- font-size: 18px;
+ font-size: 17.5px;
}
h3 small {
@@ -725,9 +764,24 @@ dd {
margin-left: 10px;
}
+.dl-horizontal {
+ *zoom: 1;
+}
+
+.dl-horizontal:before,
+.dl-horizontal:after {
+ display: table;
+ line-height: 0;
+ content: "";
+}
+
+.dl-horizontal:after {
+ clear: both;
+}
+
.dl-horizontal dt {
float: left;
- width: 120px;
+ width: 160px;
overflow: hidden;
clear: left;
text-align: right;
@@ -736,7 +790,7 @@ dd {
}
.dl-horizontal dd {
- margin-left: 130px;
+ margin-left: 180px;
}
hr {
@@ -746,7 +800,8 @@ hr {
border-bottom: 1px solid #ffffff;
}
-abbr[title] {
+abbr[title],
+abbr[data-original-title] {
cursor: help;
border-bottom: 1px dotted #999999;
}
@@ -935,18 +990,20 @@ input[type="color"],
display: inline-block;
height: 20px;
padding: 4px 6px;
- margin-bottom: 9px;
+ margin-bottom: 10px;
font-size: 14px;
line-height: 20px;
color: #555555;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ vertical-align: middle;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
}
input,
-textarea {
- width: 210px;
+textarea,
+.uneditable-input {
+ width: 206px;
}
textarea {
@@ -1039,7 +1096,7 @@ input[type="file"] {
select {
width: 220px;
background-color: #ffffff;
- border: 1px solid #bbb;
+ border: 1px solid #cccccc;
}
select[multiple],
@@ -1094,14 +1151,14 @@ textarea::-webkit-input-placeholder {
.radio,
.checkbox {
- min-height: 18px;
- padding-left: 18px;
+ min-height: 20px;
+ padding-left: 20px;
}
.radio input[type="radio"],
.checkbox input[type="checkbox"] {
float: left;
- margin-left: -18px;
+ margin-left: -20px;
}
.controls > .radio:first-child,
@@ -1268,10 +1325,16 @@ textarea.span1,
clear: both;
}
-.controls-row [class*="span"] {
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
float: left;
}
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+ padding-top: 5px;
+}
+
input[disabled],
select[disabled],
textarea[disabled],
@@ -1301,14 +1364,17 @@ input[type="checkbox"][readonly] {
.control-group.warning select,
.control-group.warning textarea {
color: #c09853;
+}
+
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
border-color: #c09853;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
-.control-group.warning .checkbox:focus,
-.control-group.warning .radio:focus,
.control-group.warning input:focus,
.control-group.warning select:focus,
.control-group.warning textarea:focus {
@@ -1337,14 +1403,17 @@ input[type="checkbox"][readonly] {
.control-group.error select,
.control-group.error textarea {
color: #b94a48;
+}
+
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
border-color: #b94a48;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
-.control-group.error .checkbox:focus,
-.control-group.error .radio:focus,
.control-group.error input:focus,
.control-group.error select:focus,
.control-group.error textarea:focus {
@@ -1373,14 +1442,17 @@ input[type="checkbox"][readonly] {
.control-group.success select,
.control-group.success textarea {
color: #468847;
+}
+
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
border-color: #468847;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
}
-.control-group.success .checkbox:focus,
-.control-group.success .radio:focus,
.control-group.success input:focus,
.control-group.success select:focus,
.control-group.success textarea:focus {
@@ -1397,6 +1469,45 @@ input[type="checkbox"][readonly] {
border-color: #468847;
}
+.control-group.info > label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+ color: #3a87ad;
+}
+
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+ color: #3a87ad;
+}
+
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+ border-color: #3a87ad;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+ border-color: #2d6987;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+ -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+ color: #3a87ad;
+ background-color: #d9edf7;
+ border-color: #3a87ad;
+}
+
input:focus:required:invalid,
textarea:focus:required:invalid,
select:focus:required:invalid {
@@ -1463,15 +1574,25 @@ select:focus:required:invalid:focus {
.input-append select,
.input-prepend select,
.input-append .uneditable-input,
+.input-prepend .uneditable-input,
+.input-append .dropdown-menu,
+.input-prepend .dropdown-menu {
+ font-size: 14px;
+}
+
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
.input-prepend .uneditable-input {
position: relative;
margin-bottom: 0;
*margin-left: 0;
- font-size: 14px;
vertical-align: top;
- -webkit-border-radius: 0 3px 3px 0;
- -moz-border-radius: 0 3px 3px 0;
- border-radius: 0 3px 3px 0;
+ -webkit-border-radius: 0 4px 4px 0;
+ -moz-border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
}
.input-append input:focus,
@@ -1503,7 +1624,6 @@ select:focus:required:invalid:focus {
.input-prepend .add-on,
.input-append .btn,
.input-prepend .btn {
- margin-left: -1px;
vertical-align: top;
-webkit-border-radius: 0;
-moz-border-radius: 0;
@@ -1523,24 +1643,38 @@ select:focus:required:invalid:focus {
.input-prepend .add-on:first-child,
.input-prepend .btn:first-child {
- -webkit-border-radius: 3px 0 0 3px;
- -moz-border-radius: 3px 0 0 3px;
- border-radius: 3px 0 0 3px;
+ -webkit-border-radius: 4px 0 0 4px;
+ -moz-border-radius: 4px 0 0 4px;
+ border-radius: 4px 0 0 4px;
}
.input-append input,
.input-append select,
.input-append .uneditable-input {
- -webkit-border-radius: 3px 0 0 3px;
- -moz-border-radius: 3px 0 0 3px;
- border-radius: 3px 0 0 3px;
+ -webkit-border-radius: 4px 0 0 4px;
+ -moz-border-radius: 4px 0 0 4px;
+ border-radius: 4px 0 0 4px;
+}
+
+.input-append input + .btn-group .btn,
+.input-append select + .btn-group .btn,
+.input-append .uneditable-input + .btn-group .btn {
+ -webkit-border-radius: 0 4px 4px 0;
+ -moz-border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
+}
+
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+ margin-left: -1px;
}
.input-append .add-on:last-child,
.input-append .btn:last-child {
- -webkit-border-radius: 0 3px 3px 0;
- -moz-border-radius: 0 3px 3px 0;
- border-radius: 0 3px 3px 0;
+ -webkit-border-radius: 0 4px 4px 0;
+ -moz-border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
}
.input-prepend.input-append input,
@@ -1551,20 +1685,32 @@ select:focus:required:invalid:focus {
border-radius: 0;
}
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+ -webkit-border-radius: 0 4px 4px 0;
+ -moz-border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
+}
+
.input-prepend.input-append .add-on:first-child,
.input-prepend.input-append .btn:first-child {
margin-right: -1px;
- -webkit-border-radius: 3px 0 0 3px;
- -moz-border-radius: 3px 0 0 3px;
- border-radius: 3px 0 0 3px;
+ -webkit-border-radius: 4px 0 0 4px;
+ -moz-border-radius: 4px 0 0 4px;
+ border-radius: 4px 0 0 4px;
}
.input-prepend.input-append .add-on:last-child,
.input-prepend.input-append .btn:last-child {
margin-left: -1px;
- -webkit-border-radius: 0 3px 3px 0;
- -moz-border-radius: 0 3px 3px 0;
- border-radius: 0 3px 3px 0;
+ -webkit-border-radius: 0 4px 4px 0;
+ -moz-border-radius: 0 4px 4px 0;
+ border-radius: 0 4px 4px 0;
+}
+
+.input-prepend.input-append .btn-group:first-child {
+ margin-left: 0;
}
input.search-query {
@@ -1706,7 +1852,7 @@ legend + .control-group {
.form-horizontal .control-label {
float: left;
- width: 140px;
+ width: 160px;
padding-top: 5px;
text-align: right;
}
@@ -1714,21 +1860,26 @@ legend + .control-group {
.form-horizontal .controls {
*display: inline-block;
*padding-left: 20px;
- margin-left: 160px;
+ margin-left: 180px;
*margin-left: 0;
}
.form-horizontal .controls:first-child {
- *padding-left: 160px;
+ *padding-left: 180px;
}
.form-horizontal .help-block {
- margin-top: 10px;
margin-bottom: 0;
}
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block {
+ margin-top: 10px;
+}
+
.form-horizontal .form-actions {
- padding-left: 160px;
+ padding-left: 180px;
}
table {
@@ -1853,7 +2004,7 @@ table {
.table-bordered colgroup + tbody tr:first-child td:last-child {
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
- -moz-border-right-topleft: 4px;
+ -moz-border-radius-topright: 4px;
}
.table-striped tbody tr:nth-child(odd) td,
@@ -1866,167 +2017,129 @@ table {
background-color: #f5f5f5;
}
-table [class*=span],
-.row-fluid table [class*=span] {
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
display: table-cell;
float: none;
margin-left: 0;
}
-table .span1 {
+.table td.span1,
+.table th.span1 {
float: none;
width: 44px;
margin-left: 0;
}
-table .span2 {
+.table td.span2,
+.table th.span2 {
float: none;
width: 124px;
margin-left: 0;
}
-table .span3 {
+.table td.span3,
+.table th.span3 {
float: none;
width: 204px;
margin-left: 0;
}
-table .span4 {
+.table td.span4,
+.table th.span4 {
float: none;
width: 284px;
margin-left: 0;
}
-table .span5 {
+.table td.span5,
+.table th.span5 {
float: none;
width: 364px;
margin-left: 0;
}
-table .span6 {
+.table td.span6,
+.table th.span6 {
float: none;
width: 444px;
margin-left: 0;
}
-table .span7 {
+.table td.span7,
+.table th.span7 {
float: none;
width: 524px;
margin-left: 0;
}
-table .span8 {
+.table td.span8,
+.table th.span8 {
float: none;
width: 604px;
margin-left: 0;
}
-table .span9 {
+.table td.span9,
+.table th.span9 {
float: none;
width: 684px;
margin-left: 0;
}
-table .span10 {
+.table td.span10,
+.table th.span10 {
float: none;
width: 764px;
margin-left: 0;
}
-table .span11 {
+.table td.span11,
+.table th.span11 {
float: none;
width: 844px;
margin-left: 0;
}
-table .span12 {
+.table td.span12,
+.table th.span12 {
float: none;
width: 924px;
margin-left: 0;
}
-table .span13 {
- float: none;
- width: 1004px;
- margin-left: 0;
-}
-
-table .span14 {
- float: none;
- width: 1084px;
- margin-left: 0;
-}
-
-table .span15 {
- float: none;
- width: 1164px;
- margin-left: 0;
-}
-
-table .span16 {
- float: none;
- width: 1244px;
- margin-left: 0;
-}
-
-table .span17 {
- float: none;
- width: 1324px;
- margin-left: 0;
-}
-
-table .span18 {
- float: none;
- width: 1404px;
- margin-left: 0;
-}
-
-table .span19 {
- float: none;
- width: 1484px;
- margin-left: 0;
-}
-
-table .span20 {
- float: none;
- width: 1564px;
- margin-left: 0;
+.table tbody tr.success td {
+ background-color: #dff0d8;
}
-table .span21 {
- float: none;
- width: 1644px;
- margin-left: 0;
+.table tbody tr.error td {
+ background-color: #f2dede;
}
-table .span22 {
- float: none;
- width: 1724px;
- margin-left: 0;
+.table tbody tr.warning td {
+ background-color: #fcf8e3;
}
-table .span23 {
- float: none;
- width: 1804px;
- margin-left: 0;
+.table tbody tr.info td {
+ background-color: #d9edf7;
}
-table .span24 {
- float: none;
- width: 1884px;
- margin-left: 0;
+.table-hover tbody tr.success:hover td {
+ background-color: #d0e9c6;
}
-.table tbody tr.success td {
- background-color: #dff0d8;
+.table-hover tbody tr.error:hover td {
+ background-color: #ebcccc;
}
-.table tbody tr.error td {
- background-color: #f2dede;
+.table-hover tbody tr.warning:hover td {
+ background-color: #faf2cc;
}
-.table tbody tr.info td {
- background-color: #d9edf7;
+.table-hover tbody tr.info:hover td {
+ background-color: #c4e3f3;
}
[class^="icon-"],
@@ -2046,12 +2159,18 @@ table .span24 {
/* White icons with optional class, or on hover/active states of certain elements */
.icon-white,
-.nav > .active > a > [class^="icon-"],
-.nav > .active > a > [class*=" icon-"],
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
.dropdown-menu > li > a:hover > [class^="icon-"],
.dropdown-menu > li > a:hover > [class*=" icon-"],
.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"] {
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"] {
background-image: url("../img/glyphicons-halflings-white.png");
}
@@ -2689,7 +2808,7 @@ table .span24 {
border-bottom: 1px solid #ffffff;
}
-.dropdown-menu a {
+.dropdown-menu li > a {
display: block;
padding: 3px 20px;
clear: both;
@@ -2704,7 +2823,6 @@ table .span24 {
.dropdown-submenu:hover > a {
color: #ffffff;
text-decoration: none;
- background-color: #0088cc;
background-color: #0081c2;
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
@@ -2712,23 +2830,22 @@ table .span24 {
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
background-repeat: repeat-x;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
}
.dropdown-menu .active > a,
.dropdown-menu .active > a:hover {
- color: #ffffff;
+ color: #333333;
text-decoration: none;
- background-color: #0088cc;
background-color: #0081c2;
- background-image: linear-gradient(to bottom, #0088cc, #0077b3);
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+ background-image: linear-gradient(to bottom, #0088cc, #0077b3);
background-repeat: repeat-x;
outline: 0;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
}
.dropdown-menu .disabled > a,
@@ -2740,6 +2857,7 @@ table .span24 {
text-decoration: none;
cursor: default;
background-color: transparent;
+ background-image: none;
}
.open {
@@ -2759,7 +2877,7 @@ table .span24 {
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px solid #000000;
- content: "\2191";
+ content: "";
}
.dropup .dropdown-menu,
@@ -2783,10 +2901,20 @@ table .span24 {
border-radius: 0 6px 6px 6px;
}
-.dropdown-submenu:hover .dropdown-menu {
+.dropdown-submenu:hover > .dropdown-menu {
display: block;
}
+.dropup .dropdown-submenu > .dropdown-menu {
+ top: auto;
+ bottom: 0;
+ margin-top: 0;
+ margin-bottom: -2px;
+ -webkit-border-radius: 5px 5px 5px 0;
+ -moz-border-radius: 5px 5px 5px 0;
+ border-radius: 5px 5px 5px 0;
+}
+
.dropdown-submenu > a:after {
display: block;
float: right;
@@ -2805,6 +2933,18 @@ table .span24 {
border-left-color: #ffffff;
}
+.dropdown-submenu.pull-left {
+ float: none;
+}
+
+.dropdown-submenu.pull-left > .dropdown-menu {
+ left: -100%;
+ margin-left: 10px;
+ -webkit-border-radius: 6px 0 6px 6px;
+ -moz-border-radius: 6px 0 6px 6px;
+ border-radius: 6px 0 6px 6px;
+}
+
.dropdown .dropdown-menu .nav-header {
padding-right: 20px;
padding-left: 20px;
@@ -2866,7 +3006,6 @@ table .span24 {
position: relative;
height: 0;
overflow: hidden;
- overflow: visible \9;
-webkit-transition: height 0.35s ease;
-moz-transition: height 0.35s ease;
-o-transition: height 0.35s ease;
@@ -2907,7 +3046,7 @@ button.close {
.btn {
display: inline-block;
*display: inline;
- padding: 4px 14px;
+ padding: 4px 12px;
margin-bottom: 0;
*margin-left: .3em;
font-size: 14px;
@@ -2920,22 +3059,22 @@ button.close {
cursor: pointer;
background-color: #f5f5f5;
*background-color: #e6e6e6;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
- background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-repeat: repeat-x;
border: 1px solid #bbbbbb;
*border: 0;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-bottom-color: #a2a2a2;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
*zoom: 1;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -3005,32 +3144,37 @@ button.close {
}
.btn-large {
- padding: 9px 14px;
- font-size: 16px;
- line-height: normal;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- border-radius: 5px;
+ padding: 11px 19px;
+ font-size: 17.5px;
+ -webkit-border-radius: 6px;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
}
-.btn-large [class^="icon-"] {
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
margin-top: 2px;
}
.btn-small {
- padding: 3px 9px;
- font-size: 12px;
- line-height: 18px;
+ padding: 2px 10px;
+ font-size: 11.9px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
}
-.btn-small [class^="icon-"] {
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
margin-top: 0;
}
.btn-mini {
- padding: 2px 6px;
- font-size: 11px;
- line-height: 16px;
+ padding: 1px 6px;
+ font-size: 10.5px;
+ -webkit-border-radius: 3px;
+ -moz-border-radius: 3px;
+ border-radius: 3px;
}
.btn-block {
@@ -3047,6 +3191,12 @@ button.close {
margin-top: 5px;
}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+ width: 100%;
+}
+
.btn-primary.active,
.btn-warning.active,
.btn-danger.active,
@@ -3066,16 +3216,16 @@ button.close {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #006dcc;
*background-color: #0044cc;
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
background-image: -o-linear-gradient(top, #0088cc, #0044cc);
background-image: linear-gradient(to bottom, #0088cc, #0044cc);
- background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
background-repeat: repeat-x;
border-color: #0044cc #0044cc #002a80;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-primary:hover,
@@ -3098,16 +3248,16 @@ button.close {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #faa732;
*background-color: #f89406;
+ background-image: -moz-linear-gradient(top, #fbb450, #f89406);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
background-image: -o-linear-gradient(top, #fbb450, #f89406);
background-image: linear-gradient(to bottom, #fbb450, #f89406);
- background-image: -moz-linear-gradient(top, #fbb450, #f89406);
background-repeat: repeat-x;
border-color: #f89406 #f89406 #ad6704;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-warning:hover,
@@ -3130,16 +3280,16 @@ button.close {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #da4f49;
*background-color: #bd362f;
+ background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
- background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
background-repeat: repeat-x;
border-color: #bd362f #bd362f #802420;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-danger:hover,
@@ -3162,16 +3312,16 @@ button.close {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #5bb75b;
*background-color: #51a351;
+ background-image: -moz-linear-gradient(top, #62c462, #51a351);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
background-image: -webkit-linear-gradient(top, #62c462, #51a351);
background-image: -o-linear-gradient(top, #62c462, #51a351);
background-image: linear-gradient(to bottom, #62c462, #51a351);
- background-image: -moz-linear-gradient(top, #62c462, #51a351);
background-repeat: repeat-x;
border-color: #51a351 #51a351 #387038;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-success:hover,
@@ -3194,16 +3344,16 @@ button.close {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #49afcd;
*background-color: #2f96b4;
+ background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
- background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
background-repeat: repeat-x;
border-color: #2f96b4 #2f96b4 #1f6377;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-info:hover,
@@ -3226,16 +3376,16 @@ button.close {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #363636;
*background-color: #222222;
+ background-image: -moz-linear-gradient(top, #444444, #222222);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
background-image: -webkit-linear-gradient(top, #444444, #222222);
background-image: -o-linear-gradient(top, #444444, #222222);
background-image: linear-gradient(to bottom, #444444, #222222);
- background-image: -moz-linear-gradient(top, #444444, #222222);
background-repeat: repeat-x;
border-color: #222222 #222222 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.btn-inverse:hover,
@@ -3284,7 +3434,8 @@ input[type="submit"].btn.btn-mini {
}
.btn-link,
-.btn-link:active {
+.btn-link:active,
+.btn-link[disabled] {
background-color: transparent;
background-image: none;
-webkit-box-shadow: none;
@@ -3307,11 +3458,20 @@ input[type="submit"].btn.btn-mini {
background-color: transparent;
}
+.btn-link[disabled]:hover {
+ color: #333333;
+ text-decoration: none;
+}
+
.btn-group {
position: relative;
+ display: inline-block;
+ *display: inline;
*margin-left: .3em;
font-size: 0;
white-space: nowrap;
+ vertical-align: middle;
+ *zoom: 1;
}
.btn-group:first-child {
@@ -3328,14 +3488,6 @@ input[type="submit"].btn.btn-mini {
font-size: 0;
}
-.btn-toolbar .btn-group {
- display: inline-block;
- *display: inline;
- /* IE7 inline-block hack */
-
- *zoom: 1;
-}
-
.btn-toolbar .btn + .btn,
.btn-toolbar .btn-group + .btn,
.btn-toolbar .btn + .btn-group {
@@ -3504,8 +3656,7 @@ input[type="submit"].btn.btn-mini {
}
.dropup .btn-large .caret {
- border-top: 0;
- border-bottom: 5px solid #000000;
+ border-bottom-width: 5px;
}
.btn-primary .caret,
@@ -3678,7 +3829,8 @@ input[type="submit"].btn.btn-mini {
background-color: #0088cc;
}
-.nav-list [class^="icon-"] {
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
margin-right: 2px;
}
@@ -4018,7 +4170,7 @@ input[type="submit"].btn.btn-mini {
*z-index: 2;
margin-bottom: 20px;
overflow: visible;
- color: #555555;
+ color: #777777;
}
.navbar-inner {
@@ -4036,18 +4188,31 @@ input[type="submit"].btn.btn-mini {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+ *zoom: 1;
-webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
}
+.navbar-inner:before,
+.navbar-inner:after {
+ display: table;
+ line-height: 0;
+ content: "";
+}
+
+.navbar-inner:after {
+ clear: both;
+}
+
.navbar .container {
width: auto;
}
.nav-collapse.collapse {
height: auto;
+ overflow: visible;
}
.navbar .brand {
@@ -4057,7 +4222,7 @@ input[type="submit"].btn.btn-mini {
margin-left: -20px;
font-size: 20px;
font-weight: 200;
- color: #555555;
+ color: #777777;
text-shadow: 0 1px 0 #ffffff;
}
@@ -4071,7 +4236,7 @@ input[type="submit"].btn.btn-mini {
}
.navbar-link {
- color: #555555;
+ color: #777777;
}
.navbar-link:hover {
@@ -4087,11 +4252,13 @@ input[type="submit"].btn.btn-mini {
.navbar .btn,
.navbar .btn-group {
- margin-top: 6px;
+ margin-top: 5px;
}
-.navbar .btn-group .btn {
- margin: 0;
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn {
+ margin-top: 0;
}
.navbar-form {
@@ -4162,7 +4329,6 @@ input[type="submit"].btn.btn-mini {
.navbar-static-top {
position: static;
- width: 100%;
margin-bottom: 0;
}
@@ -4182,9 +4348,12 @@ input[type="submit"].btn.btn-mini {
}
.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner,
.navbar-static-top .navbar-inner {
- border: 0;
+ border-width: 0 0 1px;
+}
+
+.navbar-fixed-bottom .navbar-inner {
+ border-width: 1px 0 0;
}
.navbar-fixed-top .navbar-inner,
@@ -4208,9 +4377,9 @@ input[type="submit"].btn.btn-mini {
.navbar-fixed-top .navbar-inner,
.navbar-static-top .navbar-inner {
- -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
- -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
- box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.1), 0 1px 10px rgba(0, 0, 0, 0.1);
+ -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+ -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
}
.navbar-fixed-bottom {
@@ -4218,9 +4387,9 @@ input[type="submit"].btn.btn-mini {
}
.navbar-fixed-bottom .navbar-inner {
- -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
- -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
- box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.1), 0 -1px 10px rgba(0, 0, 0, 0.1);
+ -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+ -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
+ box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
}
.navbar .nav {
@@ -4233,6 +4402,7 @@ input[type="submit"].btn.btn-mini {
.navbar .nav.pull-right {
float: right;
+ margin-right: 0;
}
.navbar .nav > li {
@@ -4242,7 +4412,7 @@ input[type="submit"].btn.btn-mini {
.navbar .nav > li > a {
float: none;
padding: 10px 15px 10px;
- color: #555555;
+ color: #777777;
text-decoration: none;
text-shadow: 0 1px 0 #ffffff;
}
@@ -4279,16 +4449,16 @@ input[type="submit"].btn.btn-mini {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #ededed;
*background-color: #e5e5e5;
+ background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
- background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
background-repeat: repeat-x;
border-color: #e5e5e5 #e5e5e5 #bfbfbf;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
@@ -4372,8 +4542,8 @@ input[type="submit"].btn.btn-mini {
}
.navbar .nav li.dropdown > .dropdown-toggle .caret {
- border-top-color: #555555;
- border-bottom-color: #555555;
+ border-top-color: #777777;
+ border-bottom-color: #777777;
}
.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
@@ -4425,7 +4595,7 @@ input[type="submit"].btn.btn-mini {
background-image: linear-gradient(to bottom, #222222, #111111);
background-repeat: repeat-x;
border-color: #252525;
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
}
.navbar-inverse .brand,
@@ -4527,16 +4697,16 @@ input[type="submit"].btn.btn-mini {
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #0e0e0e;
*background-color: #040404;
+ background-image: -moz-linear-gradient(top, #151515, #040404);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
background-image: -webkit-linear-gradient(top, #151515, #040404);
background-image: -o-linear-gradient(top, #151515, #040404);
background-image: linear-gradient(to bottom, #151515, #040404);
- background-image: -moz-linear-gradient(top, #151515, #040404);
background-repeat: repeat-x;
border-color: #040404 #040404 #000000;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
- filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
}
.navbar-inverse .btn-navbar:hover,
@@ -4581,7 +4751,6 @@ input[type="submit"].btn.btn-mini {
}
.pagination {
- height: 40px;
margin: 20px 0;
}
@@ -4590,63 +4759,69 @@ input[type="submit"].btn.btn-mini {
*display: inline;
margin-bottom: 0;
margin-left: 0;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
*zoom: 1;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
-.pagination li {
+.pagination ul > li {
display: inline;
}
-.pagination a,
-.pagination span {
+.pagination ul > li > a,
+.pagination ul > li > span {
float: left;
- padding: 0 14px;
- line-height: 38px;
+ padding: 4px 12px;
+ line-height: 20px;
text-decoration: none;
background-color: #ffffff;
border: 1px solid #dddddd;
border-left-width: 0;
}
-.pagination a:hover,
-.pagination .active a,
-.pagination .active span {
+.pagination ul > li > a:hover,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
background-color: #f5f5f5;
}
-.pagination .active a,
-.pagination .active span {
+.pagination ul > .active > a,
+.pagination ul > .active > span {
color: #999999;
cursor: default;
}
-.pagination .disabled span,
-.pagination .disabled a,
-.pagination .disabled a:hover {
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover {
color: #999999;
cursor: default;
background-color: transparent;
}
-.pagination li:first-child a,
-.pagination li:first-child span {
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
border-left-width: 1px;
- -webkit-border-radius: 3px 0 0 3px;
- -moz-border-radius: 3px 0 0 3px;
- border-radius: 3px 0 0 3px;
+ -webkit-border-bottom-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ -webkit-border-top-left-radius: 4px;
+ border-top-left-radius: 4px;
+ -moz-border-radius-bottomleft: 4px;
+ -moz-border-radius-topleft: 4px;
}
-.pagination li:last-child a,
-.pagination li:last-child span {
- -webkit-border-radius: 0 3px 3px 0;
- -moz-border-radius: 0 3px 3px 0;
- border-radius: 0 3px 3px 0;
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+ -webkit-border-top-right-radius: 4px;
+ border-top-right-radius: 4px;
+ -webkit-border-bottom-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ -moz-border-radius-topright: 4px;
+ -moz-border-radius-bottomright: 4px;
}
.pagination-centered {
@@ -4657,6 +4832,68 @@ input[type="submit"].btn.btn-mini {
text-align: right;
}
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+ padding: 11px 19px;
+ font-size: 17.5px;
+}
+
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+ -webkit-border-bottom-left-radius: 6px;
+ border-bottom-left-radius: 6px;
+ -webkit-border-top-left-radius: 6px;
+ border-top-left-radius: 6px;
+ -moz-border-radius-bottomleft: 6px;
+ -moz-border-radius-topleft: 6px;
+}
+
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+ -webkit-border-top-right-radius: 6px;
+ border-top-right-radius: 6px;
+ -webkit-border-bottom-right-radius: 6px;
+ border-bottom-right-radius: 6px;
+ -moz-border-radius-topright: 6px;
+ -moz-border-radius-bottomright: 6px;
+}
+
+.pagination-mini ul > li:first-child > a,
+.pagination-small ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > span {
+ -webkit-border-bottom-left-radius: 3px;
+ border-bottom-left-radius: 3px;
+ -webkit-border-top-left-radius: 3px;
+ border-top-left-radius: 3px;
+ -moz-border-radius-bottomleft: 3px;
+ -moz-border-radius-topleft: 3px;
+}
+
+.pagination-mini ul > li:last-child > a,
+.pagination-small ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > span {
+ -webkit-border-top-right-radius: 3px;
+ border-top-right-radius: 3px;
+ -webkit-border-bottom-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+ -moz-border-radius-topright: 3px;
+ -moz-border-radius-bottomright: 3px;
+}
+
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+ padding: 2px 10px;
+ font-size: 11.9px;
+}
+
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+ padding: 1px 6px;
+ font-size: 10.5px;
+}
+
.pager {
margin: 20px 0;
text-align: center;
@@ -4679,7 +4916,8 @@ input[type="submit"].btn.btn-mini {
display: inline;
}
-.pager a {
+.pager li > a,
+.pager li > span {
display: inline-block;
padding: 5px 14px;
background-color: #fff;
@@ -4689,42 +4927,29 @@ input[type="submit"].btn.btn-mini {
border-radius: 15px;
}
-.pager a:hover {
+.pager li > a:hover {
text-decoration: none;