diff --git a/src/client/components/Navigation.js b/src/client/components/Navigation.js index 7715fd78..44761980 100644 --- a/src/client/components/Navigation.js +++ b/src/client/components/Navigation.js @@ -3,7 +3,8 @@ import template from '../../templates/components/navigation.html'; export default function (app) { app.component('navigation', { bindings: { - menu: '<' + menu: '<', + rightText: '@' }, template: template, controllerAs: '$' diff --git a/src/client/config.js b/src/client/config.js index 3ca08a83..970419c8 100644 --- a/src/client/config.js +++ b/src/client/config.js @@ -4,7 +4,7 @@ const nbsp = 0xA0; export const mobileMatchSelector = '(max-device-width: 30em)'; -export let contacts = { +export const contacts = { telephone: '+7 (81362) 76-312', email: 'hudozka@gmail.com', address: ['г. Шлиссельбург', 'ул. 18 января', 'д. 3'] @@ -12,7 +12,7 @@ export let contacts = { .join(' ') }; -export let collectiveSortPattern = [ +export const collectiveSortPattern = [ 'mg-timasheva', 'va-sarzhin', 'od-gogoleva', diff --git a/src/client/controllers/AppController.js b/src/client/controllers/AppController.js index 1ca01187..d6f5e2ce 100644 --- a/src/client/controllers/AppController.js +++ b/src/client/controllers/AppController.js @@ -1,4 +1,4 @@ -import {footer, mobileMatchSelector} from '../config'; +import {footer, mobileMatchSelector, contacts} from '../config'; export default function (app) { app.controller('AppController', ($scope, menu) => { @@ -12,6 +12,7 @@ export default function (app) { $scope.navigation = 'main-menu'; } + $scope.phone = contacts.telephone; $scope.menuProvider = menu.items; $scope.footer = footer; }); diff --git a/src/style/components/main-menu.scss b/src/style/components/main-menu.scss index 48b756c7..b6ebcdee 100644 --- a/src/style/components/main-menu.scss +++ b/src/style/components/main-menu.scss @@ -1,15 +1,7 @@ @import "../variables"; .main-menu { - -webkit-overflow-scrolling: touch; - - width: 100%; - z-index: 100; - overflow-x: scroll; - position: fixed; - top: 0; white-space: nowrap; - background-color: rgba(255, 255, 255, 0.95); font-size: 1.1em; color: $menu-inactive-item-color; @@ -30,14 +22,7 @@ text-decoration: none; color: $dark-color; - //border-bottom: 1px solid darken($light-color, 50%); border-bottom: 1px solid lighten($dark-color, 60%); - - //&:hover { - // color: $dark-color; - // - // border-bottom: 1px solid darken($lighter-color, 50%); - //} } .selected { @@ -77,11 +62,7 @@ } @media (max-width: $mobile-width) { - header{ - overflow: hidden; - } - .main-menu{ - background-color: white; + font-size: 1em; } } diff --git a/src/style/components/navigation.scss b/src/style/components/navigation.scss index 5dec4f3f..5efc3383 100644 --- a/src/style/components/navigation.scss +++ b/src/style/components/navigation.scss @@ -9,7 +9,8 @@ position: fixed; top: 0; white-space: nowrap; - background-color: $darker-color; + + background-color: rgba(255, 255, 255, 0.95); display: flex; justify-content: space-between; @@ -17,30 +18,19 @@ } .navigation__right { - color: $light-color; - margin-right: 3em; + color: $dark-color; + margin-right: 1em; - z-index:1000; + z-index: 1000; } @media (max-width: $mobile-width) { .navigation { - overflow: hidden; - - width: 100%; - z-index: 100; - position: relative; - top: 0; - - display: block; - //display: flex; - //justify-content: flex-start; - //align-items: center; + background-color: white; } .navigation__right { - //display: none; - //margin-right: 0; + padding: 0 $single-margin; } } diff --git a/src/style/components/page-school.scss b/src/style/components/page-school.scss index 6e4dac32..a18d8072 100644 --- a/src/style/components/page-school.scss +++ b/src/style/components/page-school.scss @@ -24,11 +24,11 @@ h1 { margin-top: $single-margin; - font-size: 1.5em; + font-size: 2em; } } -@media (min-width: $mobile-width) { +@media (max-width: $mobile-width) { .hudozka-title { text-align: center; diff --git a/src/templates/components/navigation.html b/src/templates/components/navigation.html index 02516a0b..f596953e 100644 --- a/src/templates/components/navigation.html +++ b/src/templates/components/navigation.html @@ -2,6 +2,6 @@ diff --git a/src/templates/components/page-school.html b/src/templates/components/page-school.html index dacd8700..fe406bd0 100644 --- a/src/templates/components/page-school.html +++ b/src/templates/components/page-school.html @@ -6,7 +6,7 @@
-

МБОУДОД

+

МБУДО

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

diff --git a/src/templates/main.html b/src/templates/main.html index 51e4905a..67295240 100644 --- a/src/templates/main.html +++ b/src/templates/main.html @@ -47,16 +47,8 @@
- +
- - - - - - - -