Win2buntu

Merge lp:~whosdaz/win2buntu/dev into lp:win2buntu

  1. dev
  2. Merge into trunk
Proposed by Matthew Allen
Status: Merged
Merged at revision: 5
Proposed branch: lp:~whosdaz/win2buntu/dev
Merge into: lp:win2buntu
Diff against target: 55 lines (+20/-1)
3 files modified
css/buttons.css (+11/-0)
css/terminal.css (+2/-0)
index.html (+7/-1)
To merge this branch: bzr merge lp:~whosdaz/win2buntu/dev
Reviewer Review Type Date Requested Status
Matthew Allen Approve
Review via email: mp+284391@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Matthew Allen (whosdaz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'css/buttons.css'
2--- css/buttons.css 1970-01-01 00:00:00 +0000
3+++ css/buttons.css 2016-01-29 04:35:47 +0000
4@@ -0,0 +1,11 @@
5+.button-next {
6+ width: 300px;
7+ height: 25px;
8+ float:right;
9+}
10+
11+.button-back {
12+ width: 300px;
13+ height: 25px;
14+ float:left;
15+}
16\ No newline at end of file
17
18=== modified file 'css/terminal.css'
19--- css/terminal.css 2016-01-29 03:36:00 +0000
20+++ css/terminal.css 2016-01-29 04:35:47 +0000
21@@ -1,5 +1,7 @@
22 .terminal {
23 color: #AEA79F;
24+ overflow-y: scroll;
25+ height: 500px;
26 }
27
28 .terminal-header {
29
30=== modified file 'index.html'
31--- index.html 2016-01-29 03:36:00 +0000
32+++ index.html 2016-01-29 04:35:47 +0000
33@@ -5,7 +5,9 @@
34
35 <link rel="stylesheet" type="text/css" href="css/default.css">
36 <link rel="stylesheet" type="text/css" href="css/terminal.css">
37-
38+ <link rel="stylesheet" type="text/css" href="css/buttons.css">
39+
40+ <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css"/>
41 <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
42 </head>
43
44@@ -35,6 +37,10 @@
45 <p class="terminal-comment"> /* do this thing */</p>
46 </div>
47 </div>
48+ <div class="buttons">
49+ <button class="button-back" type="button">Previous</button>
50+ <button class="button-next" type="button">Next</button>
51+ </div>
52 </div>
53 </body>
54 </html>
55\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: