Skip to content

GitLab

Commit 181010e4 authored by cdjemiel cdjemiel's avatar cdjemiel cdjemiel
Browse files

fix affix and jquery.venny.min.js problem

parent bc0b0dc9
Expand all Hide whitespace changes
Inline Side-by-side
documentation.html
View file @ 181010e4
......@@ -7,13 +7,13 @@
<title>Jquery.venny</title>
<!-- Le styles -->
<link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet" media="screen">
<style type="text/css">
<link href="http://twitter.github.io/bootstrap/assets/css/docs.css" rel="stylesheet" media="screen">
<!-- <style type="text/css">
body {
padding-top: 60px;
padding-bottom: 40px;
}
.bs-docs-sidenav {
} */
.bs-docs-sidenav {
width: 258px;
}
.bs-docs-sidenav {
......@@ -83,16 +83,16 @@
padding-right: 14px;
padding-top: 8px;
}
</style>
</style> -->
<link href="http://twitter.github.io/bootstrap/assets/js/google-code-prettify/prettify.css" rel="stylesheet" media="screen">
<link href="http://twitter.github.io/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet" media="screen">
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.0.4/js/bootstrap.min.js"></script>
<script src="http://twitter.github.io/bootstrap/assets/js/bootstrap-affix.js"></script>
<script src="http://twitter.github.io/bootstrap/assets/js/google-code-prettify/prettify.js"></script>
</head>
<body>
<body data-spy="scroll" data-target=".bs-docs-sidebar">
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
......@@ -116,8 +116,8 @@
</div>
<div class="container">
<div class="row">
<aside class="sidebar span3">
<ul class="nav nav-list bs-docs-sidenav" data-spy="affix" data-offset-top="150">
<div class="span3 bs-docs-sidebar">
<ul class="nav nav-list bs-docs-sidenav affix">
<li class="active"><a href="#plugin-insertion">plugin insertion</a></li>
<li><a href="#series">series</a></li>
<li><a href="#fnClickCallback">fnClickCallback</a></li>
......@@ -125,7 +125,7 @@
<li><a href="#useValues">useValues</a></li>
<li><a href="#exporting">exporting</a></li>
</ul>
</aside>
</div>
<div class="span9">
<section id="plugin-insertion">
......
example.html
View file @ 181010e4
......@@ -17,7 +17,7 @@
<link href="http://twitter.github.io/bootstrap/assets/css/bootstrap-responsive.css" rel="stylesheet" media="screen">
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.0.4/js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/jquery.venny.js"></script>
<script type="text/javascript" src="js/jquery.venny.min.js"></script>
<script language="Javascript">
$(document).ready(function () {
......@@ -203,9 +203,9 @@
<div class="row-fluid">
<div class="span12">
<div class="control-group success">
<input class="span6" id="name1" type="text" style="font-weight: bold;" value="List 1" maxlength="11" size="18" />
<input class="span6" id="name1" type="text" style="font-weight: bold;" value="List 1" maxlength="11"/>
<div class="controls controls-row">
<textarea class="span6" id="area1" wrap="off" rows="4"></textarea>
<textarea class="span10" id="area1" wrap="off" rows="4"></textarea>
<a class="btn btn-link" id="clear_1" href="javascript:void(0)">clear</a>
</div>
</div>
......@@ -214,9 +214,9 @@
<div class="row-fluid">
<div class="span12">
<div class="control-group info">
<input class="span6" id="name2" type="text" style="font-weight: bold;" value="List 2" maxlength="11" size="18" />
<input class="span6" id="name2" type="text" style="font-weight: bold;" value="List 2" maxlength="11"/>
<div class="controls controls-row">
<textarea class="span6" id="area2" wrap="off" rows="4"></textarea>
<textarea class="span10" id="area2" wrap="off" rows="4"></textarea>
<a class="btn btn-link" id="clear_2" href="javascript:void(0)">clear</a>
</div>
</div>
......@@ -225,9 +225,9 @@
<div class="row-fluid">
<div class="span12">
<div class="control-group error">
<input class="span6" id="name3" type="text" style="font-weight: bold;" value="List 3" maxlength="11" size="18" />
<input class="span6" id="name3" type="text" style="font-weight: bold;" value="List 3" maxlength="11"/>
<div class="controls controls-row">
<textarea class="span6" id="area3" wrap="off" rows="4"></textarea>
<textarea class="span10" id="area3" wrap="off" rows="4"></textarea>
<a class="btn btn-link" id="clear_3" href="javascript:void(0)">clear</a>
</div>
</div>
......@@ -236,9 +236,9 @@
<div class="row-fluid">
<div class="span12">
<div class="control-group warning">
<input class="span6" id="name4" type="text" style="font-weight: bold;" value="List 4" maxlength="11" size="18" />
<input class="span6" id="name4" type="text" style="font-weight: bold;" value="List 4" maxlength="11"/>
<div class="controls controls-row">
<textarea class="span6" id="area4" wrap="off" rows="4"></textarea>
<textarea class="span10" id="area4" wrap="off" rows="4"></textarea>
<a class="btn btn-link" id="clear_4" href="javascript:void(0)">clear</a>
</div>
</div>
......@@ -247,9 +247,9 @@
<div class="row-fluid">
<div class="span12">
<div class="control-group orange">
<input class="span6" id="name5" type="text" style="font-weight: bold;" value="List 5" maxlength="11" size="18" />
<input class="span6" id="name5" type="text" style="font-weight: bold;" value="List 5" maxlength="11"/>
<div class="controls controls-row">
<textarea class="span6" id="area5" wrap="off" rows="4"></textarea>
<textarea class="span10" id="area5" wrap="off" rows="4"></textarea>
<a class="btn btn-link" id="clear_5" href="javascript:void(0)">clear</a>
</div>
</div>
......
js/jquery.venny.js
View file @ 181010e4
......@@ -482,7 +482,7 @@
function addExportModule(div){
$t = div;
var div_export = '<div id="module-export" style="position: relative; left: 500px; top: -450px; width: 180px; height: 60px;">'
var div_export = '<div id="module-export" style="position: relative; left: 500px; top: -450px; width: 180px; height: 60px;">';
div_export += '<canvas id="canvasExport" width="30" height="20"></canvas>';
div_export += '<div id="menu" style="position: relative;width: 160px; height: 30px; display:none; left: 0px; top: 2px;">';
div_export += '<div style="box-shadow: 3px 3px 10px rgb(136, 136, 136); border: 1px solid rgb(160, 160, 160); background: none repeat scroll 0% 0% rgb(255, 255, 255);padding: 5px 0px;">';
......
js/jquery.venny.min.js
View file @ 181010e4
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment