Permalink
Browse files

use material-design styles (#99)

  • Loading branch information...
trubachev committed Feb 20, 2018
1 parent 4a978dc commit 9d5af7c0f8da741d34992d77e47a84c5311e5fc4
Showing with 94 additions and 88 deletions.
  1. +29 −23 _includes/header.html
  2. +4 −6 _includes/search-form.html
  3. +17 −26 _layouts/main.html
  4. +27 −18 meetups.html
  5. +17 −15 speakers.html
View
@@ -1,24 +1,30 @@
<div class="navbar ">
<div class="container">
<div class="navbar-header">
<span href="../" class="navbar-brand">
<img src="/assets/img/square_50_50.png" alt="" width="40px">
</span>
</div>
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="/">
<img src="/assets/img/square_50_50.png" alt="" width="40px">
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="navbar-collapse" id="nav-main">
<ul class="nav navbar-nav">
<li><a href="/">Лента новостей</a></li>
<!--<li><a href="/meetups">Прошедшие встречи</a></li>-->
<li><a href="/speakers">Докладчики</a></li>
<li><a href="/meetups">Встречи</a></li>
<li><a href="/submit-paper/">Заявка на доклад</a></li>
<li><a href="/about/">О Сообществе</a></li>
</ul>
{% include search-form.html %}
</div>
</div>
</div>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item {% if page.url == '/' %}active{% endif %}">
<a class="nav-link" href="/">Лента новостей</a>
</li>
<!--<li><a href="/meetups">Прошедшие встречи</a></li>-->
<li class="nav-item {% if page.url == '/speakers/' %}active{% endif %}">
<a class="nav-link" href="/speakers/">Докладчики</a>
</li>
<li class="nav-item {% if page.url == '/meetups/' %}active{% endif %}">
<a class="nav-link" href="/meetups/">Встречи</a>
</li>
<li class="nav-item {% if page.url == '/submit-paper/' %}active{% endif %}">
<a class="nav-link" href="/submit-paper/">Заявка на доклад</a>
</li>
<li class="nav-item {% if page.url == '/about/' %}active{% endif %}">
<a class="nav-link" href="/about/">О Сообществе</a>
</li>
</ul>
{% include search-form.html %}
</div>
</nav>
View
@@ -1,6 +1,4 @@
<div id="block-search">
<form method="get" action="/search">
<input id="search-input" name="q" placeholder="Поиск"/>
<button id="search-button" type="submit">&#x1f50d;</button>
</form>
</div>
<form class="form-inline my-2 my-lg-0" method="get" action="/search">
<input id="search-input" name="q" class="form-control mr-sm-2" type="search" placeholder="Поиск" aria-label="Поиск">
<button id="search-button" class="btn btn-outline-success my-2 my-sm-0" type="submit">Поиск</button>
</form>
View
@@ -6,7 +6,7 @@
<title>{{page.title}}</title>
<meta name="description" content="{{page.description}}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="apple-touch-icon" sizes="57x57" href="/assets/favicon/apple-icon-57x57.png">
@@ -28,13 +28,11 @@
<meta name="theme-color" content="#ffffff">
<!-- Place favicon.ico in the root directory -->
<!-- Material Design fonts -->
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700">
<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/icon?family=Material+Icons">
<!-- Material Design for Bootstrap fonts and icons -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons">
<!-- Bootstrap -->
<link rel="stylesheet" type="text/css" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-material-design/4.0.2/bootstrap-material-design.min.css" />
<!-- Material Design for Bootstrap CSS -->
<link rel="stylesheet" href="https://unpkg.com/bootstrap-material-design@4.1.1/dist/css/bootstrap-material-design.min.css" integrity="sha384-wXznGJNEXNG1NFsbm0ugrLFMQPWswR3lds2VeinahP8N0zJw9VWSopbjv2x7WCvX" crossorigin="anonymous">
<!-- Font Awesome Icons -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
@@ -48,33 +46,26 @@
{% include header.html %}
<div id="content" class="container">
<br>
{{content}}
</div>
<br>
<br>
<br>
<br>
<br>
<br>
<div class="row">
<div class="container">
<small>
<a class="pull-right"
title="Редактировать эту страницу"
href="https://github.com/deeprefactoring/deeprefactoring.github.io/edit/master/{{page.path}}">&#9998; редактировать</a>
</small>
</div>
<div class="container">
<small>
<a class="pull-right"
title="Редактировать эту страницу"
href="https://github.com/deeprefactoring/deeprefactoring.github.io/edit/master/{{page.path}}">&#9998; редактировать</a>
</small>
</div>
</div>
{% include footer.html %}
{% include google_analytics.html %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://unpkg.com/popper.js@1.12.6/dist/umd/popper.js" integrity="sha384-fA23ZRQ3G/J53mElWqVJEGJzU0sTs+SvzG8fXVWP+kJQ1lwFAOkcUOysnlKJC33U" crossorigin="anonymous"></script>
<script src="https://unpkg.com/bootstrap-material-design@4.1.1/dist/js/bootstrap-material-design.js" integrity="sha384-CauSuKpEqAFajSpkdjv3z9t8E7RlpJ1UP0lKM/+NdtSarroVKu069AlsRPKkFBz9" crossorigin="anonymous"></script>
<script>$(document).ready(function() { $('body').bootstrapMaterialDesign(); });</script>
</body>
</html>
View
@@ -4,26 +4,35 @@
permalink: /meetups/
---
{% assign meetups = site.posts | sort: 'meetup_slug' | reverse %}
{% for meetup in meetups %}
{% if meetup.categories contains 'meetup' %}
<div class="row-fluid">
<div class="col-lg-3 col-md-3 col-sm-4">
<div class="thumbnail meetup-thumbnail">
<a href="{{meetup.url}}">
<img src="{{meetup.logo}}" alt="{{meetup.title}}">
</a>
<div class="caption">
<p>
<a href="{{meetup.url}}">
{{meetup.title}}
</a>
<br>
<small>{{meetup.event_date | date: "%Y-%m-%d"}}</small>
</p>
</div>
<div class="row">
{% for meetup in meetups %}
{% if meetup.categories contains 'meetup' %}
<div class="col-lg-4">
<div class="card" style="width: 20rem; margin-bottom: 10px">
<img class="card-img-top" src="{{meetup.logo}}" alt="{{meetup.title}}">
<div class="card-body">
<h5 class="card-title">
<a href="{{meetup.url}}">{{meetup.title}}</a>
</h5>
<p class="font-weight-light">{{meetup.event_date | date: "%Y-%m-%d"}}</p>
</div>
</div>
</div>
{% endif %}
{% endfor %}
</div>
{% endif %}
<div class="row">
{% for speaker in site.speakers %}
{% assign modIndex = forloop.index | modulo: 3 %}
{% if modIndex == 0 %}
</div>
<div class="row">
{% endif %}
{% endfor %}
</div>
View
@@ -4,20 +4,22 @@
permalink: /speakers/
---
{% for speaker in site.speakers %}
<div class="row-fluid">
<div class="col-sm-2 col-md-2">
<div class="thumbnail speaker-thumbnail">
<a href="{{speaker.url}}">
<img src="{{speaker.avatar}}" alt="{{speaker.title}}">
</a>
<div class="caption">
<p><a href="{{speaker.url}}">{{speaker.title}}</a>
</p>
</div>
<div class="row">
{% for speaker in site.speakers %}
<div class="col-lg-3">
<div class="card" style="width: 16rem; margin-bottom: 10px">
<img class="card-img-top" src="{{speaker.avatar}}" alt="{{speaker.title}}">
<div class="card-body">
<h5 class="card-title">
<a href="{{speaker.url}}">{{speaker.title}}</a>
</h5>
</div>
</div>
</div>
</div>
{% endfor %}
{% assign modIndex = forloop.index | modulo: 4 %}
{% if modIndex == 0 %}
</div>
<div class="row">
{% endif %}
{% endfor %}
</div>

0 comments on commit 9d5af7c

Please sign in to comment.