diff --git a/assets/graphics/m-tape-bl.png b/assets/graphics/m-tape-bl.png new file mode 100644 index 00000000..f1c57dbc Binary files /dev/null and b/assets/graphics/m-tape-bl.png differ diff --git a/assets/graphics/m-tape-br.png b/assets/graphics/m-tape-br.png new file mode 100644 index 00000000..84a02175 Binary files /dev/null and b/assets/graphics/m-tape-br.png differ diff --git a/assets/graphics/m-tape-tl.png b/assets/graphics/m-tape-tl.png new file mode 100644 index 00000000..84a02175 Binary files /dev/null and b/assets/graphics/m-tape-tl.png differ diff --git a/assets/graphics/m-tape-tr.png b/assets/graphics/m-tape-tr.png new file mode 100644 index 00000000..f1c57dbc Binary files /dev/null and b/assets/graphics/m-tape-tr.png differ diff --git a/assets/style/docs.scss b/assets/style/docs.scss index d0b3d2de..45e25b6b 100644 --- a/assets/style/docs.scss +++ b/assets/style/docs.scss @@ -15,15 +15,9 @@ } .docblock{ - // width:100%; margin-bottom: 40px; - text-align: center; - // .docs{ - // text-align: left; - // } - h2{ margin-left: 50px; text-align: left; @@ -61,4 +55,14 @@ padding: 0; display: block; } -} \ No newline at end of file +} + +@media screen and (max-device-width: 400px){ + .doc{ + margin: 30px 35px; + + img{ + max-width: 250px; + } + } +} diff --git a/assets/style/footer.scss b/assets/style/footer.scss index 5c4869df..032f15d8 100644 --- a/assets/style/footer.scss +++ b/assets/style/footer.scss @@ -2,6 +2,8 @@ footer{ position: relative; background-color: black; color: #ffffff; + overflow-x: scroll; + margin: 0; &:before{ content: ''; @@ -14,7 +16,7 @@ footer{ .info-block{ display: flex; - margin: 0 20px; + margin: 0; & > div{ margin: 0 30px 0 10px; @@ -28,4 +30,27 @@ footer{ ul{ list-style: none; } +} + +.footer-content{ + min-width: 500px; +} + +@media screen and (max-device-width: 500px){ + footer{ + font-size: 8pt; + + .info-block{ + display: block; + margin: 0; + + & > div{ + margin: 0 30px 0 10px; + } + + p{ + margin: 0; + } + } + } } \ No newline at end of file diff --git a/assets/style/home.scss b/assets/style/home.scss index de77125d..2281a9f6 100644 --- a/assets/style/home.scss +++ b/assets/style/home.scss @@ -8,3 +8,29 @@ animation: scaleUp 0.3s both ease-in; } } + +.main-block { + width: 100%; + margin-top: 5px; + + .telephone { + font-size: 1.25em; + margin-left: 30px; + } + + h1 { + font-size: 18pt; + text-align: center; + font-weight: normal; + margin: 0; + padding: 0; + } +} + +@media screen and (max-device-width: 500px) { + .main-block { + .telephone { + display: none; + } + } +} \ No newline at end of file diff --git a/assets/style/main.scss b/assets/style/main.scss index d5c61c33..5116106d 100644 --- a/assets/style/main.scss +++ b/assets/style/main.scss @@ -2,23 +2,8 @@ body { font-family: "PT Sans", Arial, sans-serif; margin: 0; padding: 0; -} -.main { - margin-top: 5px; - - .telephone { - font-size: 1.25em; - margin-left: 30px; - } - - h1 { - font-size: 20pt; - text-align: center; - font-weight: normal; - margin: 0; - padding: 0; - } + min-width: 320px; } a { diff --git a/assets/style/menu.scss b/assets/style/menu.scss index c1383caf..c7056c27 100644 --- a/assets/style/menu.scss +++ b/assets/style/menu.scss @@ -8,7 +8,7 @@ font-size: 13pt; ul { - margin: 0 0 0 20px; + margin: 0 0 0 10px; li { display: inline-block; @@ -62,3 +62,19 @@ } } +@media screen and (max-device-width: 500px){ + .menu { + font-size: 10pt; + + ul { + margin: 0 0 0 5px; + padding: 0 0 0 0; + + li { + display: inline-block; + padding: 3px 3px 10px 3px; + margin: 0 4px 5px 0; + } + } + } +} diff --git a/assets/style/schedule.scss b/assets/style/schedule.scss index a1de5537..b6783d52 100644 --- a/assets/style/schedule.scss +++ b/assets/style/schedule.scss @@ -15,6 +15,10 @@ padding-bottom: 50px; text-align: center; + .schedule-block{ + overflow-x: scroll; + } + table{ position: relative; margin: 30px auto 0 auto; @@ -196,4 +200,12 @@ display: block; margin-top: 90px; } -} \ No newline at end of file +} + +@media screen and (max-device-width: 400px){ + .schedule{ + thead.fix{ + display: none; + } + } +} diff --git a/assets/style/tape-viewer.scss b/assets/style/tape-viewer.scss index 9936bfb0..eac184b9 100644 --- a/assets/style/tape-viewer.scss +++ b/assets/style/tape-viewer.scss @@ -40,4 +40,48 @@ right: -25px; background-image: url(/graphics/tape-rb.png); } +} + +@media screen and (max-device-width: 400px) { + .tape-block { + width: 70%; + max-width: 250px; + min-width: 200px; + + margin: 50px auto 100px; + } + + .tape-block-content { + .tape { + width: 62px; + height: 62px; + position: absolute; + z-index: 10; + } + + .tape-tl { + top: -20px; + left: -20px; + background-image: url(/graphics/m-tape-tl.png); + background-size: 100%; + } + + .tape-tr { + top: -20px; + right: -20px; + background-image: url(/graphics/m-tape-tr.png); + } + + .tape-bl { + bottom: 10px; + left: -20px; + background-image: url(/graphics/m-tape-bl.png); + } + + .tape-br { + bottom: 10px; + right: -20px; + background-image: url(/graphics/m-tape-br.png); + } + } } \ No newline at end of file diff --git a/assets/style/timeline.scss b/assets/style/timeline.scss index a9342a8f..a741d475 100644 --- a/assets/style/timeline.scss +++ b/assets/style/timeline.scss @@ -1,5 +1,5 @@ .timeline{ - min-width: 500px; + min-width: 400px; position: relative; margin: 0 0 50px; @@ -100,4 +100,71 @@ background: url(/graphics/timeline-arrow-right.png) no-repeat; } } +} + +@media screen and (max-device-width: 400px) { + .timeline { + min-width: 0; + position: relative; + margin: 0 0 50px; + + .head{ + margin: 0; + padding: 0; + } + + .body{ + margin: 0 0 40px; + padding: 0; + } + + .body p{ + text-align: left; + margin: 0 0 2px; + padding: 0; + } + + .post { + position: relative; + display: flex; + + .head, .body { + position: relative; + width: 90%; + 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; + } + + .body { + padding: 0 20px; + } + } + } } \ No newline at end of file diff --git a/client/app.js b/client/app.js index db1e1e1b..9d42888a 100644 --- a/client/app.js +++ b/client/app.js @@ -49,11 +49,21 @@ app.config(function ($locationProvider, $routeProvider) { }); }); -app.run(function($location, $rootScope, $http) { +app.run(function($location, $rootScope, $http, config) { $rootScope.$on("$routeChangeSuccess", function (event, current) { $rootScope.title = current["$$route"].title; }); + $rootScope.contact = { + address: config.address, + telephone: config.telephone, + email: config.email + }; + + $rootScope.now = { + year: new Date().getFullYear() + }; + $http.defaults.headers.common["Accept"] = "application/json"; }); diff --git a/client/data.js b/client/data.js index 8a4179ee..13939e32 100644 --- a/client/data.js +++ b/client/data.js @@ -14,6 +14,8 @@ angular.module("hudozhka.data", []) }) .service("config", function(){ return { - telephone: "8 (81362) 76-312" + telephone: "8 (81362) 76-312", + email: "hudozka@gmail.com", + address: "г. Шлиссельбург, ул. 18-го января, д. 3" }; }); \ No newline at end of file diff --git a/client/pages/home.js b/client/pages/home.js index 8fa38208..02da23a8 100644 --- a/client/pages/home.js +++ b/client/pages/home.js @@ -5,7 +5,6 @@ module.exports = function (app) { app.controller("HomePageController", function ($scope, config) { $scope.pageClass = "page-home"; - $scope.telephone = config.telephone; $(".fotorama").fotorama(); }); diff --git a/templates/index.html b/templates/index.html index 44562f68..3a936a9a 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,6 +4,7 @@ + ДШХ Шлиссельбурга @@ -48,44 +49,52 @@ {{item.text}} {{item.text}} - +
\ No newline at end of file diff --git a/templates/views/home.html b/templates/views/home.html index 0cd3b87b..2d274be5 100644 --- a/templates/views/home.html +++ b/templates/views/home.html @@ -1,39 +1,38 @@ -
-
-
- - {{telephone}} +
+
+ + {{contact.telephone}} - - - - - - -
- -

«Шлиссельбургская детская художественная школа»

+ + + + + +
-
-
-
-
-
-
-
- - - -
+

Шлиссельбургская детская художественная школа

+
+ +
+
+
+
+
+
+ +
+ + +
+
- -
\ No newline at end of file + diff --git a/templates/views/schedule.html b/templates/views/schedule.html index 2a94b75b..fe1eb49d 100644 --- a/templates/views/schedule.html +++ b/templates/views/schedule.html @@ -1,49 +1,61 @@ -
-

Расписание {{sem}} семестра {{year}} года

- - - - - - - - - - - - - - - +
+

Расписание {{sem}} семестра {{year}} года

+
+
Гр. -

Понедельник

-

{{weekDay(0)}}

- 		-

Вторник

-

{{weekDay(1)}}

- 		-

Среда

-

{{weekDay(2)}}

- 		-

Четверг

-

{{weekDay(3)}}

- 		-

Пятница

-

{{weekDay(4)}}

- 		-

Суббота

-

{{weekDay(5)}}

-
-

{{group.name}}

-

{{group.time}}

-
+ + + + - - -
Гр. +

Понедельник

- 		-

{{day.lesson}}

-

{{day.teacher}}

-

{{day.time[0]}}

-

{{day.time[1]}}

-
+

{{weekDay(0)}}

+ + +

Вторник

+ +

{{weekDay(1)}}

+ + +

Среда

+ +

{{weekDay(2)}}

+ + +

Четверг

+ +

{{weekDay(3)}}

+ + +

Пятница

+ +

{{weekDay(4)}}

+ + +

Суббота

+ +

{{weekDay(5)}}

+ + + + + + +

{{group.name}}

+ +

{{group.time}}

+ + + +

{{day.lesson}}

+ +

{{day.teacher}}

+ +

{{day.time[0]}}

+ +

{{day.time[1]}}

+ + + + +
\ No newline at end of file