lp:~mhall119/ubuntu-accomplishments-web/upstream-theme

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-accomplishments-web at revision 244

ubuntu-accomplishments-web-editor-drivers: Pending requested 2012-12-20

Diff: 11209 lines (+5468/-5366)

26 files modified

README.md (+19/-11)
common/static/css/webgallery.css (+2/-2)
common/templates/base.html (+53/-32)
gallery/media/css/bootstrap.min.css (+727/-0)
gallery/media/css/font.css (+239/-0)
gallery/media/css/information.css (+322/-0)
gallery/media/css/style-sane.css (+293/-0)
gallery/media/css/style.css (+1482/-0)
gallery/media/font/fontawesome-webfont.svg (+255/-0)
gallery/media/js/bootstrap.js (+1836/-0)
gallery/media/js/doctools.js (+232/-0)
gallery/media/js/jquery.js (+4/-0)
gallery/templates/gallery/trophies/base.html (+1/-1)
requirements.txt (+2/-0)
settings.py (+1/-2)
ubuntu_theme/css_search.pl (+0/-53)
ubuntu_theme/static/css/bootstrap.min.css (+0/-727)
ubuntu_theme/static/css/font.css (+0/-239)
ubuntu_theme/static/css/information.css (+0/-330)
ubuntu_theme/static/css/style.css (+0/-1547)
ubuntu_theme/static/font/fontawesome-webfont.svg (+0/-255)
ubuntu_theme/static/js/bootstrap.js (+0/-1836)
ubuntu_theme/static/js/doctools.js (+0/-232)
ubuntu_theme/static/js/jquery.js (+0/-4)
ubuntu_theme/templates/form.html (+0/-18)
ubuntu_theme/templates/website_base.html (+0/-77)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1090132: Update navigation	Medium	Fix Released
Bug #1092282: Port to community theme	High	Fix Released

Link a bug report

Related blueprints

249. By Michael Hall on 2012-12-21

Add copyright text, fix CSS for profile page

248. By Janos Gyerik <janos@axiom> on 2012-12-21

changed accom details back to the way it and the recent collectors box worked well when using bootstrap grid

247. By Janos Gyerik <janos@axiom> on 2012-12-21

updated readme

246. By Michael Hall on 2012-12-20

Add back bootstrap row-fluid and style.css grid definitions

245. By Janos Gyerik on 2012-12-20

Merge from janos

244. By Michael Hall on 2012-12-19

Strip out inlined theme, branch the upstream theme into ./ubuntu_website instead

243. By Janos Gyerik <janos@axiom> on 2012-12-19

trivial: changed Trophies top nav button back to My Trophies

242. By Janos Gyerik <janos@axiom> on 2012-12-19

merged in dashboard from Michael Hall

241. By Janos Gyerik <janos@axiom> on 2012-12-19

navigation improvements

240. By Janos Gyerik <janos@axiom> on 2012-12-18

removed extra margin of ul in secondary nav