Commit Graph

2119 Commits

Author SHA1 Message Date
MinRK
c4ad524cef inherit bootstrap properly
need *both* bootstrap and responsive in style.less, neither in page.html.
2013-06-09 14:48:46 -07:00
MinRK
638b30ff90 shrink navbars a little 2013-06-09 14:48:46 -07:00
MinRK
864ef914ae fight with bootstrap a little less in tree view 2013-06-09 14:48:46 -07:00
MinRK
0beb0a7828 add missing cell_type = "code"; 2013-06-09 14:48:46 -07:00
MinRK
265a8e7edb only put the notebook in a container
allows pager to be full-width
2013-06-09 14:48:46 -07:00
MinRK
116a461bce fix bad $(body) 2013-06-09 14:48:45 -07:00
MinRK
b67fff1d39 tweak header styling
use nabbers, so they are internally consistent
2013-06-09 14:48:45 -07:00
MinRK
0d94351fd5 disabile bootstrap's capitalized nav-header 2013-06-09 14:48:45 -07:00
MinRK
3d233ff22f fix wrong arrow direction 2013-06-09 14:48:45 -07:00
MinRK
9f2e3975b3 add missing dialog.js 2013-06-09 14:48:44 -07:00
MinRK
78199220da hide save status as it shrinks 2013-06-09 14:48:44 -07:00
MinRK
87a4a3827c tweak header 2013-06-09 14:48:44 -07:00
MinRK
251a94969b use responsive bootstrap 2013-06-09 14:48:44 -07:00
MinRK
d0b9e325b3 center login 2013-06-09 14:48:44 -07:00
MinRK
fa9b8b86bd ipython-main-app should be a bootstrap container 2013-06-09 14:48:43 -07:00
MinRK
b145150b52 bootstrap button output area 2013-06-09 14:48:43 -07:00
MinRK
970fab8dff tree style tweaks 2013-06-09 14:48:43 -07:00
MinRK
d79c0e7471 bootstrap dialogs 2013-06-09 14:48:43 -07:00
MinRK
aec9331c83 use components jquery-ui 2013-06-09 14:48:43 -07:00
MinRK
26528b108d don't use $(document).append (it's wrong and broken) 2013-06-09 14:48:42 -07:00
MinRK
24abe87de1 bootstrap tree 2013-06-09 14:48:40 -07:00
MinRK
4296134a41 shrink login button 2013-06-09 14:48:12 -07:00
MinRK
64f669dc69 bootstrap toolbar 2013-06-09 14:48:12 -07:00
MinRK
9da648b4d0 bootstrap menubar 2013-06-09 14:48:12 -07:00
MinRK
7de8d3debb jquery-ui.custom has been renamed 2013-06-09 14:48:12 -07:00
MinRK
b8bf0831f2 overriding baseLineHeight is not a good idea 2013-06-09 14:48:12 -07:00
MinRK
1ee1ce3b3c bootstrap base, auth 2013-06-09 14:48:11 -07:00
MinRK
bebc1a0460 start using bootstrap 2013-06-09 14:48:11 -07:00
Matthias Bussonnier
6938e76ccc Merge pull request #3364 from Carreau/requirejs
Inject requirejs in notebook and start using it.

Mainly because the behavior of Marked change when require is injected.
So only apply the modification needed for marked to behave.
2013-06-07 01:40:20 -07:00
Matthias Bussonnier
95881ccb0e Merge pull request #172 from Carreau/deepcopy
Deepcopy

rework of config system to fix non-configurability bugs.
2013-06-06 09:10:00 -07:00
Matthias BUSSONNIER
2208e387d9 finish up config merging 2013-06-06 00:10:53 +02:00
Matthias Bussonnier
4469559b19 Merge pull request #3401 from minrk/rollbackcmcss
rollback #3358

#3358 was a workaround for a CodeMirror (actually Chrome seems to be the one at fault) bug drawing scrollbars over text, when there isn't anything to scroll. The workaround was a compromise, always drawing the space for the scrollbars to prevent the overlay, but reducing the margin so it isn't quite so annoying in the ~99% of the time that there are no scrollbars. It turns out (#3397, #3399) that the margins are not reliable, so the margin adjustment could cause the very same problem.

closes #3391, #3397, #3399

For users who need to hide the scrollbars while zooming text while we wait for a CodeMirror release, you can add the following to your custom.css:

.CodeMirror-scroll, .CodeMirror-wrap .CodeMirror-scroll {
 overflow: scroll;
}

.CodeMirror-vscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-hscrollbar {
   visibility: hidden;
}
or just put CodeMirror master in your profile's static/components directory.
2013-06-04 14:51:42 -07:00
Matthias Bussonnier
e066135a7c Merge pull request #3373 from minrk/cookiesecret
make cookie_secret configurable

Allows config to specify logins that survive across server instances (default behavior unchanged).

Add warning about not sharing config files with cookie secret.
2013-06-04 14:48:53 -07:00
MinRK
1f841c64e5 add note about sharing config files with cookie_secret 2013-06-04 14:37:19 -07:00
Matthias BUSSONNIER
9f229a8e1c Use {{static_url}} as require search root 2013-06-04 20:47:38 +02:00
MinRK
977b96ef1f rollback #3358
closes #3391

For users who need to hide the scrollbars while zooming text in the meantime, you can add the following to your custom.css:

```css
.CodeMirror-scroll, .CodeMirror-wrap .CodeMirror-scroll {
  overflow: scroll;
}

.CodeMirror-vscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-hscrollbar {
    visibility: hidden;
}
```
2013-06-04 11:22:49 -07:00
Matthias BUSSONNIER
66ff7dde48 de-require-config 2013-06-04 10:11:41 +02:00
Matthias Bussonnier
32ac1e9421 Merge pull request #3307 from minrk/wsproto
switch default ws_url logic to js side

In some cases (proxies, #3305), the request object doesn't have the right information about the originating information. This changes the default behavior, so that ws_url is generally empty by default, which the javascript takes to mean 'the same as http'. This is simpler and should be more resilient than trying a guess on server-side.

also replaces unused websocket_host with websocket_url

Rather than specifying only the hostname, it makes much more sense to specify the whole protocol,host,port in a single go.
2013-06-02 11:36:17 -07:00
Min RK
e05b3b3b12 Merge pull request #3392 from Carreau/fix-anchor
Restore anchor link on h2-h6
2013-06-02 11:25:13 -07:00
Matthias BUSSONNIER
b52aa7e66d restore anchore on h2-h6 links 2013-06-02 18:19:39 +02:00
Matthias Bussonnier
ceef803109 Merge pull request #3369 from Carreau/auto-scroll
Use different treshold for (auto)scroll in output

Use different treshold for (auto)scroll in output
Allow, in particular to switch to scolling for longer input (or disable
it) by still keeping the possibility to manually toggle the output to
scroll.

cf jsdoc, 
OutputArea.auto_scroll_threshold
and
OutputArea.minimum_scroll_threshold

OutputArea.auto_scroll_threshold < 0 will prevent auto_scroll from ever happening.
2013-06-02 08:46:25 -07:00
Matthias Bussonnier
fea07e81ce Merge pull request #3370 from minrk/nonasciicp
used in comparison check for notebook name change.

Unless the filenames are normalized, unchanged names may result in false positives for a name change (e.g. OS X uses NFD on the filesystem, so u'\xfc' roundtripped to the filesystem will be u'u\u0308'), which can result in the first save of a notebook after open performing the following actions:

save the recently opened notebook
old_name != new_name, so name change detected
delete old_name (which is actually new_name), which ultimately deletes the just-saved notebook
In master, this has a symptom of the first checkpoint failing because the first save actually deleted the file, and you can't checkpoint a notebook that doesn't exist.

closes #3360
2013-06-02 08:43:20 -07:00
Matthias Bussonnier
874ee503cd Merge pull request #3372 from minrk/cookiename
base default cookie name on request host+port
2013-06-02 08:42:36 -07:00
Matthias Bussonnier
c7a13d15b8 Merge pull request #3378 from minrk/dragDropSafari
disable CodeMirror drag/drop on Safari
2013-06-02 08:40:49 -07:00
Matthias Bussonnier
a063c9a094 Merge pull request #3358 from minrk/cm-scroll
workaround spurious CodeMirror scrollbars
2013-06-02 08:39:07 -07:00
Matthias Bussonnier
3d57f9b0a0 Merge pull request #3371 from minrk/dirty-event
make setting the notebook dirty flag an event
2013-06-02 08:35:44 -07:00
MinRK
711edfaed9 use dirty event to set autosaved/unsaved changes
instead of last-saved timestamp
2013-05-31 21:42:49 -07:00
Min RK
59ef1fb2ed Merge pull request #3387 from takluyver/py3-submodules
Make submodule checks work under Python 3

introduces a regression in the submodule check for people who may have fetched a tarball from GitHub,
which will now install an incomplete IPython.
2013-05-30 11:52:51 -07:00
Matthias Bussonnier
665a7b9acc Merge pull request #3357 from minrk/heading-links
move anchor-link off of heading text
2013-05-30 10:02:31 -07:00
MinRK
d48409cdf6 use .text() instead of .html() 2013-05-30 09:59:16 -07:00