Compare commits
4
Commits
v3.1
...
linear_timeline
| Author | SHA1 | Date | |
|---|---|---|---|
 tmshv
|
00e9d65789 | ||
|
tmshv
|
b9d52b5327 | ||
|
tmshv
|
385cecfc97 | ||
|
tmshv
|
a67b3244ef |
No files matched your search
@@ -22,12 +22,6 @@
|
||||
}
|
||||
|
||||
.body{
|
||||
padding: 20px 20px 50px;
|
||||
// padding: 12px 0 0;
|
||||
// h2{
|
||||
//
|
||||
// }
|
||||
|
||||
a{
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
+8
-114
@@ -1,103 +1,21 @@
|
||||
.timeline{
|
||||
min-width: 400px;
|
||||
position: relative;
|
||||
margin: 0 0 50px;
|
||||
|
||||
&:before{
|
||||
content: '';
|
||||
width: 10px;
|
||||
height: 10px;
|
||||
position: absolute;
|
||||
background-color: black;
|
||||
top: 0;
|
||||
left: calc(50% - 6px);
|
||||
border-radius: 50%;
|
||||
z-index: 1;
|
||||
}
|
||||
display: block;
|
||||
width: 75%;
|
||||
margin: 0 auto 50px;
|
||||
}
|
||||
|
||||
.timeline-record{
|
||||
position: relative;
|
||||
display: flex;
|
||||
|
||||
.head, .body{
|
||||
position: relative;
|
||||
width: 50%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.head {
|
||||
padding: 25px 20px;
|
||||
}
|
||||
|
||||
.body {
|
||||
padding: 0 20px;
|
||||
}
|
||||
margin: 0 0 50px;
|
||||
|
||||
&.left{
|
||||
flex-flow: row-reverse;
|
||||
|
||||
.body{
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.head{
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.body:after{
|
||||
content: '';
|
||||
position: absolute;
|
||||
width: 12px;
|
||||
height: calc(100% - 98px);
|
||||
top: 98px;
|
||||
right: 0;
|
||||
background: url(/graphics/timeline-line.png) no-repeat right;
|
||||
background-size: 2px 100%;
|
||||
}
|
||||
|
||||
.head:after{
|
||||
content: '';
|
||||
position: absolute;
|
||||
width: 12px;
|
||||
height: 98px;
|
||||
top: 0;
|
||||
left: -12px;
|
||||
background: url(/graphics/timeline-arrow-left.png) no-repeat;
|
||||
}
|
||||
}
|
||||
|
||||
&.right{
|
||||
flex-flow: row;
|
||||
|
||||
.body{
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.head{
|
||||
text-align: right;
|
||||
margin: 0 10px;
|
||||
}
|
||||
|
||||
.body:after{
|
||||
content: '';
|
||||
position: absolute;
|
||||
width: 100px;
|
||||
height: calc(100% - 98px);
|
||||
top: 98px;
|
||||
left: -12px;
|
||||
background: url(/graphics/timeline-line.png) no-repeat;
|
||||
background-size: 2px 100%;
|
||||
}
|
||||
|
||||
.head:after{
|
||||
content: '';
|
||||
position: absolute;
|
||||
width: 12px;
|
||||
height: 98px;
|
||||
top: 0;
|
||||
left: calc(100% - 2px);
|
||||
background: url(/graphics/timeline-arrow-right.png) no-repeat;
|
||||
img{
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
min-height: 500px;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -134,30 +52,6 @@
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
&.left {
|
||||
display: block;
|
||||
|
||||
.body:after, .head:after {
|
||||
background: none;
|
||||
}
|
||||
}
|
||||
|
||||
&.right {
|
||||
display: block;
|
||||
|
||||
.body:after, .head:after {
|
||||
background: none;
|
||||
}
|
||||
}
|
||||
|
||||
&.left .head {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
&.right .head {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.head {
|
||||
padding: 5px 20px;
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ var privateFile = process.env["PRIVATE"] || "private.json";
|
||||
var privateData = JSON.parse(fs.readFileSync(privateFile, "utf-8"));
|
||||
|
||||
var config = {
|
||||
defaultIndex: "/templates/index.html" || process.env["INDEX"],
|
||||
port: process.env["PORT"] || 3000,
|
||||
pub: "./",
|
||||
data: {
|
||||
|
||||
+1
-1
@@ -42,6 +42,6 @@
|
||||
"gulp-sass": "^1.2.2",
|
||||
"gulp-uglify": "^1.1.0",
|
||||
"mocha": "~1.17.1",
|
||||
should": "~3.1.2"
|
||||
"should": "~3.1.2"
|
||||
}
|
||||
}
|
||||
+2
-1
@@ -4,6 +4,7 @@
|
||||
|
||||
var path = require("path");
|
||||
var fs = require("mz/fs");
|
||||
var config = require("../config");
|
||||
|
||||
function accepts(routes, def) {
|
||||
return function *() {
|
||||
@@ -26,7 +27,7 @@ function accepts(routes, def) {
|
||||
|
||||
function index(filename) {
|
||||
if (!filename){
|
||||
filename = path.join(__dirname, "../templates/index.html");
|
||||
filename = path.join(__dirname, "..", config.defaultIndex);
|
||||
}
|
||||
|
||||
return function *() {
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
<!DOCTYPE html>
|
||||
<html ng-app="hudozhka">
|
||||
<head>
|
||||
<base href="/">
|
||||
<meta name="fragment" content="!">
|
||||
<meta name="google-site-verification" content="8BxOTw-Q02DS2KAdcGcnIMwiPZ58DVB18XpOfRibCcg">
|
||||
<meta name="viewport" content="width=device-width, maximum-scale=1.0" />
|
||||
|
||||
<title ng-bind="title">ДШХ Шлиссельбурга</title>
|
||||
|
||||
<link rel="stylesheet" href="/style.css">
|
||||
<link rel="stylesheet" href="/animate.min.css">
|
||||
<link rel="stylesheet" href="/fonts/stylesheet.css">
|
||||
|
||||
<script src="/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script src="/bower_components/angular/angular.min.js"></script>
|
||||
<script src="/bower_components/angular-route/angular-route.min.js"></script>
|
||||
<script src="/bower_components/angular-animate/angular-animate.min.js"></script>
|
||||
<script src="/bower_components/angulartics/dist/angulartics.min.js"></script>
|
||||
<script src="/bower_components/angulartics/dist/angulartics-ga.min.js"></script>
|
||||
<script src="/bower_components/spin.js/spin.js"></script>
|
||||
<script src="/bower_components/angular-spinner/angular-spinner.min.js"></script>
|
||||
<script src="/bower_components/socket.io-client/socket.io.js"></script>
|
||||
|
||||
<link rel="stylesheet" href="/bower_components/fotorama/fotorama.css">
|
||||
<script src="/bower_components/fotorama/fotorama.js"></script>
|
||||
|
||||
<script src="/data.js"></script>
|
||||
<script src="/app.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div class="menu" ng-controller="MenuController">
|
||||
<ul>
|
||||
<li ng-repeat="item in menu" class="{{item.color}}" ng-class="{selected:isCurrent(item)}">
|
||||
<span ng-hide="isValid(item)">{{item.text}}</span>
|
||||
<a href="{{item.url}}" ng-show="isValid(item)">{{item.text}}</a>
|
||||
</li>
|
||||
<!--<a href="{{vkgroup}}" class="vk"><img src="/graphics/icon.vk.png"></a>-->
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="page {{pageClass}}" ng-view></div>
|
||||
|
||||
<footer>
|
||||
<div class="footer-content">
|
||||
<div class="info-block">
|
||||
<div>
|
||||
<h4>Ссылки на образовательные сайты</h4>
|
||||
<ul>
|
||||
<li><a href="http://минобрнауки.рф">минобрнауки.рф</a> — Министерство образования и науки Российской Федерации</li>
|
||||
<li><a href="http://edu.ru">edu.ru</a> — Федеральный сайт «Российское образование»</li>
|
||||
<li><a href="http://window.edu.ru">window.edu.ru</a> — Единое окно доступа к образовательным ресурсам</li>
|
||||
<li><a href="http://school-collection.edu.ru">school-collection.edu.ru</a> — Единая коллекция цифровых образовательных ресурсов</li>
|
||||
<li><a href="http://fcior.edu.ru">fcior.edu.ru</a> — Федеральный центр информационных образовательных ресурсов</li>
|
||||
</ul>
|
||||
<ul>
|
||||
<li><a href="http://dkhshmga.ru">dkhshmga.ru</a> — Художественная школа Мги</li>
|
||||
<li><a href="http://kirovskdmh.ucoz.ru">kirovskdmh.ucoz.ru</a> — Музыкальная школа Кировска</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<h4>Документы</h4>
|
||||
<ul>
|
||||
<li><a target="_blank" href="/document/edu-license">Лицензия на осуществление образовательной деятельности</a></li>
|
||||
<li><a target="_blank" href="/document/gov-certificate">Свидетельство о государственной регистрации права</a></li>
|
||||
<li><a target="_blank" href="/document/EGRYL1">Свидетельство о внесении в «ЕГРЮЛ»</a></li>
|
||||
<li><a target="_blank" href="/document/VAT">ИНН</a></li>
|
||||
<li><a target="_blank" href="/document/statue-2013">Устав школы</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="info-block">
|
||||
<div>
|
||||
<p>© 2014...{{now.year}}</p>
|
||||
<p>Художественная школа Шлиссельбурга</p>
|
||||
<p>Адрес: {{contact.address}}</p>
|
||||
<p>Телефон: {{contact.telephone}}</p>
|
||||
<p>Почта: <a href="mailto:{{contact.email}}">{{contact.email}}</a></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</footer>
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user