trying to merge from trunk

  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
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
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.