Skip to content

Commit f6034cd

Browse files
GoldteanGoldtean
committed
Nav polish
1 parent 3c1f514 commit f6034cd

13 files changed

+85
-74
lines changed

‎IMG_0425.JPG

-44.6 KB
Loading

‎IMG_0428.JPG

-12.4 KB
Loading

‎IMG_8199.JPG

-18.5 KB
Loading

‎css/custom.css

+32-8
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,60 @@
22
border: 1px dashed red;
33
}*/
44

5-
65
@media screen and (min-width: 768px) {
76
.rocco-wear-brand {
8-
display: none;
7+
color: white !important;
8+
display: none;
9+
/*pointer-events: none;
10+
cursor: default;*/
11+
}
12+
#gander-again-id {
13+
display: none;
14+
}
15+
* {
16+
font-size: 20px !important;
917
}
18+
a {
19+
font-size: 13px !important;
20+
}
21+
}
22+
23+
@media screen and (min-width: 1200px) {
1024
* {
11-
font-size: 15px;
25+
font-size: 20px !important;
26+
}
27+
a {
28+
font-size: 20px !important;
1229
}
1330
}
1431

1532
#the-goods {
16-
margin-top: 25%;
33+
margin-top: 10%;
34+
margin-bottom: 10%;
1735
display: none;
1836
}
1937

2038
#gimmie-the-goods {
21-
margin-top: 25%;
39+
margin-top: 10%;
40+
margin-bottom: 10%;
2241
display: none;
2342
}
2443

2544
#who-makes-this-stuff {
2645
margin-top: 10%;
2746
display: none;
2847
vertical-align: middle;
48+
margin-bottom: 10%;
49+
2950
}
3051

3152
#have-a-gander {
32-
margin-top: 7%;
53+
margin-bottom: 10%;
3354
display: none;
3455
}
3556

3657
* {
37-
font-size: 20px;
58+
font-size: 15px;
3859
}
3960

4061
ul {
@@ -49,12 +70,15 @@ ul {
4970
/*.rocco-menu {
5071
margin-top: 50%;
5172
}*/
73+
.footer {
74+
vertical-align: middle;
75+
}
5276

5377
a {
5478
font-weight: bold;
5579
color: black;
5680
text-decoration: none;
57-
font-size: 15px;
81+
font-size: 13px;
5882

5983
}
6084

‎img/jo.jpg

3.22 KB
Loading

‎img/js.jpg

39.1 KB
Loading

‎img/mo.jpg

19.7 KB
Loading

‎img/ro.jpg

67 KB
Loading

‎index.html

+45-63
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta name="description" content="Rocco Wear scarves blankets hats hand made in Canada">
9-
<meta name="Ieronim Oltean IMMIGRANT Wed Development" content="Rocco Wear">
9+
<meta name="Ieronim Oltean IMMIGRANT Wed Development" content="Rocco Wear Scarves Blankets Hats Beanies Wool Cotton Hand Made">
1010
<!-- R Icon -->
1111
<link rel="shortcut icon" href="ico/patch.ico">
1212

@@ -19,91 +19,70 @@
1919

2020
</head>
2121
<body>
22-
<!-- FB -->
23-
<script>
24-
window.fbAsyncInit = function() {
25-
FB.init({
26-
appId : '172532579816613',
27-
xfbml : true,
28-
version : 'v2.6'
29-
});
30-
};
31-
32-
(function(d, s, id){
33-
var js, fjs = d.getElementsByTagName(s)[0];
34-
if (d.getElementById(id)) {return;}
35-
js = d.createElement(s); js.id = id;
36-
js.src = "https://connect.facebook.net/en_US/sdk.js";
37-
fjs.parentNode.insertBefore(js, fjs);
38-
}(document, 'script', 'facebook-jssdk'));
39-
</script>
4022
<!-- Gander -->
4123
<script type="text/javascript">
4224
numArray = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17", "18", "19", "20", "21", "22", "23","24","25","26"];
4325
count = 0;
4426
var getRandom = function () {
45-
4627
bangnum = function () {
4728
num = Math.floor(Math.random() * numArray.length);
4829
return numArray[num]
4930
};
50-
51-
var imgTag = '<img src="wireframe/RoccoLogoPhotoBook' + bangnum() + '.jpg" class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12 img-responsive" id="gander-pic">';
31+
var imgTag = '<img src="wireframe/RoccoLogoPhotoBook' + bangnum() + '.jpg" class="links col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12 img-responsive" id="gander-pic">';
5232

5333
if (numArray.length > 1) {
54-
document.getElementById('gander-again-id').innerHTML = 'Gander Again';
55-
document.getElementById('hag').innerHTML = 'GANDER AGAIN';
56-
34+
document.getElementById('gander-again-id').innerHTML = 'HAVE ANOTHER GANDER';
35+
document.getElementById('hag').innerHTML = 'HAVE ANOTHER GANDER';
5736
return imgTag;
5837
}
5938
else {
6039
count++;
6140
if (count == 1) {
6241
document.getElementById('gander-again-id').innerHTML = 'I THINK YOU\'VE HAD ENOUGH.';
6342
document.getElementById('hag').innerHTML = 'I THINK YOU\'VE HAD ENOUGH.';
64-
43+
return '<img src="wireframe/gander1.jpeg" class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12 img-responsive" id="gander-pic">';
6544
}
6645
else if (count == 2) {
6746
document.getElementById('gander-again-id').innerHTML = 'DAMNIT, I SAID YOU\'VE GANDERED ENOUGH!';
6847
document.getElementById('hag').innerHTML = 'DAMNIT, I SAID YOU\'VE GANDERED ENOUGH!';
48+
return '<img src="wireframe/gander2.jpeg" class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12 img-responsive" id="gander-pic">';
6949
}
7050
else if (count == 3) {
7151
document.getElementById('gander-again-id').innerHTML = 'FINE! I\'LL REWIND THE DAMN TAPE!';
7252
document.getElementById('hag').innerHTML = 'FINE! I\'LL REWIND THE DAMN TAPE!';
7353
count = 0;
7454
numArray = ["1","2","3","4","5","6","7","8","9","10","11","12","13","14","15","16","17", "18", "19", "20", "21", "22", "23","24","25","26"];
75-
7655
}
7756
}
7857
}
7958
</script>
80-
81-
<nav class="navbar">
82-
<div class="container">
83-
<div class="navbar-header">
84-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
85-
<span class="sr-only">Toggle navigation</span>
86-
<span class="icon-bar"></span>
87-
<span class="icon-bar"></span>
88-
<span class="icon-bar"></span>
89-
</button>
90-
<a class="navbar-brand rocco-wear-brand" href="#">ROCCO WEAR</a>
91-
</div>
92-
<div id="navbar-collapse-1" class="menu navbar-middle collapse navbar-collapse col-xs-12 col-sm-12 col-md-12 col-lg-12">
93-
<ul class="nav navbar-nav">
94-
<li class="links"><a id="tg" href="#">THE GOODS</a></li>
95-
<li class="links"><a id="gtg" href="#">GIMMIE THE GOODS!</a></li>
96-
<li class="links"><a id="wmts" href="#">WHO MAKES THIS STUFF?</a></li>
97-
<li class="links"><a id="hag" href="#">HAVE A GANDER</a></li>
98-
</ul>
99-
</div>
100-
</div>
101-
</nav>
102-
59+
<!-- Navbar -->
60+
<nav class="navbar">
61+
<div class="container">
62+
<div class="navbar-header">
63+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
64+
<span class="sr-only">Toggle navigation</span>
65+
<span class="icon-bar"></span>
66+
<span class="icon-bar"></span>
67+
<span class="icon-bar"></span>
68+
</button>
69+
<a class="navbar-brand rocco-wear-brand" data-toggle="collapse" data-target="#navbar-collapse-1" href="#">ROCCO WEAR</a>
70+
</div>
71+
<div id="navbar-collapse-1" class="menu collapse navbar-collapse col-xs-12 col-sm-12 col-md-12 col-lg-12">
72+
<ul class="nav navbar-nav">
73+
<li class="links"><a id="tg" href="#">THE GOODS</a></li>
74+
<li class="links"><a id="gtg" href="#">GIMMIE THE GOODS!</a></li>
75+
<li class="links"><a id="wmts" href="#">WHO MAKES THIS STUFF?</a></li>
76+
<li class="links"><a id="hag" href="#">HAVE A GANDER</a></li>
77+
</ul>
78+
</div>
79+
</div>
80+
</nav>
81+
<!-- This is where shit gets real -->
10382
<div class="container">
10483
<div class="row">
10584
<!-- Logo SM MD LG XL -->
106-
<div class="hidden-xs hidden-sm col-xs-12 col-sm-12 col-md-6 col-lg-6"><a data-toggle="modal" href="#myModal1" class="btn"><img class="img-responsive" src="img/rwlogo.png"></a></div>
85+
<div class="hidden-xs hidden-sm col-xs-12 col-sm-12 col-md-6 col-lg-6"><a href="#" class="btn"><img class="rocco-top img-responsive" src="img/rwlogo.png"></a></div>
10786

10887
<!-- Content -->
10988
<div id="stuff" class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -112,15 +91,15 @@
11291
<br>
11392
<br>
11493
<br>
115-
<button href="https://www.etsy.com/ca/shop/RoccoWear?ref=pr_shop_more#items" class="btn btn-default"><i class="fa fa-shopping-bag"></i> | Shop Rocco Wear</button>
94+
<a href="https://www.etsy.com/ca/shop/RoccoWear?ref=pr_shop_more#items" class="btn btn-default"><i class="fa fa-shopping-bag"></i> | Shop Rocco Wear</a>
11695
</div>
11796

11897
<div id="gimmie-the-goods" class="content text-center">
119-
<p>Get a hold of me!</p>
120-
<button href="tel://1-778-321-7699" class="btn btn-lg btn-default"><i class="fa fa-volume-control-phone"></i> | 778-321-7699</button>
121-
<button href="" class="btn btn-lg btn-default"><i class="fa fa-envelope"></i> | Email</button>
122-
<button href="https://www.facebook.com/Rocco-Wear-183259421721047/" class="btn btn-lg btn-default"><i class="fa fa-facebook"></i> | Facebook</button>
123-
<button href="https://www.etsy.com/ca/shop/RoccoWear?ref=pr_shop_more#items" class="btn btn-lg btn-default"><i class="fa fa-shopping-bag"></i> | Shop Rocco Wear</button>
98+
<p>Get a hold of Rocco Wear!</p>
99+
<a href="tel://1-778-321-7699" class="btn btn-lg btn-default"><i class="fa fa-volume-control-phone"></i> | 778-321-7699</a><br>
100+
<a href="#" class="btn btn-lg btn-default"><i class="fa fa-envelope"></i> | Email</a>
101+
<a href="https://www.facebook.com/Rocco-Wear-183259421721047/" class="btn btn-lg btn-default"><i class="fa fa-facebook"></i> | Facebook</a><br>
102+
<a href="https://www.etsy.com/ca/shop/RoccoWear?ref=pr_shop_more#items" class="btn btn-lg btn-default"><i class="fa fa-shopping-bag"></i> | Shop Rocco Wear</a><br>
124103
</div>
125104

126105
<div id="who-makes-this-stuff" class="content text-center">
@@ -153,18 +132,21 @@
153132
</div>
154133

155134
<div id="have-a-gander" class="content text-center">
156-
<div><a id="gander-again-id" class="links btn btn-default visible-xs" href="#">Gander Again</a></div>
135+
<div><a id="gander-again-id" class="links btn btn-default" href="#">HAVE ANOTHER GANDER</a></div>
157136
<!-- Script for hacker eyes only -->
158137
</div>
159-
<!-- Logo XS -->
160-
<div class="visible-xs visible-sm col-xs-12 col-sm-12 col-md-6 col-lg-6"><a data-toggle="modal" href="#myModal1" class="btn"><img class="img-responsive" src="img/rwlogo.png"></a></div>
161-
</div>
138+
139+
</div> <!-- Content / Stuff -->
140+
</div> <!-- Row -->
141+
</div> <!-- Container -->
162142

143+
<div class="container">
144+
<div class="row text-center footer">
145+
<!-- Logo XS -->
146+
<div class="visible-xs visible-sm col-xs-12 col-sm-12 col-md-6 col-lg-6"><a href="#" class="btn"><img class="img-responsive rocco-bottom" src="img/rwlogo.png"></a></div>
163147
</div>
164-
165148
</div>
166149

167-
168150
<!-- jQuery -->
169151
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
170152
<!-- Bootstrap Core JavaScript -->

‎js/immigrant.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ $(document).ready(function () {
44
$('.links').on('click', '#wmts', whoMakesThisStuff);
55
$('.links').on('click', '#hag', haveAGander);
66
$('#have-a-gander').on('click', '.links', ganderAgain);
7+
$('.rocco-top').on('click', haveAGander);
8+
$('.rocco-bottom').on('click', clearToLogo);
79
});
810

911
var theGoods = function(event) {
@@ -33,19 +35,22 @@ var haveAGander = function(event) {
3335
numArray.splice(num, 1);
3436
}
3537

36-
37-
3838
var ganderAgain = function () {
3939
event.preventDefault();
4040
$('#gander-pic').remove();
4141
$("#have-a-gander").append(getRandom());
4242
$("#have-a-gander").show();
4343
numArray.splice(num, 1);
44+
}
4445

46+
var clearToLogo = function() {
47+
event.preventDefault();
48+
$('#gander-pic').remove();
49+
$(".content").hide();
50+
$('#have-a-gander').hide();
4551
}
4652

4753
// Close Menu In XS After Selection
48-
4954
$(function () {
5055
$('.navbar-collapse ul li a:not(.dropdown-toggle)').bind('click touchstart', function () {
5156
$('.navbar-toggle:visible').click();

‎wireframe/RoccoLogoPhotoBook3.jpg

-50.7 KB
Loading

‎wireframe/gander1.jpeg

551 KB
Loading

‎wireframe/gander2.jpeg

676 KB
Loading

0 commit comments

Comments
 (0)