Skip to content
This repository was archived by the owner on Jul 21, 2019. It is now read-only.

Add a bunch more styles #101

Merged
mattstratton merged 1 commit into from
Jan 12, 2017
Merged

Add a bunch more styles #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,11 @@ <h4 class="modal-title">Search DevOpsDays</h4>
</div>
<div class="container-fluid">
<div class="row">
<div class="col-smd-6 col-md-10 col-md-push-2">
<div class="col-xs-12 col-md-10 col-md-push-2">
<!-- Main Content -->
{{- block "main" . }} {{- end -}}
</div>
<div class="col-smd-6 col-md-2 col-md-pull-10">
<div class="col-xs-12 col-md-2 col-md-pull-10">
<!-- Removing Events Near Me for now -->
<!-- EVENTS NEAR ME<br /> -->
<a href = "/past" class="left-nav-navs">PAST EVENTS</a><br />
Expand Down Expand Up @@ -162,9 +162,9 @@ <h3 class="footer-nav">@DEVOPSDAYS</h3>
</script>
</div>
</div>
<div class="col-md-2">
<!-- <div class="col-md-2 hidden-sm">

</div>
</div> -->
</div>

</div>
Expand Down
10 changes: 6 additions & 4 deletions layouts/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{{ $.Scratch.Set "city" .city }}
{{ $.Scratch.Set "year" .year }}
{{ $.Scratch.Set "logo" "unset" }}
<div class="col-md-3">
<div class="col-md-3 homepage-grid-col">
<a href = "/events/{{ .name }}">
{{ $.Scratch.Set "subdir" .name }}
{{ $.Scratch.Set "contentdir" (printf "static/events/%s/" ($.Scratch.Get "subdir")) }}
Expand All @@ -32,14 +32,16 @@
{{ end }}
</a>
<br/>
{{- dateFormat "Jan 2" .startdate -}}
<span class = "homepage-grid-date">
{{- dateFormat "Jan 2" .startdate -}}
&nbsp;-&nbsp;
{{- dateFormat "Jan 2, 2006" .enddate -}}<br/>
<span>{{ .city }}</span>
</span>
<span class="homepage-grid-city">{{ .city }}</span>
<br/>
{{ if .description }}
{{ if ne .description "" }}
{{ .description | markdownify }}
<span class="homepage-grid-desc">{{ .description | markdownify }}</span>
{{ end }}
{{ end }}
</div>
Expand Down
14 changes: 8 additions & 6 deletions layouts/partials/welcome.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
{{/* end site data query */}}

<div class="row">
<div class="col-md-4 col-sm-push-8">
{{ .Content }}
</div>
<div class="col-md-8 col-sm-pull-4">
<div class="col-xs-12 col-md-8">
<h2>DevOpsDays {{ $e.city }}</h2> {{- dateFormat "January 2" $e.startdate -}} - {{- dateFormat "2, 2006" $e.enddate -}}
<br />
<span>{{- $e.location -}}</span>
Expand All @@ -17,10 +14,12 @@ <h2>DevOpsDays {{ $e.city }}</h2> {{- dateFormat "January 2" $e.startdate -}} -
{{- range sort $.Site.Data.events "startdate" -}}
{{- if .startdate -}} <!-- for some reason, it bails on the city Chicago, and also Paris -->
{{- if eq (lower .city) (lower $e.city) -}}
{{- $.Scratch.Add "past-counter" 1 -}}
{{- if eq ($.Scratch.Get "past-counter") 1 -}}
{{- if ne .startdate $e.startdate -}}
<i>Past {{ $e.city }} Events</i><br />
{{- $.Scratch.Set "past-counter" 1 -}}
{{- end -}}
{{- end -}}
{{- if eq (lower .city) (lower $e.city)}}
{{- if ne .startdate $e.startdate -}}
<a href = "/events/{{ .name }}">{{ dateFormat "2006" .startdate }}</a> <br />
{{- end -}}
Expand All @@ -31,5 +30,8 @@ <h2>DevOpsDays {{ $e.city }}</h2> {{- dateFormat "January 2" $e.startdate -}} -
<button type="button" class="btn btn-default">Register</button>
<button type="button" class="btn btn-default">Follow</button>
</div>
<div class="col-xs-12 col-md-4">
{{ .Content }}
</div>

</div>
2 changes: 1 addition & 1 deletion static/css/site.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/css/site.css.map
View file
Open in desktop

Large diffs are not rendered by default.

41 changes: 40 additions & 1 deletion static/less/site.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@
// @import "less/variables.less";
@import "site_variables.less"; //customizations


html {
font-size: 14px;
line-height: 1.4;
}

body {
font-size: 1em;
}

.event-logo-homepage {
position:relative;
padding: 0;
Expand All @@ -25,7 +35,7 @@
font-family: 'Roboto', sans-serif;
font-weight: 900;
color: #0082AB;
font-size: 11pt;
font-size: .9em;
text-transform: uppercase;
}

Expand Down Expand Up @@ -115,6 +125,35 @@ a.footer-content {

}

/* Homepage */

.homepage-grid-col {
padding-top: 30px;
padding-bottom: 30px;
}
.homepage-grid-date {
font-family: 'Roboto', sans-serif;
font-weight: 300;
font-size: 9pt;
text-transform: uppercase;
color: #000000;
}

.homepage-grid-city {
font-family: 'Roboto', sans-serif;
font-weight: 700;
font-size: 2em;
text-transform: capitalize;;
color: #000000;
}

.homepage-grid-desc {
font-family: 'Roboto', sans-serif;
font-weight: 300;
font-size: 9pt;
color: #000000;
}

/* Program */
button.accordion {
background-color: #eee;
Expand Down