Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed main menu by removing unnecessary HTML #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed main menu by removing unnecessary HTML #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3bef8e
Fixed main menu by removing unnecessary HTML
JaimeVelasco Mar 13, 2016
93cacb2
More cleaning up
JaimeVelasco Mar 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .ReadMe.md.swp
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion client/bike_antonio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

<main class="cd-content">
<!-- your content here -->
<img src="/img/groupset_logo_crankset.png" alt="">
<img src="/img/groupset_logo_crankset.png" alt="Logo" height="70px">
<div class="cd-intro">
<h3>GroupsetSA is a web-based resource for bicycle commuters and others using San Antonio's streets and trails for alternative transportation.</h3>
</div>
Expand All @@ -50,6 +50,10 @@ <h3>GroupsetSA is a web-based resource for bicycle commuters and others using Sa
<h1>please login to see map</h1>
{{/if}} -->

<section>
{{> resources}}
</section>


</main> <!-- cd-content -->

Expand Down
24 changes: 0 additions & 24 deletions client/bike_resource.css
View file
Open in desktop

This file was deleted.

105 changes: 24 additions & 81 deletions client/bike_resource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,106 +1,49 @@
<template name="resources">
<!-- BS container -->
<div class="resources">


<head>

<title>bike SA resources</title>

<meta charset="utf8">
<!-- Nav Heading for page -->

<!-- boostrap files -->

<!-- mobile scaling -->
<meta name="viewport" content="width=device-width, initial-scale=1">
<div class="row">
<div class="col-xs-12"><h1>Biking Resources</h1></div>
</div>


<!-- BS files -->
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
<div class="row">
<div class= "col-xs-12">
<ul>

<li><h2>Resource Type 1</h2></li>
<li><h2>Resource Type 2</h2></li>
<li><h2>Resource Type 3</h2></li>

</ul>

<!-- personal style files -->

<link rel="stylesheet" type="text/css" href="bike_resource.css">


</head>



<body>
<!-- BS container -->
<div class="container-fluid">


<!-- Nav Heading for page -->

<div class="row">
<div class="col-xs-12"><h1>Biking Resources</h1></div>
</div>


<div class="row">
<div class= "col-xs-12">
<ul>

<li><h2>Resource Type 1</h2></li>
<li><h2>Resource Type 2</h2></li>
<li><h2>Resource Type 3</h2></li>

</ul>

</div>
</div>


<div class= "row">

<div class= "col-md-4"><h4><a href="http://www.mapmyride.com/us/san-antonio-tx/" target="_blank">Map My Ride - San Antonio Cycling Trails</a></h4></div>




<div class= "col-md-4"><h4><a href="http://www.traillink.com/cityactivity/san-antonio-tx-bike-trails.aspx" target="_blank">TrailLink - San Antonio Bike Trails and Maps</a></h4></div>


<div class= "col-md-4"><h4><a href="./03-BikeNetwork.pdf" target="_blank">San Antonio Bike Plan 2011</a></h4></div>
</div>


<div class= "col-md-4"><h4><a href="https://www.sanantonio.gov/council">Contact your local representative</a></h4></div>

<div class= "row">

</div>
<div class= "col-md-4"><h4><a href="http://www.mapmyride.com/us/san-antonio-tx/" target="_blank">Map My Ride - San Antonio Cycling Trails</a></h4></div>


</div>

<!-- BS container ends here -->

<!-- BS javascript files -->
<script src="//code.jquery.com/jquery-1.11.3.min.js"></script>
<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
<div class= "col-md-4"><h4><a href="http://www.traillink.com/cityactivity/san-antonio-tx-bike-trails.aspx" target="_blank">TrailLink - San Antonio Bike Trails and Maps</a></h4></div>

</body>

<div class= "col-md-4"><h4><a href="./03-BikeNetwork.pdf" target="_blank">San Antonio Bike Plan 2011</a></h4></div>

<!-- notes from our meeting

add the following:
1- bike shops
2- night rides
3- other bike orginaization
4- map from mike
strava - you should check it out: https://www.strava.com/ maybe check out the api (whatever that means...)

kbkb

-->
<div class= "col-md-4"><h4><a href="https://www.sanantonio.gov/council">Contact your local representative</a></h4></div>

<!-- notes from the next meeting

look at more resources
have navagation function on the phone

</div>


-->
</div>

<!-- BS container ends here -->
</template>
25 changes: 0 additions & 25 deletions client/stylesheets/bike_resource.css
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions client/stylesheets/partials/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//scss-lint:disable NameFormat

// breakpoints
$S: 480px;
$M: 768px;
Expand All @@ -8,11 +10,9 @@ $L: 1170px;
@mixin MQ($canvas) {
@if $canvas == S {
@media only screen and (min-width: $S) { @content; }
}
@else if $canvas == M {
}@else if $canvas == M {
@media only screen and (min-width: $M) { @content; }
}
@else if $canvas == L {
}@else if $canvas == L {
@media only screen and (min-width: $L) { @content; }
}
}
13 changes: 6 additions & 7 deletions client/stylesheets/partials/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// rem fallback - credits: http://zerosixthree.se/
//scss-lint:disable NameFormat, DuplicateProperty

@function calculateRem($size) {
$remSize: $size / 16px;
Expand All @@ -14,20 +15,18 @@

@mixin center($xy:xy) {
@if $xy == xy {
left: 50%;
top: 50%;
bottom: auto;
left: 50%;
right: auto;
top: 50%;
@include transform(translateX(-50%) translateY(-50%));
}
@else if $xy == x {
}@else if $xy == x {
left: 50%;
right: auto;
@include transform(translateX(-50%));
}
@else if $xy == y {
top: 50%;
}@else if $xy == y {
bottom: auto;
top: 50%;
@include transform(translateY(-50%));
}
}
Expand Down
12 changes: 7 additions & 5 deletions client/stylesheets/partials/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// colors

$color-1: #1035AD;
$color-2: #1C45C7;
$color-3: #FA3C0A;
$color-4: #AAFB48;
$color-5: #AD3718;
$color-1: rgba(16, 53, 173, .5);
$color-2: #1c45c7;
$color-3: #fa3c0a;
$color-4: #aafb48;
$color-5: #ad3718;
$grey: #b2b6b7;
$white: #fff;

// fonts

Expand Down
12 changes: 6 additions & 6 deletions client/stylesheets/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@import 'partials/layout'; // responsive grid and media queries


//scss-lint:disable IdSelector Indentation, Comment, TrailingWhitespace, SingleLinePerSelector VendorPrefix PropertySortOrder DeclarationOrder NameFormat
//scss-lint:disable IdSelector Indentation, Comment, TrailingWhitespace, SingleLinePerSelector VendorPrefix PropertySortOrder PropertySpelling DeclarationOrder NameFormat


// -------------------------------
Expand All @@ -23,16 +23,16 @@
}

body {
background-color: $color-2;
color: #fff;
background-color: $grey;
color: $white;
font: {
family: $body-font; // variables inside partials > _variables.scss
size: 100%;
}
}

a {
color: #fff;
color: $white;
text-decoration: none;
}

Expand Down Expand Up @@ -299,14 +299,14 @@ header {
font: {
family: $headline-font;
size: 200%;
color: #fff;
color: $grey;
}
@include font-size(20px);
}

p {
line-height: 1.5;
color: #fff;
color: $white;
}

@include MQ(M) {
Expand Down
0 client/03-BikeNetwork.pdf → public/documents/03-BikeNetwork.pdf
View file
Open in desktop
File renamed without changes.