more study design

kran0 · Jan 15, 2018 · b615c60 · b615c60
1 parent ba88463
commit b615c60
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/public/stylesheets/study.css b/public/stylesheets/study.css
@@ -424,19 +424,6 @@ div.underboard .notif.error {
   font-weight: normal;
   text-transform: uppercase;
 }
-.study_buttons .fbt.mode i::before {
-  font-size: 19px;
-  content: 'L';
-  color: #dc322f;
-  margin-right: 4px;
-}
-.study_buttons .fbt.mode.on i::before {
-  content: 'E';
-  color: #759900;
-}
-.study_buttons .fbt.mode:hover i::before {
-  color: #fff;
-}
 .study_buttons .behind {
   background: #dc322f;
   color: #fff;
@@ -459,6 +446,26 @@ body.base .study_buttons .fbt.active {
   background: rgba(99,155,36,0.75)!important;
   border-top: 1px solid #639B24;
   margin-top: -1px;
+  cursor: default;
+}
+.study_buttons .mode {
+  padding: 5px 10px;
+  text-transform: uppercase;
+  opacity: 0.8;
+}
+.study_buttons .mode i::before {
+  font-size: 19px;
+  content: 'L';
+  color: #dc322f;
+  margin-right: 4px;
+}
+.study_buttons .mode.on i::before {
+  content: 'E';
+  color: #639B24!important;
+}
+.study_buttons .mode:hover {
+  background: rgba(128,128,128,0.15);
+  opacity: 1;
 }
 .glyph-icon::before {
   content: '⁉';

diff --git a/ui/analyse/src/study/commentForm.ts b/ui/analyse/src/study/commentForm.ts
@@ -81,9 +81,9 @@ export function ctrl(root: AnalyseCtrl): CommentForm {
 }
 
 export function viewDisabled(root: AnalyseCtrl, why: string): VNode {
-  return h('div.study_comment_form.underboard_form', [
+  return h('div.study_comment_form', [
     currentComments(root, true),
-    h('div.disabled', why)
+    h('div.message', h('span', why))
   ]);
 }
 

diff --git a/ui/analyse/src/study/studyView.ts b/ui/analyse/src/study/studyView.ts
@@ -51,15 +51,15 @@ function buttons(root: AnalyseCtrl): VNode {
   return h('div.study_buttons', [
     h('div.member_buttons', [
       // distinct classes (sync, write) allow snabbdom to differentiate buttons
-      showSticky ? h('a.fbt.mode.sync.hint--top', {
+      showSticky ? h('a.mode.sync.hint--top', {
         attrs: { 'data-hint': 'All sync members remain on the same position' },
         class: { on: ctrl.vm.mode.sticky },
         hook: bind('click', ctrl.toggleSticky)
       }, [
         ctrl.vm.behind ? h('span.behind', '' + ctrl.vm.behind) : h('i.is'),
         'Sync'
       ]) : null,
-      ctrl.members.canContribute() ? h('a.fbt.mode.write.hint--top', {
+      ctrl.members.canContribute() ? h('a.mode.write.hint--top', {
         attrs: { 'data-hint': 'Write changes to the server' },
         class: { on: ctrl.vm.mode.write },
         hook: bind('click', ctrl.toggleWrite)