From e04649a8f534d0ef92acbb7503a9a305039a5ba8 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Wed, 7 Mar 2018 18:49:28 +0100 Subject: [PATCH] [webpack.teacher.view] can now toggle 'CREATE' card + fixed layout now 'CREATE' card is !!exactly!! the same size as others --- webpack/component/teacher/view.vue | 6 ++- webpack/data/teacher.js | 35 +++++++------- webpack/scss/container.scss | 73 +++++++++++++++--------------- webpack/scss/global.scss | 48 +++++++++++++++----- 4 files changed, 96 insertions(+), 66 deletions(-) diff --git a/webpack/component/teacher/view.vue b/webpack/component/teacher/view.vue index 20d3d1a..d557ad4 100644 --- a/webpack/component/teacher/view.vue +++ b/webpack/component/teacher/view.vue @@ -2,11 +2,13 @@
-
-
+ + + +
- margin-top: -.8em; // replace as if not a select - margin-bottom: -.4em; // fix layout for following elements + margin-top: -1em; // replace as if not a select + margin-bottom: -.3em; // fix layout for following elements // remove border border: 0; diff --git a/webpack/scss/global.scss b/webpack/scss/global.scss index 3a4fe17..f8b7b37 100644 --- a/webpack/scss/global.scss +++ b/webpack/scss/global.scss @@ -115,13 +115,13 @@ input[type=submit].neutral{ padding: .5em 1em; border-radius: 3px; - border: 1px solid $form-neutral-color; + border: 1px solid $form-neutral-color; - background: $bg-color center center no-repeat; + background: #fff center center no-repeat; text-transform: uppercase; - font-weight: normal; + font-weight: normal; - color: darken($form-neutral-color, 15%); + color: $primary-color; cursor: pointer; @@ -129,10 +129,10 @@ input[type=submit].neutral{ border-color .1s ease-in-out, background .2s ease-in-out; - &:hover, &:focus{ - color: darken($form-neutral-color, 35%); - border-color: $primary-color; - background-color: #fff; + &:hover, &[data-active='1']{ + color: #fff; + border-color: $form-neutral-color; + background-color: $form-neutral-color; } } @@ -142,7 +142,13 @@ button.grey, .grey > button, input[type=button].grey, .grey > input[type=button], input[type=submit].grey, .grey > input[type=submit]{ - border-color: $form-grey-color; + color: $form-grey-color; + + &:hover, &[data-active='1']{ + color: #fff; + border-color: $form-grey-color; + background-color: $form-grey-color; + } cursor: default; } @@ -152,7 +158,13 @@ button.valid, .valid > button, input[type=button].valid, .valid > input[type=button], input[type=submit].valid, .valid > input[type=submit]{ - border-color: $form-valid-color; + color: $form-valid-color; + + &:hover, &[data-active='1']{ + color: #fff; + border-color: $form-valid-color; + background-color: $form-valid-color; + } } @@ -161,7 +173,13 @@ button.invalid, .invalid > button, input[type=button].invalid, .invalid > input[type=button], input[type=submit].invalid, .invalid > input[type=submit]{ - border-color: $form-invalid-color; + color: $form-invalid-color; + + &:hover, &[data-active='1']{ + color: #fff; + border-color: $form-invalid-color; + background-color: $form-invalid-color; + } } @@ -170,7 +188,13 @@ button.search, .search > button, input[type=button].search, .search > input[type=button], input[type=submit].search, .search > input[type=submit]{ - border-color: $form-search-color; + color: $form-search-color; + + &:hover, &[data-active='1']{ + color: #fff; + border-color: $form-search-color; + background-color: $form-search-color; + } }