Commit Graph

1132 Commits

Author SHA1 Message Date
Eric Hough
0cd262d06c Merge branch 'snide-master' into sticky-navigation 2014-01-08 12:14:43 -05:00
Eric Hough
e31a25cb35 Merge branch 'snide-master' into move-javascript-to-bottom
Conflicts:
	sphinx_rtd_theme/layout.html
2014-01-08 12:13:09 -05:00
Eric Holscher
8c6cc8875a Default to https on modernizr.
This stops content warnings when users use https,
and has no ill effects when they're on http.

Fixes #72
2014-01-07 23:43:18 -05:00
Eric Holscher
8658617ad0 Fix the link to theme.js. Fixes #75 2014-01-07 23:42:42 -05:00
Eric Holscher
203082f166 Fix colors 2014-01-07 22:11:54 -05:00
Eric Holscher
fd66443ecb Add an rest-active-old-version css class.
This will be for active versions that are still supported,
but not the current release.

This will be used for our version comparison code.
For example,
When 2.1 is released, it will be green,
2.0 will be yellow,
1.0 will be red.

This will provide an obvious color coded deprecation path.

We should probably add more context around the color so
people know what exactly it means, but this is a start.
2014-01-07 22:09:13 -05:00
Eric Hough
9b26927f5d Merge remote-tracking branch 'snide/master' into sticky-navigation
Conflicts:
	sphinx_rtd_theme/static/css/theme.css
2014-01-07 17:53:02 -05:00
Eric Hough
30f5c683eb Turning off sticky navigation if navbar is taller than window
Conflicts:
	sass/_theme_layout.sass
	sphinx_rtd_theme/layout.html
2014-01-07 17:39:48 -05:00
Eric Holscher
2e13a1cdbc Update theme.css from PR 2014-01-06 20:03:57 -05:00
Eric Holscher
ffcf310122 Merge pull request #79 from ehough/fix-l2-navigation-css
Fix CSS for level 2 navigation
2014-01-06 16:53:01 -08:00
Eric Holscher
cf6f69bd48 Merge pull request #80 from ehough/add-parents-to-breadcrumbs
Add parents to breadcrumbs
2014-01-06 16:52:50 -08:00
Eric Hough
cb44a290a9 Restoring "extrahead" block in layout.html 2014-01-06 02:08:20 -05:00
Eric Hough
bc77ea5286 Remove anchor from current page in breadcrumbs 2014-01-06 01:56:19 -05:00
Eric Hough
8c9bca85f0 Add parents to breadcrumbs 2014-01-06 01:43:21 -05:00
Eric Hough
d79eefabb2 Fixing CSS for level 2 navigation 2014-01-06 01:13:47 -05:00
Eric Hough
bcf2276d5b Adding sticky navigation option 2014-01-05 17:39:14 -05:00
Eric Hough
6dd2f3efc3 Renaming block "extrahead" to "inlinejs" and moving to bottom of page. 2014-01-05 15:22:45 -05:00
Eric Hough
c9863009c1 Merge remote-tracking branch 'snide/master' into move-javascript-to-bottom
Conflicts:
	sphinx_rtd_theme/layout.html
2014-01-05 15:11:34 -05:00
Eric Hough
677706d4ac Moving JS to bottom 2014-01-05 15:05:11 -05:00
Daniel Oaks
48271adf28 Merging upstream 2014-01-05 21:47:54 +10:00
Dave Snider
d45046d77d Merge branch 'master' of github.com:snide/sphinx_rtd_theme 2014-01-03 10:19:09 -08:00
Dave Snider
5ef159c69c fixes #77 2014-01-03 10:18:51 -08:00
Eric Holscher
7ace42328c Merge pull request #74 from jodal/patch-1
Fix footer links to avoid redirects
2013-12-27 13:13:26 -08:00
Stein Magnus Jodal
9f59af5997 Fix footer links to avoid redirects 2013-12-27 21:18:20 +01:00
Danny
68fc9bf35e Merge pull request #11 from ThePhD/master
operator[] support, the right way
2013-12-25 16:54:35 -08:00
ThePhD
750d110a92 Fixing formatting to make sure everything's nice and pretty. 2013-12-21 22:11:20 -05:00
ThePhD
3d44c6500e And a last fix for the test we had to block while fixing implicit conversions, and we're good! 2013-12-21 22:05:19 -05:00
ThePhD
94c287810f It took a lott of work, but we finally have the right rankings for operator[] to work as intended with as minimal room for screwups as possible.
This should enable operator[] to work in all cases that it is to be expected, thanks to a lot of explicit conversions and some basic overload resolution ranking tricks (e.g., making some conversions a template).
We also need to remember that GCC expects `. template (function name)` in generic code, as it can parse things in a really dumb and silly manner.
2013-12-21 22:00:28 -05:00
ThePhD
cfda1d34ba Trying to guess what GCC wants in this case is baffling... 2013-12-21 19:51:48 -05:00
ThePhD
4f279c5033 Strangely enough, GCC can't handle having T_ as a typdef. 2013-12-21 19:44:31 -05:00
ThePhD
7ca6ce8d55 Forgot a dot. 2013-12-21 19:42:50 -05:00
ThePhD
ef223ecaeb I wish C++ didn't demand that functions have to appear before each other in lexographic order. =/ 2013-12-21 19:39:51 -05:00
ThePhD
b90f789986 operator[] support~
And all is as it should be in the world~
2013-12-21 19:30:30 -05:00
ThePhD
a6120631d8 Merge branch 'master' of github.com:Rapptz/sol
Conflicts:
	tests.cpp
2013-12-18 10:31:57 -05:00
Dave Snider
49ac44dc35 align parameters list if possible, fixes #70 2013-12-16 11:41:35 -08:00
Rapptz
afe435910f Add basic examples directory 2013-12-16 11:17:33 -05:00
ThePhD
8ae6297659 Merge remote-tracking branch 'root/master' 2013-12-16 11:08:05 -05:00
ThePhD
4d629e6c73 Have to use cast to solve ambiguity... =/ 2013-12-16 11:07:21 -05:00
Rapptz
ac975872ad Remove support for operator[] on tables 2013-12-16 11:07:10 -05:00
Danny
5b505dcaad Merge pull request #10 from ThePhD/master
Multi-gets and GCC/VC++ Compatiability again
2013-12-16 05:50:46 -08:00
ThePhD
cb492e7c29 Squashing those GCC warnings. 2013-12-15 22:14:56 -05:00
ThePhD
f8cfb80a45 Fixed a bug with the return order and added tests to make sure it works.
Added the ability to get mutiple values when doing `table.get` or `state.get`.
Lua is hard. :c
2013-12-15 22:09:06 -05:00
ThePhD
e0bcf5a11e Ordering things more nicely for GCC and fixing calls to always used extra types parameters when they can for early-out decltype deduction, rather than recursive template reliance (compiles better for VC++ and resolves earlier for g++). 2013-12-15 17:09:23 -05:00
ThePhD
c8417d65de decltype with types. It seems unfair. 2013-12-15 16:56:01 -05:00
ThePhD
63536dd8d0 Why not cheat with an extra types ? Who needs type deduction when you can just pass the right types directly? 2013-12-15 16:52:01 -05:00
ThePhD
b9b32baf1a declval is in the std namespace, derp. 2013-12-15 16:46:57 -05:00
ThePhD
94405d0346 Fixing lua function, attempting another fix for rtl_pop 2013-12-15 16:45:40 -05:00
ThePhD
8ef3ceb8a0 New test cases for the order of returns. Apparently, its screwing up between both lua and C++. Have to test thoroughly. Changes currently are half-working. 2013-12-15 16:27:20 -05:00
Danny
0e31358d97 Merge pull request #9 from ThePhD/master
More VC++ compatibility, some features, and some warning supression for GCC.
2013-12-14 21:01:07 -08:00
ThePhD
6101865c1e GCC warnings can go suck a duck. 2013-12-14 23:31:23 -05:00