diff --git a/gulpfile.js b/gulpfile.js index bfc96de4..63d3c016 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -41,7 +41,7 @@ gulp.task('styles', function () { }) ]; - gulp.src('./src/style/*.scss') + gulp.src('./src/style/style.scss') .pipe(sass()) .pipe(postcss(processors)) .pipe(concat('style.css')) diff --git a/src/style/body-wrapper.scss b/src/style/body-wrapper.scss new file mode 100644 index 00000000..5cd4f9c5 --- /dev/null +++ b/src/style/body-wrapper.scss @@ -0,0 +1,14 @@ +@import "variables"; + +.body-wrapper { + display: flex; + min-height: 100%; + flex-direction: column; +} + +.body-wrapper__content { + $margin: $single-margin + $menu-thickness; + + flex: 1; + margin: $margin auto 0; +} diff --git a/src/style/components/schedule-table.scss b/src/style/components/schedule-table.scss index e2738f84..babf8356 100644 --- a/src/style/components/schedule-table.scss +++ b/src/style/components/schedule-table.scss @@ -3,8 +3,8 @@ $current-week-day-color: $blue-color; .schedule-table { - margin: 0 auto; - width: 100%; + //margin: 0 auto; + //width: 100%; min-width: 50em; position: relative; @@ -86,16 +86,16 @@ $current-week-day-color: $blue-color; } } - p { - margin-bottom: .2em; - } - - a { - color: black; - - text-decoration: none; - border-bottom: 1px solid #ccc; - } + //p { + // margin-bottom: .2em; + //} + // + //a { + // color: black; + // + // text-decoration: none; + // border-bottom: 1px solid #ccc; + //} .lesson { font-size: 1.1em; diff --git a/src/style/main.scss b/src/style/main.scss index ea1fb86a..8f780e4f 100644 --- a/src/style/main.scss +++ b/src/style/main.scss @@ -56,16 +56,3 @@ a { border-bottom: none; } } - -.body-wrapper { - display: flex; - min-height: 100%; - flex-direction: column; -} - -.body-wrapper__content { - $margin: $single-margin + $menu-thickness; - - flex: 1; - margin: $margin auto 0; -} diff --git a/src/style/schedule-selector.scss b/src/style/schedule-selector.scss new file mode 100644 index 00000000..777d4987 --- /dev/null +++ b/src/style/schedule-selector.scss @@ -0,0 +1,10 @@ +@import "variables"; + +.schedule-selector { + text-align: center; + margin-bottom: $single-margin; + + label{ + margin: 0 .5em; + } +} \ No newline at end of file diff --git a/src/style/schedule.scss b/src/style/schedule.scss deleted file mode 100644 index b5a1828b..00000000 --- a/src/style/schedule.scss +++ /dev/null @@ -1,10 +0,0 @@ -//.schedule { -// position: relative; -// margin: 30px auto 0 auto; -// padding-bottom: 50px; -// text-align: center; -// -// & > p { -// margin: 0 0 1em; -// } -//} \ No newline at end of file diff --git a/src/style/style.scss b/src/style/style.scss index db31347e..602aff47 100644 --- a/src/style/style.scss +++ b/src/style/style.scss @@ -1,10 +1,27 @@ -@import "./components/gallery-item"; -@import "./components/document"; -@import "./components/teacher-proifile"; -@import "./components/main-menu"; -@import "./components/breadcrumbs"; -@import "./components/timeline"; -@import "./components/timeline-record"; -@import "./components/timeline-record-post"; -@import "./components/timeline-record-instagram"; -@import "./components/schedule-table"; +@import "components/gallery-item"; +@import "components/document"; +@import "components/teacher-proifile"; +@import "components/main-menu"; +@import "components/breadcrumbs"; +@import "components/timeline"; +@import "components/timeline-record"; +@import "components/timeline-record-post"; +@import "components/timeline-record-instagram"; +@import "components/schedule-table"; + +@import "main"; +@import "body-wrapper"; +@import "page"; +@import "content"; +@import "page-animation"; + +@import "gallery"; +@import "docs"; +@import "document"; +@import "album"; +@import "schedule-selector"; +@import "schedule-mobile"; +@import "error-404"; + +@import "tape-viewer"; +@import "footer"; \ No newline at end of file diff --git a/src/style/variables.scss b/src/style/variables.scss index 73455d76..ff98833a 100644 --- a/src/style/variables.scss +++ b/src/style/variables.scss @@ -7,7 +7,7 @@ $content-semi-wide: 70%; $content-thin: 60%; //MARGINS -$single-margin: 1em; +$single-margin: 1.5em; $double-margin: 3em; //COLOR