git ssb

0+

dangerousbeans / dangerous_patchbay



forked from Dominic / patchbay

Commit b1f5f7360522963b4e72ee9ef0d06d71f5bbfe9f

Browse Files

split 'tabs' between sidebar and navbar

Joran committed on 12/18/2016, 9:17:04 PM
Parent: ebf65e8c8947bcad79b243e4d8cd5674ae1b6777

Files changed

modules_basic/search-box.jschanged
modules_core/app.jschanged
modules_core/tabs.jschanged
style.csschanged
modules_basic/search-box.jsView
@@ -70,8 +70,8 @@
7070 … })
7171 … }, {})
7272 … }, 10)
7373 …
74- return h('form.navbar-form.navbar-left', h('div.form-group', search))
74 …+ return search
7575 … }
7676 …
7777 … }
modules_core/app.jsView
@@ -29,36 +29,20 @@
2929 …
3030 … console.log(hash() || 'tabs')
3131 … var view = api.screen_view(hash() || 'tabs')
3232 …
33- var sidebar = h("div#sidebar.column.col-sm-2.col-xs-1.sidebar-offcanvas",
34- [ h("ul.nav", [
35- h("li", [ h("a.visible-xs.text-center", {"attributes":{"href":"#"},"dataset":{"toggle":"offcanvas"}}, [ h("i.glyphicon.glyphicon-chevron-right") ]) ]) ]),
36- h("ul#lg-menu.nav.hidden-xs", [
37- h("li.active", [ h("a", {"attributes":{"href":"#featured"}}, [ h("i.glyphicon.glyphicon-list-alt"), " Featured" ]) ]),
38- h("li", [ h("a", {"attributes":{"href":"#stories"}}, [ h("i.glyphicon.glyphicon-list"), " Stories" ]) ]),
39- h("li", [ h("a", {"attributes":{"href":"#"}}, [ h("i.glyphicon.glyphicon-paperclip"), " Saved" ]) ]),
40- h("li", [ h("a", {"attributes":{"href":"#"}}, [ h("i.glyphicon.glyphicon-refresh"), " Refresh" ]) ]) ]),
41- h("ul#sidebar-footer.list-unstyled.hidden-xs",
42- [ h("li", [ h("a", {"attributes":{"href":"http://ssbc.github.io"}}, [ h("h3", [ "SSBC Patchbay" ]), " "]) ]) ]),
4333 …
44- h("ul#xs-menu.nav.visible-xs", [ "\t",
45- h("li", [ h("a.text-center", {"attributes":{"href":"#featured"}}, [ h("i.glyphicon.glyphicon-list-alt") ]) ]),
46- h("li", [ h("a.text-center", {"attributes":{"href":"#stories"}}, [ h("i.glyphicon.glyphicon-list") ]) ]), "\t",
47- h("li", [ h("a.text-center", {"attributes":{"href":"#"}}, [ h("i.glyphicon.glyphicon-paperclip") ]) ]),
48- h("li", [ h("a.text-center", {"attributes":{"href":"#"}}, [ h("i.glyphicon.glyphicon-refresh") ]) ]) ]) ])
34 …+ var screen = view
4935 …
50- var screen = h('div.screen.column.col-sm-10.col-xs-11', view)
51-
5236 … window.onhashchange = function (ev) {
5337 … var _view = view
5438 … view = api.screen_view(hash() || 'tabs')
5539 …
5640 … if(_view) screen.replaceChild(view, _view)
5741 … else document.body.appendChild(view)
5842 … }
5943 …
60- document.body.appendChild(sidebar)
44 …+ // document.body.appendChild(sidebar)
6145 … document.body.appendChild(screen)
6246 …
6347 … return screen
6448 … }
modules_core/tabs.jsView
@@ -1,5 +1,5 @@
1-var Tabs = require('hypertabs')
1 …+var Tabs = require('hypertabs_bootstrap')
22 … var h = require('hyperscript')
33 … var pull = require('pull-stream')
44 … var u = require('../util')
55 … var keyscroll = require('../keyscroll')
@@ -55,14 +55,17 @@
5555 … return change
5656 … }
5757 … })
5858 …
59 …+
60 …+ // Somehow get search thing into the menu
61 …+ tabs.querySelector('#search_holder').appendChild(search)
62 …+
5963 … //reposition hypertabs menu to inside a container...
60- tabs.insertBefore(
61- h('nav.navbar.navbar-blue.navbar-static-top',
62- h('div.container-fluid', tabs.firstChild, //tabs
63- search, api.menu())
64- ), tabs.firstChild)
64 …+ // tabs.insertBefore(
65 …+ // tabs.firstChild, //tabs
66 …+ // search, api.menu()
67 …+ // )
6568 … // tabs.insertBefore(search, tabs.firstChild.nextSibling)
6669 …
6770 … var saved = []
6871 … // try { saved = JSON.parse(localStorage.openTabs) }
style.cssView
The diff is too large to show. Use a local git client to view these changes.
Old file size: 129607 bytes
New file size: 129618 bytes

Built with git-ssb-web