1
=== modified file 'css/buttons.css'
2
--- css/buttons.css	2016-01-29 04:33:31 +0000
3
+++ css/buttons.css	2016-01-29 08:00:55 +0000
4
@@ -1,11 +1,21 @@
5
1
.button-next {
1
.button-next {
9
2
	width: 300px;
2
    float: right;
7
3
	height: 25px;
8
4
	float:right;
10
5
}
3
}
11
6
12
7
.button-back {
4
.button-back {
16
8
	width: 300px;
5
    float: left;
17
9
	height: 25px;
6
}
18
10
	float:left;
7
.button {
19
8
    background-color: #d0ccc8;
20
9
    color: #000;
21
10
    border: 1px solid black;
22
11
    width: 49%;
23
12
    height: 25px;
24
13
}
25
14
.button:hover {
26
15
    background-color: #EEEDEB;
27
16
    border: 2px solid black;
28
17
}
29
18
.button:active{
30
19
	background-color: #d0ccc8;
31
20
	border: 3px solid black;
32
11
}
21
}
33
12
\ No newline at end of file
22
\ No newline at end of file
34
13
23
35
=== modified file 'css/default.css'
36
--- css/default.css	2016-01-29 03:36:00 +0000
37
+++ css/default.css	2016-01-29 08:00:55 +0000
38
@@ -1,25 +1,36 @@
39
1
* {
1
* {
41
2
	color: #333333; //Ubuntu Color Pallete - Cool grey
2
    color: #333333; //Ubuntu Color Pallete - Cool grey
42
3
}
3
}
46
4
4
h1,
47
5
h1, h2, h3, h4, h5, p {
5
h2,
48
6
	font-family: Ubuntu, sans-serif;
6
h3,
49
7
h4,
50
8
h5,
51
9
p {
52
10
    font-family: Ubuntu, sans-serif;
53
7
}
11
}
54
8
12
55
9
.content {
13
.content {
60
10
	background-color: #EEEDEB;
14
    background-color: #EEEDEB;
61
11
	    margin: auto;
15
    margin: auto;
62
12
    
16
    width: 400px;
59
13
    width: 600px;
63
14
    height: 600px;
17
    height: 600px;
64
15
65
16
    padding: 10px;
18
    padding: 10px;
66
17
    margin-top: 20px;
19
    margin-top: 20px;
67
20
    -webkit-box-shadow: 0 0 250px #636363;
68
21
    box-shadow: 0 0 250px #636363;
69
22
    border: 2px solid #a4a4a4;
70
23
}
71
24
.wrapper {
72
18
25
75
19
	-webkit-box-shadow: 0 0 50px #000;
26
}
76
20
        box-shadow: 0 0 50px #000;
27
.footer {
77
28
	clear: all;
78
21
}
29
}
79
22
30
80
23
body {
31
body {
82
24
	background-color: #d0cdc8;
32
    background-color: #d0cdc8;
83
33
}
84
34
img {
85
35
	width: 100%;
86
25
}
36
}
87
26
37
88
=== modified file 'css/terminal.css'
89
--- css/terminal.css	2016-01-29 04:33:31 +0000
90
+++ css/terminal.css	2016-01-29 08:00:55 +0000
91
@@ -1,35 +1,39 @@
92
1
.terminal {
1
.terminal {
96
2
	color: #AEA79F;
2
    color: #AEA79F;
97
3
	 overflow-y: scroll;
3
    height: 490px;
98
4
	 height: 500px;
4
    margin-bottom: 10px;
99
5
    overflow:hidden;
100
5
}
6
}
101
6
102
7
.terminal-header {
7
.terminal-header {
109
8
	color: #AEA79F;
8
    color: #AEA79F;
110
9
	background-color: #444;
9
    background-color: #444;
111
10
	font-size: 12px;
10
    font-size: 12px;
112
11
	font-family: Ubuntu;
11
    font-family: Ubuntu;
113
12
	padding: 2px;
12
    padding: 2px;
114
13
	padding-left: 10px;
13
    padding-left: 10px;
115
14
}
14
}
116
15
117
16
.terminal-body {
15
.terminal-body {
120
17
	background-color: #333333;
16
    background-color: #333333;
121
18
	padding: 10px;
17
    padding: 10px;
122
18
    overflow-y: scroll;
123
19
    height: 474px;
124
19
}
20
}
125
20
126
21
.terminal-command {
21
.terminal-command {
131
22
	font-family: Ubuntu Mono, monospace;
22
    font-family: Ubuntu Mono, monospace;
132
23
	color: #AEA79F;
23
    color: #AEA79F;
133
24
}
24
}
134
25
25
.terminal-command a {
135
26
    color: #AEA79F;
136
27
}
137
26
.terminal-output {
28
.terminal-output {
140
27
	font-family: Ubuntu Mono, monospace;
29
    font-family: Ubuntu Mono, monospace;
141
28
	color: #d0ccc8;
30
    color: #d0ccc8;
142
29
}
31
}
143
30
144
31
145
32
.terminal-comment {
32
.terminal-comment {
148
33
	font-family: Ubuntu Mono, monospace;
33
    font-family: Ubuntu Mono, monospace;
149
34
	color: #E77E5A;
34
    color: #E77E5A;
150
35
}
151
36
152
37
.terminal-body::-webkit-scrollbar { 
153
38
    display: none; 
154
35
}
39
}
155
36
\ No newline at end of file
40
\ No newline at end of file
156
37
41
157
=== modified file 'index.html'
158
--- index.html	2016-01-29 04:33:31 +0000
159
+++ index.html	2016-01-29 08:00:55 +0000
160
@@ -1,46 +1,65 @@
161
1
<html>
1
<html>
206
2
	<head>
2
207
3
		<title> Win2buntu </title>
3
<head>
208
4
		<link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
4
    <title> Win2buntu </title>
209
5
5
    <meta charset="ISO-8859-1">
210
6
		<link rel="stylesheet" type="text/css" href="css/default.css">
6
    <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
211
7
		<link rel="stylesheet" type="text/css" href="css/terminal.css">
7
212
8
		<link rel="stylesheet" type="text/css" href="css/buttons.css">
8
    <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
213
9
		
9
    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
214
10
		<link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css"/>
10
215
11
		<link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
11
	<script>
216
12
	</head>
12
		isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
217
13
13
218
14
	<body>
14
		if(!isLinux){
219
15
		<div class="content">
15
			window.location.replace("notLinux.html");
220
16
			<h2> Installing applications on Ubuntu<hr></h2>
16
		}
221
17
			<div class="terminal">
17
	</script>
222
18
				<div class="terminal-header">
18
223
19
				Terminal
19
    <!--- Load ubuntu UI -->
224
20
				</div>
20
    <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
225
21
				<div class="terminal-body">
21
 
226
22
					<!-- Add apt section -->
22
	<script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
227
23
					<p class="terminal-comment"> The command shown below allows you to add the Numix PPA, this will allow you to install packages developed and published by Numix.</p>
23
	<!-- [...] -->
228
24
					<p class="terminal-command"> $ sudo add-apt-repository ppa:numix/ppa</p>
24
	<script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
229
25
25
	<!--- End load ubuntu UI -->
230
26
					<!-- Authentication section -->
26
231
27
					<p class="terminal-comment"> As soon as you execute this command by pressing ENTER, you will be prompted by sudo 
27
	<!--- Load custom css to override Ubuntu UI -->
232
28
												 to enter your password as shown below. Sudo is the Linux equivalent of running as Admin 
28
	<link rel="stylesheet" type="text/css" href="css/default.css">
233
29
												 and is required to executing many commands that make changes to the system. Be aware that as you type your password it will not show up in the terminal. </p>
29
    <link rel="stylesheet" type="text/css" href="css/terminal.css">
234
30
					<p class="terminal-output"> [sudo] password for $yourname: </p>
30
    <link rel="stylesheet" type="text/css" href="css/buttons.css">
235
31
31
</head>
236
32
					<p class="terminal-comment"> Once you've entered your password you will be prompted to confirm or deny the addition of this PPA. PPA is short for Personal Package Archive, this package archives are used to install new software packages. By default Ubuntu has a number of PPA configured which allow you to install a vast amount of software; however some packages are not and thus have to be added manually.</p>
32
237
33
33
<body>
238
34
					<!-- Update and install section -->
34
239
35
					<p class="terminal-command"> $ sudo apt-get update</p>
35
    <div class="content">
240
36
					<p class="terminal-command"> $ sudo apt-get install numix-gtk-theme numix-icon-theme-circle </p>
36
        <h2> Installing applications<hr></h2>
241
37
					<p class="terminal-comment"> /* do this thing */</p>
37
        <div class="terminal">
242
38
				</div>
38
            <div class="terminal-header">
243
39
			</div> 
39
                Terminal
244
40
			<div class="buttons">
40
            </div>
245
41
				<button class="button-back" type="button">Previous</button>
41
            <div class="terminal-body">
246
42
				<button class="button-next" type="button">Next</button>
42
                <!-- Add apt section -->
247
43
			</div>
43
                <p class="terminal-comment"> The command shown below allows you to add the Numix PPA, this will allow you to install packages developed and published by Numix.</p>
248
44
		</div>
44
                <p class="terminal-command"> $ sudo add-apt-repository ppa:numix/ppa</p>
249
45
	</body>
45
250
46
                <!-- Authentication section -->
251
47
                <p class="terminal-comment"> As soon as you execute this command by pressing ENTER, you will be prompted by sudo to enter your password as shown below. Sudo is the Linux equivalent of running as Admin and is required to executing many commands that make changes to the system. Be aware that as you type your password it will not show up in the terminal. </p>
252
48
                <p class="terminal-output"> [sudo] password for $yourname: </p>
253
49
254
50
                <p class="terminal-comment"> Once you've entered your password you will be prompted to confirm or deny the addition of this PPA. PPA is short for Personal Package Archive, this package archives are used to install new software packages. By default Ubuntu has a number of PPA configured which allow you to install a vast amount of software; however some packages are not and thus have to be added manually.</p>
255
51
256
52
                <!-- Update and install section -->
257
53
                <p class="terminal-command"> $ sudo apt-get update</p>
258
54
                <p class="terminal-command"> $ sudo apt-get install numix-gtk-theme numix-icon-theme-circle </p>
259
55
                <p class="terminal-comment"> /* do this thing */</p>
260
56
            </div>
261
57
        </div>
262
58
        <div class="buttons">
263
59
            <button class="button button-back" type="button">&#9664; Previous</button>
264
60
            <button class="button button-next" type="button">Next &#9654;</button>
265
61
        </div>
266
62
    </div>
267
63
</body>
268
64
269
46
</html>
65
</html>
270
47
\ No newline at end of file
66
\ No newline at end of file
271
48
67
272
=== added file 'notLinux.html'
273
--- notLinux.html	1970-01-01 00:00:00 +0000
274
+++ notLinux.html	2016-01-29 08:00:55 +0000
275
@@ -0,0 +1,63 @@
276
1
<html>
277
2
278
3
<head>
279
4
    <title> Win2buntu </title>
280
5
    <meta charset="ISO-8859-1">
281
6
    <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
282
7
283
8
    <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
284
9
    <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
285
10
286
11
    <script>
287
12
        isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
288
13
289
14
        if(isLinux){
290
15
            //Redirect uses if they somehow get to this page on Linux, disabled while developing
291
16
            //window.location.replace("index.html");
292
17
        }
293
18
    </script>
294
19
295
20
    <!--- Load ubuntu UI -->
296
21
    <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
297
22
 
298
23
    <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
299
24
    <!-- [...] -->
300
25
    <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
301
26
    <!--- End load ubuntu UI -->
302
27
303
28
304
29
    <!--- Load custom css to override Ubuntu UI -->
305
30
    <link rel="stylesheet" type="text/css" href="css/default.css">
306
31
    <link rel="stylesheet" type="text/css" href="css/terminal.css">
307
32
    <link rel="stylesheet" type="text/css" href="css/buttons.css">
308
33
</head>
309
34
310
35
<body>
311
36
312
37
    <div class="content">
313
38
        <h2 class="title"> Not Linux...<hr></h2>
314
39
        <div class="terminal full-height">
315
40
            <div class="terminal-header">
316
41
                Terminal
317
42
            </div>
318
43
            <div class="terminal-body">
319
44
                <!-- Add apt section -->
320
45
                <p class="terminal-comment"> It appears as if you have not installed Ubuntu yet, please install it before you continue with this guide</p>
321
46
                <p class="terminal-command"> <a href="http://askubuntu.com/questions/6328/how-do-i-install-ubuntu">Click here to find out how</a></p>
322
47
323
48
                <!-- Authentication section -->
324
49
                <p class="terminal-comment"> If you need more help:</p>
325
50
                <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on IRC, specify the channel #Ubuntu</a></p>
326
51
                <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on AskUbuntu</a></p>
327
52
                <p class="terminal-command"> <a href="https://help.ubuntu.com/community/Beginners/FAQ/">Or Visit the Ubuntu Wiki</a></p>
328
53
329
54
            </div>
330
55
        </div>
331
56
        <div class="buttons">
332
57
            <button class="button button-back" type="button">&#9664; Previous</button>
333
58
            <button class="button button-next" type="button">Next &#9654;</button>
334
59
        </div>
335
60
    </div>
336
61
</body>
337
62
338
63
</html>
339
0
\ No newline at end of file
64
\ No newline at end of file
Status:	Merged
Merged at revision:	6
Proposed branch:	lp:~whosdaz/win2buntu/dev
Merge into:	lp:win2buntu
Diff against target:	339 lines (+194/-87) 5 files modified css/buttons.css (+17/-7) css/default.css (+23/-12) css/terminal.css (+28/-24) index.html (+63/-44) notLinux.html (+63/-0)
To merge this branch:	bzr merge lp:~whosdaz/win2buntu/dev
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Matthew Allen			Pending
Review via email: mp+284398@code.launchpad.net