Skip to content

Commit c68497c

Browse files
committed
Added menu
1 parent 875710d commit c68497c

File tree

10 files changed

+755
-8
lines changed

10 files changed

+755
-8
lines changed

_layouts/default.html

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,28 @@
1010
<link rel="icon" href="images/favicon.ico" type="image/x-icon"/>
1111

1212
<link rel="stylesheet" type="text/css" media="screen" href="css/stylesheet.css"/>
13+
<link rel="stylesheet" type="text/css" media="screen" href="css/menu.css"/>
1314
<link rel="stylesheet" type="text/css" media="screen" href="css/vd.css"/>
1415
<link rel="stylesheet" type="text/css" media="screen" href="css/toc.css"/>
1516

1617
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
1718
<script src="js/jquery.cookie.js"></script>
1819
<script src="js/jquery.tocLight.js"></script>
1920

21+
<!-- superfish -->
22+
<link rel="stylesheet" media="screen" href="css/superfish.css" />
23+
<script type="text/javascript" src="js/superfish/hoverIntent.js"></script>
24+
<script type="text/javascript" src="js/superfish/superfish.js"></script>
25+
<script type="text/javascript" src="js/superfish/supersubs.js"></script>
26+
<!-- ENDS superfish -->
27+
2028
<title>VisualDiffer - {{ page.title }}</title>
2129

2230
<script type="text/javascript">
2331
$(function() {
2432
$.toc.clickHideButton({saveShowStatus:true});
33+
$("ul.sf-menu").superfish({
34+
});
2535
});
2636
</script>
2737
</head>
@@ -33,10 +43,38 @@
3343
<header class="inner">
3444
<h1 id="project_title"><a href="index.html">VisualDiffer Wiki</a></h1>
3545
<h2 id="project_tagline">{{ page.title }}</h2>
36-
3746
</header>
3847
</div>
3948

49+
50+
<!-- Menu -->
51+
<div id="menu">
52+
<!-- ENDS menu-holder -->
53+
<div id="menu-holder">
54+
<!-- wrapper-menu -->
55+
<div class="wrapper">
56+
<!-- Navigation -->
57+
<ul class="sf-menu" id="nav">
58+
<li class="current-menu-item"><a href="index.html">Home</a></li>
59+
<li><a href="http://visualdiffer.com/mantis/my_view_page.php">Support</a></li>
60+
<li><a href="http://visualdiffer.com/">VisualDiffer Home</a></li>
61+
<li class="current">
62+
<a href="index.html">Other Apps</a>
63+
<ul>
64+
<li><a href="http://visualgrep.com">VisualGrep</a></li>
65+
<li><a href="https://itunes.apple.com/us/app/clipboardplain/id528607880?mt=12">Clipboard Plain</a></li>
66+
</ul>
67+
</li>
68+
</ul>
69+
<!-- Navigation -->
70+
</div>
71+
<!-- wrapper-menu -->
72+
</div>
73+
<!-- ENDS menu-holder -->
74+
</div>
75+
<!-- ENDS Menu -->
76+
77+
4078
<!-- MAIN CONTENT -->
4179
<div id="main_content_wrap" class="outer">
4280
<section id="main_content" class="inner">

comparisonMethods.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ The complete list of supported comparison methods
3030
<tr>
3131
<td>Compare file timestamps
3232
<br/>Very quick</td>
33-
<td>two file are identical if they have the same timestamp.
33+
<td>Two file are identical if they have the same timestamp.
3434
<br/>It is used the Unix <strong>last modified date</strong> for comparison.
3535
<br/>If file A timestamp is less than file B it is marked as <strong>older</strong> and it will be shown with different color.
3636
<br/>It is possible to set a span in seconds to consider two files with same timestamp, see below</td>
@@ -102,6 +102,12 @@ User can choose to not traverse special files like symbolic links and packages
102102
<td>If checked special OSX files (so called bundle or packages)
103103
<br/>like Applications and Frameworks will not be traversed</td>
104104
</tr>
105+
<tr>
106+
<td>Check Resource Forks</td>
107+
<td>Check if files are <a href="http://en.wikipedia.org/wiki/Resource_fork">resource forks</a>, this can slow down the comparison.<br/>
108+
When this option is on if the file is a resource fork its size is determined from its structured data.
109+
</td>
110+
</tr>
105111
</table>
106112

107113

css/menu.css

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
2+
/* MENU ------------------------------------------------------------*/
3+
4+
#menu{
5+
width: 100%;
6+
padding-top: 1px;
7+
margin-bottom: 0px;
8+
background: #f858ef;
9+
background: -webkit-gradient(linear, left top, right bottom, from(#EEEEFF), to(#008813));
10+
background: -moz-linear-gradient(left, #EEEEFF, #008813);
11+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f858ef', endColorstr='#ffe413', GradientType=1);
12+
}
13+
14+
#menu-holder{
15+
width: 100%;
16+
height: 49px;
17+
background: url(../images/menu-bg.png) repeat-x;
18+
}
19+
20+
.wrapper{
21+
width: 966px;
22+
margin: 0px auto;
23+
position: relative;
24+
}
25+
26+
/* NAVIGATION --------------------------------------------------------*/
27+
28+
29+
#nav{
30+
display: block;
31+
position: absolute;
32+
top: 0px;
33+
height: 49px;
34+
width: 906px;
35+
}
36+
37+
#nav>li{
38+
display: block;
39+
float:
40+
.wrapper{
41+
width: 966px;
42+
margin: 0px auto;
43+
position: relative;
44+
}
45+
left;
46+
height: 100%;
47+
margin-right: 32px;
48+
}
49+
50+
#nav>li:first-child{}
51+
52+
#nav>li>a{
53+
display: block;
54+
font-size: 16px;
55+
color: #bac0c9;
56+
text-decoration: none;
57+
margin-top: 20px;
58+
text-shadow: 0px -2px rgba(0, 0, 0, .8);
59+
}
60+
61+
#nav>li>a>span.subheader{
62+
display: block;
63+
font-size: 11px;
64+
color: #656b74;
65+
font-style: italic;
66+
margin-top: 10px;
67+
}
68+
69+
#nav>li.current-menu-item{
70+
background: url(../images/menu-arrow.png) no-repeat center bottom;
71+
}
72+
73+
74+
#nav>li:hover>a{
75+
color: #fff;
76+
}
77+
78+
/* sub navigation */
79+
80+
#nav>li ul{
81+
display: block;
82+
margin-top: 33px;
83+
background: #1d2023;
84+
border-radius: 0px 10px 0px 10px;
85+
-moz-border-radius: 0px 0px 10px 10px;
86+
-webkit-border-radius: 0px 0px 10px 10px;
87+
88+
-webkit-box-shadow: 0px 3px 2px rgba(0,0,0,0.4);
89+
-moz-box-shadow: 0px 3px 2px rgba(0,0,0,0.4);
90+
box-shadow: 0px 3px 2px rgba(0,0,0,0.4);
91+
}
92+
93+
#nav>li>ul ul{
94+
margin-top: 0px;
95+
border-radius: 0px 10px 10px 10px;
96+
-moz-border-radius: 0px 10px 10px 10px;
97+
-webkit-border-radius: 0px 10px 10px 10px;
98+
}
99+
100+
#nav>li ul li a{
101+
display: block;
102+
padding: 10px 15px;
103+
display: block;
104+
font-size: 11px;
105+
color: #bac0c9;
106+
text-decoration: none;
107+
}
108+
109+
#nav>li ul li a span{
110+
display: block;
111+
}
112+
113+
#nav>li ul li a:hover{
114+
background: #000;
115+
color: #fff;
116+
}
117+
118+
#nav>li ul li:last-child a:hover{ /* last item its rounded at bottom */
119+
border-radius: 0px 0px 10px 10px;
120+
-moz-border-radius: 0px 0px 10px 10px;
121+
-webkit-border-radius: 0px 0px 10px 10px;
122+
}

css/stylesheet.css

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,6 @@ form {
263263
padding: 20px;
264264
}
265265

266-
/*img {
267-
width: 100%;
268-
max-width: 100%;
269-
}
270-
*/
271266
/*******************************************************************************
272267
Full-Width Styles
273268
*******************************************************************************/
@@ -318,11 +313,11 @@ Full-Width Styles
318313
background: none;
319314
text-shadow: #111 0px 0px 10px;
320315
margin: 0;
316+
padding-bottom: 4px;
321317
}
322318

323319
#main_content_wrap {
324320
background: #f2f2f2;
325-
border-top: 1px solid #111;
326321
border-bottom: 1px solid #111;
327322
padding-bottom: 5px;
328323
}

css/superfish.css

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
/*** ESSENTIAL STYLES ***/
2+
.sf-menu, .sf-menu * {
3+
margin: 0;
4+
padding: 0;
5+
list-style: none;
6+
}
7+
.sf-menu li {
8+
position: relative;
9+
}
10+
.sf-menu ul {
11+
position: absolute;
12+
display: none;
13+
top: 100%;
14+
left: 0;
15+
z-index: 99;
16+
}
17+
.sf-menu > li {
18+
float: left;
19+
}
20+
.sf-menu li:hover > ul,
21+
.sf-menu li.sfHover > ul {
22+
display: block;
23+
}
24+
25+
.sf-menu a {
26+
display: block;
27+
position: relative;
28+
}
29+
.sf-menu ul ul {
30+
top: 0;
31+
left: 100%;
32+
}
33+
34+
35+
/*** VisualDiffer SKIN ***/
36+
37+
.sf-menu, .sf-menu * {
38+
margin: 0;
39+
padding: 0;
40+
list-style: none;
41+
}
42+
.sf-menu {
43+
line-height: 1.0;
44+
}
45+
.sf-menu ul {
46+
position: absolute;
47+
width: 10em; /* left offset of submenus need to match (see below) */
48+
}
49+
.sf-menu ul li {
50+
width: 100%;
51+
}
52+
.sf-menu li:hover {
53+
visibility: inherit; /* fixes IE7 'sticky bug' */
54+
}
55+
.sf-menu li {
56+
float: left;
57+
position: relative;
58+
}
59+
.sf-menu a {
60+
display: block;
61+
position: relative;
62+
}
63+
.sf-menu li:hover ul,
64+
.sf-menu li.sfHover ul {
65+
left: 0;
66+
top: 0.95em; /* match top ul list item height */
67+
z-index: 99;
68+
}
69+
ul.sf-menu li:hover li ul,
70+
ul.sf-menu li.sfHover li ul {
71+
top: -999em;
72+
}
73+
ul.sf-menu li li:hover ul,
74+
ul.sf-menu li li.sfHover ul {
75+
left: 10em; /* match ul width */
76+
top: 0;
77+
}
78+
ul.sf-menu li li:hover li ul,
79+
ul.sf-menu li li.sfHover li ul {
80+
top: -999em;
81+
}
82+
ul.sf-menu li li li:hover ul,
83+
ul.sf-menu li li li.sfHover ul {
84+
left: 10em; /* match ul width */
85+
top: 0;
86+
}
87+
88+
/*** arrows (for all except IE7) **/
89+
.sf-arrows .sf-with-ul {
90+
padding-right: 2.5em;
91+
*padding-right: 1em; /* no CSS arrows for IE7 (lack pseudo-elements) */
92+
}
93+
/* styling for both css and generated arrows */
94+
.sf-arrows .sf-with-ul:after {
95+
content: '';
96+
position: absolute;
97+
top: 50%;
98+
right: 1em;
99+
margin-top: -3px;
100+
height: 0;
101+
width: 0;
102+
/* order of following 3 rules important for fallbacks to work */
103+
border: 5px solid transparent;
104+
border-top-color: #dFeEFF; /* edit this to suit design (no rgba in IE8) */
105+
border-top-color: rgba(255,255,255,.5);
106+
}
107+
.sf-arrows > li > .sf-with-ul:focus:after,
108+
.sf-arrows > li:hover > .sf-with-ul:after,
109+
.sf-arrows > .sfHover > .sf-with-ul:after {
110+
border-top-color: white; /* IE8 fallback colour */
111+
}
112+
/* styling for right-facing arrows */
113+
.sf-arrows ul .sf-with-ul:after {
114+
margin-top: -5px;
115+
margin-right: -3px;
116+
border-color: transparent;
117+
border-left-color: #dFeEFF; /* edit this to suit design (no rgba in IE8) */
118+
border-left-color: rgba(255,255,255,.5);
119+
}
120+
.sf-arrows ul li > .sf-with-ul:focus:after,
121+
.sf-arrows ul li:hover > .sf-with-ul:after,
122+
.sf-arrows ul .sfHover > .sf-with-ul:after {
123+
border-left-color: white;
124+
}

images/menu-arrow.png

202 Bytes
Loading

images/menu-bg.png

126 Bytes
Loading

0 commit comments

Comments
 (0)