Win2buntu

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

  1. dev
  2. Merge into trunk
Proposed by Matthew Allen
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
Reviewer Review Type Date Requested Status
Matthew Allen Pending
Review via email: mp+284398@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 .button-next {
6- width: 300px;
7- height: 25px;
8- float:right;
9+ float: right;
10 }
11-
12 .button-back {
13- width: 300px;
14- height: 25px;
15- float:left;
16+ float: left;
17+}
18+.button {
19+ background-color: #d0ccc8;
20+ color: #000;
21+ border: 1px solid black;
22+ width: 49%;
23+ height: 25px;
24+}
25+.button:hover {
26+ background-color: #EEEDEB;
27+ border: 2px solid black;
28+}
29+.button:active{
30+ background-color: #d0ccc8;
31+ border: 3px solid black;
32 }
33\ No newline at end of file
34
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 * {
40- color: #333333; //Ubuntu Color Pallete - Cool grey
41+ color: #333333; //Ubuntu Color Pallete - Cool grey
42 }
43-
44-h1, h2, h3, h4, h5, p {
45- font-family: Ubuntu, sans-serif;
46+h1,
47+h2,
48+h3,
49+h4,
50+h5,
51+p {
52+ font-family: Ubuntu, sans-serif;
53 }
54
55 .content {
56- background-color: #EEEDEB;
57- margin: auto;
58-
59- width: 600px;
60+ background-color: #EEEDEB;
61+ margin: auto;
62+ width: 400px;
63 height: 600px;
64-
65 padding: 10px;
66 margin-top: 20px;
67+ -webkit-box-shadow: 0 0 250px #636363;
68+ box-shadow: 0 0 250px #636363;
69+ border: 2px solid #a4a4a4;
70+}
71+.wrapper {
72
73- -webkit-box-shadow: 0 0 50px #000;
74- box-shadow: 0 0 50px #000;
75+}
76+.footer {
77+ clear: all;
78 }
79
80 body {
81- background-color: #d0cdc8;
82+ background-color: #d0cdc8;
83+}
84+img {
85+ width: 100%;
86 }
87
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 .terminal {
93- color: #AEA79F;
94- overflow-y: scroll;
95- height: 500px;
96+ color: #AEA79F;
97+ height: 490px;
98+ margin-bottom: 10px;
99+ overflow:hidden;
100 }
101-
102 .terminal-header {
103- color: #AEA79F;
104- background-color: #444;
105- font-size: 12px;
106- font-family: Ubuntu;
107- padding: 2px;
108- padding-left: 10px;
109+ color: #AEA79F;
110+ background-color: #444;
111+ font-size: 12px;
112+ font-family: Ubuntu;
113+ padding: 2px;
114+ padding-left: 10px;
115 }
116-
117 .terminal-body {
118- background-color: #333333;
119- padding: 10px;
120+ background-color: #333333;
121+ padding: 10px;
122+ overflow-y: scroll;
123+ height: 474px;
124 }
125-
126 .terminal-command {
127- font-family: Ubuntu Mono, monospace;
128- color: #AEA79F;
129-}
130-
131+ font-family: Ubuntu Mono, monospace;
132+ color: #AEA79F;
133+}
134+.terminal-command a {
135+ color: #AEA79F;
136+}
137 .terminal-output {
138- font-family: Ubuntu Mono, monospace;
139- color: #d0ccc8;
140+ font-family: Ubuntu Mono, monospace;
141+ color: #d0ccc8;
142 }
143-
144-
145 .terminal-comment {
146- font-family: Ubuntu Mono, monospace;
147- color: #E77E5A;
148+ font-family: Ubuntu Mono, monospace;
149+ color: #E77E5A;
150+}
151+
152+.terminal-body::-webkit-scrollbar {
153+ display: none;
154 }
155\ No newline at end of file
156
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 <html>
162- <head>
163- <title> Win2buntu </title>
164- <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
165-
166- <link rel="stylesheet" type="text/css" href="css/default.css">
167- <link rel="stylesheet" type="text/css" href="css/terminal.css">
168- <link rel="stylesheet" type="text/css" href="css/buttons.css">
169-
170- <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css"/>
171- <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
172- </head>
173-
174- <body>
175- <div class="content">
176- <h2> Installing applications on Ubuntu<hr></h2>
177- <div class="terminal">
178- <div class="terminal-header">
179- Terminal
180- </div>
181- <div class="terminal-body">
182- <!-- Add apt section -->
183- <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>
184- <p class="terminal-command"> $ sudo add-apt-repository ppa:numix/ppa</p>
185-
186- <!-- Authentication section -->
187- <p class="terminal-comment"> As soon as you execute this command by pressing ENTER, you will be prompted by sudo
188- to enter your password as shown below. Sudo is the Linux equivalent of running as Admin
189- 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>
190- <p class="terminal-output"> [sudo] password for $yourname: </p>
191-
192- <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>
193-
194- <!-- Update and install section -->
195- <p class="terminal-command"> $ sudo apt-get update</p>
196- <p class="terminal-command"> $ sudo apt-get install numix-gtk-theme numix-icon-theme-circle </p>
197- <p class="terminal-comment"> /* do this thing */</p>
198- </div>
199- </div>
200- <div class="buttons">
201- <button class="button-back" type="button">Previous</button>
202- <button class="button-next" type="button">Next</button>
203- </div>
204- </div>
205- </body>
206+
207+<head>
208+ <title> Win2buntu </title>
209+ <meta charset="ISO-8859-1">
210+ <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
211+
212+ <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
213+ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
214+
215+ <script>
216+ isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
217+
218+ if(!isLinux){
219+ window.location.replace("notLinux.html");
220+ }
221+ </script>
222+
223+ <!--- Load ubuntu UI -->
224+ <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
225+
226+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
227+ <!-- [...] -->
228+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
229+ <!--- End load ubuntu UI -->
230+
231+ <!--- Load custom css to override Ubuntu UI -->
232+ <link rel="stylesheet" type="text/css" href="css/default.css">
233+ <link rel="stylesheet" type="text/css" href="css/terminal.css">
234+ <link rel="stylesheet" type="text/css" href="css/buttons.css">
235+</head>
236+
237+<body>
238+
239+ <div class="content">
240+ <h2> Installing applications<hr></h2>
241+ <div class="terminal">
242+ <div class="terminal-header">
243+ Terminal
244+ </div>
245+ <div class="terminal-body">
246+ <!-- Add apt section -->
247+ <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+ <p class="terminal-command"> $ sudo add-apt-repository ppa:numix/ppa</p>
249+
250+ <!-- Authentication section -->
251+ <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+ <p class="terminal-output"> [sudo] password for $yourname: </p>
253+
254+ <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+
256+ <!-- Update and install section -->
257+ <p class="terminal-command"> $ sudo apt-get update</p>
258+ <p class="terminal-command"> $ sudo apt-get install numix-gtk-theme numix-icon-theme-circle </p>
259+ <p class="terminal-comment"> /* do this thing */</p>
260+ </div>
261+ </div>
262+ <div class="buttons">
263+ <button class="button button-back" type="button">&#9664; Previous</button>
264+ <button class="button button-next" type="button">Next &#9654;</button>
265+ </div>
266+ </div>
267+</body>
268+
269 </html>
270\ No newline at end of file
271
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+<html>
277+
278+<head>
279+ <title> Win2buntu </title>
280+ <meta charset="ISO-8859-1">
281+ <link rel="shortcut icon" href="imgs/favicon_0.ico" type="image/vnd.microsoft.icon" />
282+
283+ <link rel="stylesheet" type="text/css" media="all" href="http://assets.ubuntu.com/sites/guidelines/css/latest/ubuntu-styles.css" />
284+ <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Ubuntu:regular,bold&subset=Latin">
285+
286+ <script>
287+ isLinux = (window.navigator.platform.indexOf("Linux")) > -1;
288+
289+ if(isLinux){
290+ //Redirect uses if they somehow get to this page on Linux, disabled while developing
291+ //window.location.replace("index.html");
292+ }
293+ </script>
294+
295+ <!--- Load ubuntu UI -->
296+ <link href="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/css/appTemplate.css" rel="stylesheet" type="text/css"/>
297+
298+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/core.js"></script>
299+ <!-- [...] -->
300+ <script src="/usr/share/ubuntu-html5-ui-toolkit/0.1/ambiance/js/fast-buttons.js"></script>
301+ <!--- End load ubuntu UI -->
302+
303+
304+ <!--- Load custom css to override Ubuntu UI -->
305+ <link rel="stylesheet" type="text/css" href="css/default.css">
306+ <link rel="stylesheet" type="text/css" href="css/terminal.css">
307+ <link rel="stylesheet" type="text/css" href="css/buttons.css">
308+</head>
309+
310+<body>
311+
312+ <div class="content">
313+ <h2 class="title"> Not Linux...<hr></h2>
314+ <div class="terminal full-height">
315+ <div class="terminal-header">
316+ Terminal
317+ </div>
318+ <div class="terminal-body">
319+ <!-- Add apt section -->
320+ <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+ <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+
323+ <!-- Authentication section -->
324+ <p class="terminal-comment"> If you need more help:</p>
325+ <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on IRC, specify the channel #Ubuntu</a></p>
326+ <p class="terminal-command"> <a href="http://webchat.freenode.net/">Ask on AskUbuntu</a></p>
327+ <p class="terminal-command"> <a href="https://help.ubuntu.com/community/Beginners/FAQ/">Or Visit the Ubuntu Wiki</a></p>
328+
329+ </div>
330+ </div>
331+ <div class="buttons">
332+ <button class="button button-back" type="button">&#9664; Previous</button>
333+ <button class="button button-next" type="button">Next &#9654;</button>
334+ </div>
335+ </div>
336+</body>
337+
338+</html>
339\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: