diff --git a/web/package-lock.json b/web/package-lock.json index 19c9dc5d..c55c6db6 100755 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -367,6 +367,16 @@ "postcss-value-parser": "3.3.0" } }, + "autosize": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/autosize/-/autosize-4.0.0.tgz", + "integrity": "sha1-egWZsbqE1zvXWJsNnaOHAVLGkjc=" + }, + "autosize-input": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/autosize-input/-/autosize-input-0.4.0.tgz", + "integrity": "sha1-pc20MRDjH2odn7aVzLdHSVrwu14=" + }, "aws-sign2": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", @@ -11571,6 +11581,15 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.13.tgz", "integrity": "sha512-3D+lY7HTkKbtswDM4BBHgqyq+qo8IAEE8lz8va1dz3LLmttjgo0FxairO4r1iN2OBqk8o1FyL4hvzzTFEdQSEw==" }, + "vue-autosize": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/vue-autosize/-/vue-autosize-1.0.2.tgz", + "integrity": "sha1-1BWYSKfA+DnUnepFQSzkcs3TpIo=", + "requires": { + "autosize": "4.0.0", + "autosize-input": "0.4.0" + } + }, "vue-hot-reload-api": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz", diff --git a/web/package.json b/web/package.json index d63899c9..e60f1490 100755 --- a/web/package.json +++ b/web/package.json @@ -11,9 +11,6 @@ "autoprefixer": "^6.3.3", "babel-core": "^6.26.0", "babel-loader": "^7.1.2", - "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", - "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1", - "babel-plugin-transform-es2015-template-literals": "^6.22.0", "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-env": "^1.6.1", "babel-preset-es2015": "^6.24.1", @@ -66,6 +63,7 @@ "smooth-scroll": "^12.1.5", "validator": "^9.2.0", "vue": "^2.5.13", + "vue-autosize": "^1.0.2", "vuejs-datepicker": "^0.9.25" } } diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue index 119c35f5..a29ca73e 100644 --- a/web/src/components/CourseRedactor.vue +++ b/web/src/components/CourseRedactor.vue @@ -24,13 +24,15 @@
НАЗВАНИЕ КУРСА
- +
-
+
КАТЕГОРИЯ
- +
diff --git a/web/src/js/course-redactor.js b/web/src/js/course-redactor.js index a6cb7944..341d7be1 100644 --- a/web/src/js/course-redactor.js +++ b/web/src/js/course-redactor.js @@ -1,4 +1,5 @@ import Vue from 'vue' +import VueAutosize from 'vue-autosize' import 'babel-polyfill' import CourseRedactor from '../components/CourseRedactor.vue' @@ -7,6 +8,8 @@ if (process.env.NODE_ENV === 'development') { Vue.config.devtools = true; } +Vue.use(VueAutosize); + let app = new Vue({ el: '#lilcity-vue-app', components: { diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass index 6da8323c..50e0e5f7 100755 --- a/web/src/sass/_common.sass +++ b/web/src/sass/_common.sass @@ -1862,6 +1862,19 @@ a.grey-link &.selected &__head color: $cl +.info__field--light + .select + .select__head + color: #777 + font-size: 15px + &:after + border-color: #fff transparent transparent transparent + &.selected + .select__head + color: #fff + &:after + border-color: #fff transparent transparent transparent + .field margin-bottom: 20px &__label @@ -1904,7 +1917,8 @@ a.grey-link padding: 7px 0 resize: vertical &_lg - height: 80px + min-height: 44px + height: auto font-size: 25px &__preview position: absolute @@ -2987,6 +3001,7 @@ a.grey-link &__foot &__field margin-right: 20px flex: 0 0 140px + flex-grow: 1 &__wrap max-width: 349px height: 550px