LenaSYS

Merge lp:~adamringhede/lenasys/branch into lp:~lenasysimpl1/lenasys/TheBugSquad

  1. branch
  2. Merge into TheBugSquad
Proposed by Adam Ringhede
Status: Merged
Merge reported by: Victor Nagy
Merged at revision: not available
Proposed branch: lp:~adamringhede/lenasys/branch
Merge into: lp:~lenasysimpl1/lenasys/TheBugSquad
Diff against target: 112 lines (+25/-12)
3 files modified
Code Viewer Alt/index.html (+2/-2)
Code Viewer Alt/index.js (+7/-3)
Code Viewer Alt/style.css (+16/-7)
To merge this branch: bzr merge lp:~adamringhede/lenasys/branch
Reviewer Review Type Date Requested Status
GammaBjörn Pending
Review via email: mp+157054@code.launchpad.net
To post a comment you must log in.
lp:~adamringhede/lenasys/branch updated
13. By Gustav Hartvigsson <email address hidden>

merged. critial, due to files became missing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Code Viewer Alt/index.html'
2--- Code Viewer Alt/index.html 2013-04-03 12:25:58 +0000
3+++ Code Viewer Alt/index.html 2013-04-04 09:13:23 +0000
4@@ -3,7 +3,7 @@
5 <head>
6 <title>Webbprogrammering DA330G</title>
7 <link rel="stylesheet" href="style.css" type="text/css" />
8- <script type="text/javascript" src="../js/jquery-1.8.2.min.js"></script>
9+ <script type="text/javascript" src="../js/jquery.js"></script>
10 <script type="text/javascript" src="index.js"></script>
11 </head>
12 <body>
13@@ -11,7 +11,7 @@
14 <div id="menu">
15 <div id="menuHeader">
16 <h3>Quick links</h3>
17- <img id="menuArrow" class="arrow" src="img/menuArrow.png" alt="arrow" />
18+ <img id="menuArrow" class="arrow" src="../media/codeviewer/CodeViewerLeftbutton.png" alt="arrow" />
19 </div>
20 <div id="menuItems">
21 <a href="javascript" class="menuLink">JavaScript</a>
22
23=== modified file 'Code Viewer Alt/index.js'
24--- Code Viewer Alt/index.js 2013-04-03 12:25:58 +0000
25+++ Code Viewer Alt/index.js 2013-04-04 09:13:23 +0000
26@@ -2,7 +2,7 @@
27 var menuLeftOffset = 25;
28
29 $(document).ready(function() {
30- window.onresize = fixMenuLeft;
31+// window.onresize = fixMenuLeft;
32 //$('#menu').offset({ top: menuTopOffset, left: $('#menu').offset().left });
33 //window.onscroll = moveMenu;
34 $('#menuHeader').click(toggleMenu);
35@@ -12,6 +12,10 @@
36 var destination = event.target.href.substring(event.target.href.lastIndexOf('/') + 1);
37 scrollTo(destination);
38 });
39+ var sidebar = $('#sidebar');
40+ $(document).bind('scroll', function() {
41+ sidebar.css("top", $(window).scrollTop());
42+ });
43 });
44
45 function fixMenuLeft(ev) {
46@@ -23,10 +27,10 @@
47
48 function toggleMenu(ev) {
49 if($('#menu').offset().left == 0) {
50- $('#menu').animate({ left: -($('#menu').width()-menuLeftOffset) },{duration:900});
51+ $('#menu').stop().animate({ left: -($('#menu').width()-menuLeftOffset) },{duration:900});
52 $("#menuArrow").addClass("rotateArrowCW");
53 } else {
54- $('#menu').animate({ left: 0 },{duration:900});
55+ $('#menu').stop().animate({ left: 0 },{duration:900});
56 $("#menuArrow").removeClass("rotateArrowCW");
57 }
58 }
59
60=== modified file 'Code Viewer Alt/style.css'
61--- Code Viewer Alt/style.css 2013-04-03 08:51:28 +0000
62+++ Code Viewer Alt/style.css 2013-04-04 09:13:23 +0000
63@@ -72,9 +72,11 @@
64 }
65
66 #menu {
67- position:fixed;
68+ position:absolute;
69 top:40px;
70+ left:0px;
71 width:10.5%;
72+ width:96%;
73 padding: 10px 0 1% 0.3%;
74 background: #c0d0e0;
75 background-color: #c0d0e0;
76@@ -99,7 +101,8 @@
77 height:31px;
78 padding-left:10px;
79 margin-left:-10px;
80- border-radius: 0 10px 10px 0
81+ border-radius: 0 10px 10px 0;
82+ cursor:pointer;
83 }
84
85 #menuHeader h3{
86@@ -139,15 +142,21 @@
87 }
88
89 #sidebar {
90+ position:absolute;
91+ left:0px;
92+ top:0px;
93 float:left;
94- min-width:11%;
95- min-height:100px;
96+ min-width:8em;
97+ width:auto;
98+ height:100%;
99 overflow:auto;
100 }
101
102-#content {
103- float:left;
104- width:75%;
105+#content {
106+ position:absolute;
107+ left:8em;
108+ max-width:75%;
109+ min-width:20em;
110 }
111
112 .arrow{

Subscribers

People subscribed via source and target branches

to all changes: