Skip to content

Final #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DilipTharuka wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Final #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f56578d
Merge branch 'master' of https://github.com/hsenid-mobile/git-workshop
dilip-tharuka Aug 7, 2014
f7d2fb9
2014-8-14 commit
dilip-tharuka Aug 14, 2014
4ff293e
Merge branch 'master' of https://github.com/hsenid-mobile/git-workshop
dilip-tharuka Aug 14, 2014
62a1e39
Merge branch 'master' of https://github.com/hsenid-mobile/git-workshop
dilip-tharuka Aug 17, 2014
9a42fd3
2014-18-17
dilip-tharuka Aug 17, 2014
1af024d
2014-08-18
dilip-tharuka Aug 18, 2014
f361a23
2014-18-18
dilip-tharuka Aug 18, 2014
1241f52
final
dilip-tharuka Aug 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions project/group_06/DiliniMampitiya.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
<label style="margin-left: 100px; margin-top: -15px"><h4>dilu92arachchi@gmail.com</h4></label>

</div>
<<<<<<< HEAD

<div class="form-group" style="margin-left: 300px;margin-top: -63px; width: 500px">
<label><h1>Welcome to PSD Solutions!</h1></label>
</div>

<div class="form-group" style="margin-left: 850px;margin-top: 100px; width: 500px">
=======

<div class="form-group" style="margin-left: 890px;margin-top: -990px; width: 500px">
<label>Search</label>
Expand All @@ -31,6 +39,7 @@
</div>

<div class="form-group" style="margin-left: 840px;margin-top: 20px; width: 500px">
>>>>>>> 2554ca11fd8b74d523c02519e7cecc2015a1a70e
<img src="log.png" width="460" height="250" alt="log"/>
</div>

Expand Down
2 changes: 1 addition & 1 deletion project/group_06/DilipTharuka.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<body style="background-color:82ab18;">

<h1 style="font-family:Comic Sans MS;color:white;text-align:center;font-size:72px"><b>PSD Solutions</b></h1>

<img src="smiley.gif" alt="Smiley face">

</body>
</html>
8 changes: 8 additions & 0 deletions project/group_06/Group_06.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,19 @@ <h1><a href="index.html"></a></h1>
<label><h3>Our Vission: </h3></label><br>
<label><h4>To provide a complete and efficient solution for our clients </h4></label>
<label><h3>Group Members: </h3></label><br><br>
<<<<<<< HEAD
<a href="Nipuna.html" target="_blank"><h4>Nipuna Sankalpa - 120339P</h4></a><br>
<a href="DiliniMampitiya.html" target="_blank"><h4>Dilini Mampitiya Arachchi - 120028L</h4></a><br>
<a href="pubudu.html" target="_blank"><h4>Pubudu Fernando - 120149H</h4></a><br>
<a href="Yasanka.html" target="_blank"><h4>Yasanka Jayawardena - 120268V</h4></a><br>
<a href="PSD-Solutions3.htm" target="_blank"><h4>Dilip Tharuka - 120300N</h4></a>
=======
<a href="PSD-Solutions2.htm"><h4>Nipuna Sankalpa - 120339P</h4></a><br>
<a href="DiliniMampitiya.html"><h4>Dilini Mampitiya Arachchi - 120028L</h4></a><br>
<a href="portfolio/pubudu.html"><h4>Pubudu Fernando - 120149H</h4></a><br>
<a href="Yasanka.html"><h4>Yasanka Jayawardena - 120268V</h4></a><br>
<a href="DilipTharuka.html"><h4>Dilip Tharuka - 120300N</h4></a>
>>>>>>> e0ed0f261e625addd34259e0608b128329c81fa2
</div>


Expand Down
170 changes: 170 additions & 0 deletions project/group_06/PSD-Solutions3.htm
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added ...es/1ef9a0_6f440afe82494fb19b2be82c76003546.jpg_srz_p_293_294_75_22_0.50_1.20_0.00_jpg_srz
View file
Open in desktop
Binary file not shown.
Binary file added ...es/1ef9a0_c1ff602b6d694556b0893c2179b610f0.png_srz_p_512_243_75_22_0.50_1.20_0.00_png_srz
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions project/group_06/PSD-Solutions3_files/bootstrap.min.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions project/group_06/PSD-Solutions3_files/c99d7f1ab0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NREUM.setToken(null)
6 changes: 6 additions & 0 deletions project/group_06/PSD-Solutions3_files/css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@font-face {
font-family: 'Anton';
font-style: normal;
font-weight: 400;
src: local('Anton'), url(http://fonts.gstatic.com/s/anton/v5/o-91-t7-bPc7W26HmS2N4Q.woff2) format('woff2'), url(http://fonts.gstatic.com/s/anton/v5/tilmJBBU81h1G7ZsdY3Hmw.woff) format('woff');
}
66 changes: 66 additions & 0 deletions project/group_06/PSD-Solutions3_files/dc.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions project/group_06/PSD-Solutions3_files/deployviewer.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading