Skip to content

Commit

Permalink
Cleanup and styling likes for snapmap
Browse files Browse the repository at this point in the history
  • Loading branch information
@zachwise
zachwise committed Jul 22, 2014
1 parent 32cf9f9 commit bee2134
Show file tree
Hide file tree
Showing 8 changed files with 932 additions and 169 deletions.
2 changes: 1 addition & 1 deletion compiled/css/storymap.css
View file

Large diffs are not rendered by default.

566 changes: 565 additions & 1 deletion compiled/examples/instagram_brentfoster.json
View file

Large diffs are not rendered by default.

342 changes: 341 additions & 1 deletion compiled/examples/instagram_mirandamulligan.json
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions compiled/js/storymap-min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions compiled/js/storymap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4950,7 +4950,7 @@ VCO.MediaType = function(m) {
{
type: "instagramprofile",
name: "InstagramProfile",
match_str: /(instagr.am|instagram.com)\/profiles\//,
match_str: /(instagr.am|instagram.com)(\/profiles\/|[-a-zA-Z0-9@:%_\+.~#?&//=]+instagramprofile)/,
cls: VCO.Media.InstagramProfile
},
{
Expand Down Expand Up @@ -17038,7 +17038,7 @@ VCO.Map.Leaflet = VCO.Map.extend({
var _origin = origin,
_padding = [(Math.abs(this.options.map_center_offset.left)*3),(Math.abs(this.options.map_center_offset.top)*3)];

trace('padding ' + _padding)

//_padding = [0,0];
//_padding = [0,0];
if (correct_for_center) {
Expand Down
2 changes: 1 addition & 1 deletion source/js/map/leaflet/VCO.Map.Leaflet.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ VCO.Map.Leaflet = VCO.Map.extend({
var _origin = origin,
_padding = [(Math.abs(this.options.map_center_offset.left)*3),(Math.abs(this.options.map_center_offset.top)*3)];

trace('padding ' + _padding)

//_padding = [0,0];
//_padding = [0,0];
if (correct_for_center) {
Expand Down
2 changes: 1 addition & 1 deletion source/js/media/VCO.MediaType.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ VCO.MediaType = function(m) {
{
type: "instagramprofile",
name: "InstagramProfile",
match_str: /(instagr.am|instagram.com)\/profiles\//,
match_str: /(instagr.am|instagram.com)(\/profiles\/|[-a-zA-Z0-9@:%_\+.~#?&//=]+instagramprofile)/,
cls: VCO.Media.InstagramProfile
},
{
Expand Down
179 changes: 19 additions & 160 deletions source/less/snapmap/VCO.SnapMap.less
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
.vco-storymap {
font-family: @font-main;


h1, h2, h3 {
.vco-snapmap-instagram {

}
font-size: @base-font-size-xlarge;
line-height:@base-font-size-xlarge;
small {
font-size: @base-font-size-large;
line-height: @base-font-size-large;
}

}
h4, h5, h6 {
.vco-snapmap-instagram {

}
font-size: @base-font-size-large;
line-height:@base-font-size-large;
margin-bottom:0px;
small {
font-size: @base-font-size;
line-height:@base-font-size;
}

}
h2.vco-headline-title {
.vco-snapmap-instagram {
Expand All @@ -35,153 +24,23 @@
}

}

h2 {
margin-top:20px;
margin-bottom:5px;
}

p {
margin-top:5px;
margin-bottom:10px;
font-size: @base-font-size;
//font-family: @font-secondary;
color: lighten(@color-dark, 40%);


}
b, strong {
font-weight: bold;
//color: @color-dark;
}
i, em {
font-style: italic;
}
a {
text-decoration:none;
color:@color-theme;
}
a:hover {
text-decoration:underline;
color: darken(@color-theme, 20%);
}
.vco-caption, .vco-credit, .vco-slidenav-next, .vco-slidenav-previous {
//font-family: @font-sanserif;
font-size:@base-font-size-small;
line-height:@base-font-size-small;
a {
color: @color-dark;
}
}

blockquote, blockquote p {
font-family: @font-serif;
color: lighten(@color-dark, 60%);
font-size: @base-font-size-large;
line-height:@base-font-size-large;
text-align:left;
background:transparent;
border:0px;
padding:0px;
cite {
font-family: @font-sanserif;
font-size: @base-font-size-small;
color: lighten(@color-dark, 40%);
display:block;
text-align:right;
font-style: normal;

}
cite:before {
content: "\2014";
}
}
blockquote p:before {
content: open-quote;
display:inline-block;
font-size: @base-font-size-xlarge;
position: relative;
top: 8px;
margin-right:5px;

}
blockquote p:after {
content: close-quote;
display:inline-block;
font-size: @base-font-size-xlarge;
position: relative;
top: 8px;
margin-left:3px;

}
blockquote {
margin:10px;
p {
margin:0;
}
//margin-left:18px;
}

.vcard {
font-family: @font-main;
font-size: @base-font-size;
line-height:@base-font-size;
}

.vco-text {
ul {
padding:0px;
padding-left:30px;
margin:0;
li {
margin-bottom:5px;
}
}
}

.vco-note {
.vco-media-instagram-likes {
display:block;
font-family: @font-main;
font-style: italic;
background-color:lighten(@color-dark, 90%);
font-size:@base-font-size;
line-height:@base-font-size+2;
padding:10px;
.border-radius(7px);
color: #8a6d3b;
background-color: #fcf8e3;
border: 1px solid #faebcc;
}
}


// Skinnier
@media only screen and (max-width: 800px), only screen and (max-device-width: 800px) {
.vco-storymap {
h1, h2, h3 {
font-size: @base-font-size-xlarge;
line-height: @base-font-size-xlarge;
}
h2.vco-headline-title {
font-family:@font-main;
font-weight:bold;
margin-top:10px;
font-size:12px;
&:before {
content:'\2665';
margin-right:3px;
font-weight:normal;
font-size:14px;
}
&:after {
content:'Likes';
margin-left:3px;
color:#999;
font-weight:normal;
}
}

}
// Mobile, iPhone and skinny
@media only screen and (max-width: 500px), only screen and (max-device-width: 500px) {
.vco-storymap {
h1, h2, h3 {
font-size: @base-font-size-xlarge - 4;
line-height: @base-font-size-xlarge - 4;
}
h2.vco-headline-title {

}
}
}
.vco-skinny {
h2 {
margin-top:0px;
padding-top:20px;
}
}

0 comments on commit bee2134

Please sign in to comment.