devel@pieter-CR610M:~/UbuntuProjects/ubuntu-africa/jumbotron-edits$ bzr status devel@pieter-CR610M:~/UbuntuProjects/ubuntu-africa/jumbotron-edits$ bzr log ------------------------------------------------------------ revno: 7 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:48:39 +0200 message: Change jumbotron's image-credit It's visual layout is changed a bit, while it also re-uses previously created classes. ------------------------------------------------------------ revno: 6 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:33:51 +0200 message: Change jumbotron padding Adding padding-top to body causes the jumbotron's container to be a bit low. So removed its margin-top. Also make the margins around the jumbotron's h1 equal so that it is vertically centered ------------------------------------------------------------ revno: 5 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:30:52 +0200 message: Add top padding to body Hiding the jumbotron on non-home pages, cause sub-pages' header to be below the navbar. The top padding fixes this. See http://getbootstrap.com/components/#body-padding-required ------------------------------------------------------------ revno: 4 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:26:50 +0200 message: Hide jumbotron all pages that are not home ------------------------------------------------------------ revno: 3 [merge] author: Ashton van Niekerk <prysdieheer@gmail.com> committer: Gustav H Meyer <ghmeyer@gmail.com> branch nick: ubuntu-africa timestamp: Sun 2015-04-05 21:41:45 +0200 message: Home page and menus to start with ------------------------------------------------------------ revno: 2 [merge] author: Raoul Snyman <raoul@snyman.info> committer: Gustav H Meyer <ghmeyer@gmail.com> branch nick: ubuntu-africa timestamp: Wed 2015-03-18 21:59:52 +0200 message: Initial theme for ubuntu-africa ------------------------------------------------------------ revno: 1 committer: msdomdonner branch nick: trunk timestamp: Sun 2015-02-15 20:47:48 +0200 message: Initial import ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions. devel@pieter-CR610M:~/UbuntuProjects/ubuntu-africa/jumbotron-edits$ bzr merge ../trunk +N files/african-map.png +N files/community.png +N files/ubuntu-logo-140x140.png +N pages/chat-with-us.rst +N pages/get-ubuntu.rst +N pages/join-us.rst All changes applied successfully. devel@pieter-CR610M:~/UbuntuProjects/ubuntu-africa/jumbotron-edits$ bzr statusadded: files/african-map.png files/community.png files/ubuntu-logo-140x140.png pages/chat-with-us.rst pages/get-ubuntu.rst pages/join-us.rst pending merge tips: (use -v to see all merge revisions) Ashton van Niekerk 2015-04-09 [merge] Added pages devel@pieter-CR610M:~/UbuntuProjects/ubuntu-africa/jumbotron-edits$ bzr log------------------------------------------------------------ revno: 7 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:48:39 +0200 message: Change jumbotron's image-credit It's visual layout is changed a bit, while it also re-uses previously created classes. ------------------------------------------------------------ revno: 6 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:33:51 +0200 message: Change jumbotron padding Adding padding-top to body causes the jumbotron's container to be a bit low. So removed its margin-top. Also make the margins around the jumbotron's h1 equal so that it is vertically centered ------------------------------------------------------------ revno: 5 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:30:52 +0200 message: Add top padding to body Hiding the jumbotron on non-home pages, cause sub-pages' header to be below the navbar. The top padding fixes this. See http://getbootstrap.com/components/#body-padding-required ------------------------------------------------------------ revno: 4 committer: Pieter Engelbrecht <pieter2627@gmail.com> branch nick: jumbotron-edits timestamp: Wed 2015-04-08 09:26:50 +0200 message: Hide jumbotron all pages that are not home ------------------------------------------------------------ revno: 3 [merge] author: Ashton van Niekerk <prysdieheer@gmail.com> committer: Gustav H Meyer <ghmeyer@gmail.com> branch nick: ubuntu-africa timestamp: Sun 2015-04-05 21:41:45 +0200 message: Home page and menus to start with ------------------------------------------------------------ revno: 2 [merge] author: Raoul Snyman <raoul@snyman.info> committer: Gustav H Meyer <ghmeyer@gmail.com> branch nick: ubuntu-africa timestamp: Wed 2015-03-18 21:59:52 +0200 message: Initial theme for ubuntu-africa ------------------------------------------------------------ revno: 1 committer: msdomdonner branch nick: trunk timestamp: Sun 2015-02-15 20:47:48 +0200 message: Initial import ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.