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
=== modified file 'Code Viewer Alt/index.html'
--- Code Viewer Alt/index.html 2013-04-03 12:25:58 +0000
+++ Code Viewer Alt/index.html 2013-04-04 09:13:23 +0000
@@ -3,7 +3,7 @@
3<head>3<head>
4 <title>Webbprogrammering DA330G</title>4 <title>Webbprogrammering DA330G</title>
5 <link rel="stylesheet" href="style.css" type="text/css" />5 <link rel="stylesheet" href="style.css" type="text/css" />
6 <script type="text/javascript" src="../js/jquery-1.8.2.min.js"></script> 6 <script type="text/javascript" src="../js/jquery.js"></script>
7 <script type="text/javascript" src="index.js"></script>7 <script type="text/javascript" src="index.js"></script>
8</head>8</head>
9<body>9<body>
@@ -11,7 +11,7 @@
11 <div id="menu">11 <div id="menu">
12 <div id="menuHeader">12 <div id="menuHeader">
13 <h3>Quick links</h3>13 <h3>Quick links</h3>
14 <img id="menuArrow" class="arrow" src="img/menuArrow.png" alt="arrow" />14 <img id="menuArrow" class="arrow" src="../media/codeviewer/CodeViewerLeftbutton.png" alt="arrow" />
15 </div>15 </div>
16 <div id="menuItems">16 <div id="menuItems">
17 <a href="javascript" class="menuLink">JavaScript</a>17 <a href="javascript" class="menuLink">JavaScript</a>
1818
=== modified file 'Code Viewer Alt/index.js'
--- Code Viewer Alt/index.js 2013-04-03 12:25:58 +0000
+++ Code Viewer Alt/index.js 2013-04-04 09:13:23 +0000
@@ -2,7 +2,7 @@
2var menuLeftOffset = 25;2var menuLeftOffset = 25;
33
4$(document).ready(function() {4$(document).ready(function() {
5 window.onresize = fixMenuLeft;5// window.onresize = fixMenuLeft;
6 //$('#menu').offset({ top: menuTopOffset, left: $('#menu').offset().left });6 //$('#menu').offset({ top: menuTopOffset, left: $('#menu').offset().left });
7 //window.onscroll = moveMenu;7 //window.onscroll = moveMenu;
8 $('#menuHeader').click(toggleMenu);8 $('#menuHeader').click(toggleMenu);
@@ -12,6 +12,10 @@
12 var destination = event.target.href.substring(event.target.href.lastIndexOf('/') + 1);12 var destination = event.target.href.substring(event.target.href.lastIndexOf('/') + 1);
13 scrollTo(destination);13 scrollTo(destination);
14 });14 });
15 var sidebar = $('#sidebar');
16 $(document).bind('scroll', function() {
17 sidebar.css("top", $(window).scrollTop());
18 });
15});19});
1620
17function fixMenuLeft(ev) {21function fixMenuLeft(ev) {
@@ -23,10 +27,10 @@
2327
24function toggleMenu(ev) {28function toggleMenu(ev) {
25 if($('#menu').offset().left == 0) {29 if($('#menu').offset().left == 0) {
26 $('#menu').animate({ left: -($('#menu').width()-menuLeftOffset) },{duration:900});30 $('#menu').stop().animate({ left: -($('#menu').width()-menuLeftOffset) },{duration:900});
27 $("#menuArrow").addClass("rotateArrowCW");31 $("#menuArrow").addClass("rotateArrowCW");
28 } else {32 } else {
29 $('#menu').animate({ left: 0 },{duration:900});33 $('#menu').stop().animate({ left: 0 },{duration:900});
30 $("#menuArrow").removeClass("rotateArrowCW");34 $("#menuArrow").removeClass("rotateArrowCW");
31 }35 }
32}36}
3337
=== modified file 'Code Viewer Alt/style.css'
--- Code Viewer Alt/style.css 2013-04-03 08:51:28 +0000
+++ Code Viewer Alt/style.css 2013-04-04 09:13:23 +0000
@@ -72,9 +72,11 @@
72}72}
7373
74#menu {74#menu {
75 position:fixed;75 position:absolute;
76 top:40px;76 top:40px;
77 left:0px;
77 width:10.5%;78 width:10.5%;
79 width:96%;
78 padding: 10px 0 1% 0.3%;80 padding: 10px 0 1% 0.3%;
79 background: #c0d0e0;81 background: #c0d0e0;
80 background-color: #c0d0e0;82 background-color: #c0d0e0;
@@ -99,7 +101,8 @@
99 height:31px;101 height:31px;
100 padding-left:10px;102 padding-left:10px;
101 margin-left:-10px;103 margin-left:-10px;
102 border-radius: 0 10px 10px 0104 border-radius: 0 10px 10px 0;
105 cursor:pointer;
103}106}
104107
105#menuHeader h3{108#menuHeader h3{
@@ -139,15 +142,21 @@
139}142}
140143
141#sidebar {144#sidebar {
145 position:absolute;
146 left:0px;
147 top:0px;
142 float:left;148 float:left;
143 min-width:11%;149 min-width:8em;
144 min-height:100px;150 width:auto;
151 height:100%;
145 overflow:auto;152 overflow:auto;
146}153}
147154
148#content {155#content {
149 float:left;156 position:absolute;
150 width:75%;157 left:8em;
158 max-width:75%;
159 min-width:20em;
151}160}
152161
153.arrow{162.arrow{

Subscribers

People subscribed via source and target branches

to all changes: