bzr log and status for jumbotron-edits after merge from trunk

Raw 
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
devel@pieter-CR610M:~/UbuntuProjects/ubuntu-africa/jumbrotron-edits$ bzr merge --pull lp:ubuntu-africaAll changes applied successfully.
devel@pieter-CR610M:~/UbuntuProjects/ubuntu-africa/jumbrotron-edits$ bzr log
------------------------------------------------------------
revno: 8
committer: Pieter Engelbrecht <pieter2627@gmail.com>
branch nick: jumbrotron-edits
timestamp: Sat 2015-04-04 11:36:38 +0200
message:
  Added pages chat-with-us (with content) and join-us, also fixed `Get Ubuntu` link
------------------------------------------------------------
revno: 7
committer: Pieter Engelbrecht <pieter2627@gmail.com>
branch nick: jumbrotron-edits
timestamp: Sat 2015-04-04 11:21:48 +0200
message:
  Change jumbotron padding
  
  Adding padding-top to body causes the jumbotron 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: 6
committer: Pieter Engelbrecht <pieter2627@gmail.com>
branch nick: jumbrotron-edits
timestamp: Sat 2015-04-04 10:59:41 +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: 5
committer: Pieter Engelbrecht <pieter2627@gmail.com>
branch nick: jumbrotron-edits
timestamp: Sat 2015-04-04 10:55:11 +0200
message:
  Hide jumbotron all pages that are not home
------------------------------------------------------------
revno: 4
committer: Pieter Engelbrecht <pieter2627@gmail.com>
branch nick: jumbrotron-edits
timestamp: Sat 2015-04-04 09:37:37 +0200
message:
  Change jumbotron's image-credit
------------------------------------------------------------
revno: 3
committer: Ashton van Niekerk <prysdieheer@gmail.com>
branch nick: starting-pages
timestamp: Thu 2015-04-02 21:59:39 +0200
message:
  initial pages 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/jumbrotron-edits$ bzr status
pending merge tips: (use -v to see all merge revisions)
  Ashton van Niekerk 2015-04-05 [merge] Home page and menus to start with