Merge pull request #3221 from fjordllc/main

Release 2021-09-08 15:29:42
fjordllc · Sep 10, 2021 · 92ca6de · 92ca6de
2 parents 40b80cc + e7c4d39
commit 92ca6de
Show file tree

Hide file tree

Showing 168 changed files with 769 additions and 2,140 deletions.
diff --git a/.traceroute.yml b/.traceroute.yml
@@ -16,6 +16,7 @@ ignore_unreachable_actions:
   - .*#require_staff_login
   - .*#require_admin_login
   - .*#require_mentor_login
+  - .*#require_admin_or_mentor_login
   - mails#welcome
   - reports#convert_to_hour_minute
   - reports#convert_to_ceiled_hour

diff --git a/Gemfile b/Gemfile
@@ -44,7 +44,6 @@ gem 'rails_autolink'
 gem 'rails-i18n'
 gem 'ransack'
 gem 'rollbar'
-gem 'rqrcode'
 gem 'slim-rails'
 gem 'sorcery'
 gem 'sorcery-jwt'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -107,7 +107,6 @@ GEM
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     childprocess (3.0.0)
-    chunky_png (1.4.0)
     cocoon (1.2.15)
     coderay (1.1.3)
     coffee-rails (5.0.0)
@@ -345,10 +344,6 @@ GEM
     retriable (3.1.2)
     rexml (3.2.5)
     rollbar (3.1.1)
-    rqrcode (1.2.0)
-      chunky_png (~> 1.0)
-      rqrcode_core (~> 0.2)
-    rqrcode_core (0.2.0)
     rubocop (1.18.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
@@ -531,7 +526,6 @@ DEPENDENCIES
   rails_autolink
   ransack
   rollbar
-  rqrcode
   rubocop
   rubocop-fjord
   rubocop-minitest

diff --git a/app/assets/images/pijord-book-logo.svg b/app/assets/images/pijord-book-logo.svg
diff --git a/app/assets/stylesheets/atoms/_a-meta.sass b/app/assets/stylesheets/atoms/_a-meta.sass
@@ -30,7 +30,7 @@ a.a-meta
   color: $muted-text
   transition: all .2s ease-out
   &:hover
-    color: $main
+    color: $main-text
   &.is-disabled
     pointer-events: none
 

diff --git a/app/assets/stylesheets/atoms/_a-user-name.sass b/app/assets/stylesheets/atoms/_a-user-name.sass
@@ -2,6 +2,7 @@
   color: $muted-text
   font-size: .8125rem
   line-height: 1.4
+  white-space: nowrap
 
 a.a-user-name
   +hover-link
diff --git a/app/assets/stylesheets/blocks/admin/_admin-table.sass b/app/assets/stylesheets/blocks/admin/_admin-table.sass
@@ -93,7 +93,7 @@
     text-decoration: underline
 
 .admin-table__user-login-name
-  color: $main
+  color: $main-text
 
 .is-user-icon-xl
   +size(100% auto)

diff --git a/app/assets/stylesheets/blocks/calender/_calender-header.sass b/app/assets/stylesheets/blocks/calender/_calender-header.sass
diff --git a/app/assets/stylesheets/blocks/card/_card-books.sass b/app/assets/stylesheets/blocks/card/_card-books.sass
@@ -1,5 +1,13 @@
+.card-books__items
+  +media-breakpoint-up(md)
+    display: flex
+    flex-wrap: wrap
 
 .card-books-item
+  +media-breakpoint-up(md)
+    flex: 0 0 50%
+    &:nth-child(odd)
+      border-right: solid 1px $border
   &:not(:first-child)
     border-top: solid 1px $border
 
@@ -39,7 +47,7 @@
 
 .card-books-item__inner:hover .card-books-item__title-label
   text-decoration: underline
-  color: $main
+  color: $main-text
 
 .card-books-item__price
   +text-block(.875rem 1.4 .5em, $default-text)

diff --git a/app/assets/stylesheets/blocks/course/_courses.sass b/app/assets/stylesheets/blocks/course/_courses.sass
@@ -13,7 +13,7 @@
 
 .courses-item__title-link
   display: block
-  color: $main
+  color: $main-text
   +hover-link
 
 .courses-item__description

diff --git a/app/assets/stylesheets/blocks/form/_form-actions.sass b/app/assets/stylesheets/blocks/form/_form-actions.sass
@@ -34,7 +34,7 @@
       margin-bottom: 1rem
   &.is-main
     +media-breakpoint-up(md)
-      min-width: 16rem
+      min-width: 20rem
     +media-breakpoint-down(sm)
       width: 100%
   &.has-help

diff --git a/app/assets/stylesheets/blocks/form/_many-check-boxes.sass b/app/assets/stylesheets/blocks/form/_many-check-boxes.sass
@@ -12,7 +12,7 @@
   cursor: pointer
   &.is-checked
     background-color: $accent
-    color: $main
+    color: $main-text
   .many-check-boxes__item:last-child &
     border-bottom: none
   input

diff --git a/app/assets/stylesheets/blocks/form/_reservations.sass b/app/assets/stylesheets/blocks/form/_reservations.sass
diff --git a/app/assets/stylesheets/blocks/header/_header-dropdown.sass b/app/assets/stylesheets/blocks/header/_header-dropdown.sass
@@ -87,7 +87,7 @@
   +size(100% 2.75rem)
   transition: all .2s ease-out
   +media-breakpoint-up(md)
-    color: $main
+    color: $main-text
   +media-breakpoint-down(sm)
     color: $reversal-text
   &:hover

diff --git a/app/assets/stylesheets/blocks/header/_header-links.sass b/app/assets/stylesheets/blocks/header/_header-links.sass
@@ -34,7 +34,7 @@
     background-color: #f8f8f8
   &.is-active
     background-color: $warning
-    color: $main
+    color: $main-text
 
 .header-links__link-label
   margin-top: .375em

diff --git a/app/assets/stylesheets/blocks/page/_page-tabs.sass b/app/assets/stylesheets/blocks/page/_page-tabs.sass
@@ -2,7 +2,7 @@
   background-color: $background-shade
   padding-top: .5rem
   border-top: solid 1px $border-shade
-  border-bottom: solid 1px $border-more-shade
+  border-bottom: solid 1px $border-more-more-shade
   .sort-nav + &
     border-top: solid 1px $border-more-more-shade
   +media-breakpoint-down(sm)
@@ -31,24 +31,28 @@
 
 .page-tabs__item-link
   +flex-link
-  +text-block(.825rem 1, #7d8486 600)
+  +text-block(.825rem 1, $default-text 600)
   align-items: center
   justify-content: center
   height: 2.75rem
   background-color: #dedede
   +padding(horizontal, 1em)
   +border-radius(top, .25rem)
-  border: solid 1px $border-more-shade
+  border: solid 1px $border-more-more-shade
   +position(relative)
+  transition: all .2s ease-out
   +media-breakpoint-down(sm)
     font-size: .75rem
   &:hover
-    color: $default-text
+    background-color: $background
   &.is-active
     background-color: $background
-    border-color: $border-more-shade
+    border-color: $border-more-more-shade
     border-bottom-color: $background
-    color: $default-text
+    color: $main-text
+  &.is-inactive
+    pointer-events: none
+    color: $muted-text
 
 .page-tabs__item-count
   +position(right .125rem, top .125rem)
diff --git a/app/assets/stylesheets/blocks/page/_switch.sass b/app/assets/stylesheets/blocks/page/_switch.sass
@@ -15,7 +15,7 @@
       +position(relative, top -1px)
     &:hover
       .switch__label-text
-        color: $main
+        color: $main-text
         text-decoration: underline
       .a-help
         background-color: $main
diff --git a/app/assets/stylesheets/blocks/practice/_categories.sass b/app/assets/stylesheets/blocks/practice/_categories.sass
@@ -49,7 +49,7 @@
   +text-block(1rem 1, $muted-text)
   transition: all .2s ease-out
   &:hover
-    color: $main
+    color: $main-text
 
 .categories__label
   +text-block(.75rem 2rem, $main center 600)
@@ -94,4 +94,4 @@
   +text-block(1rem 1, $muted-text)
   transition: all .2s ease-out
   &:hover
-    color: $main
+    color: $main-text
diff --git a/app/assets/stylesheets/blocks/practice/_practice-contents.sass b/app/assets/stylesheets/blocks/practice/_practice-contents.sass
@@ -39,6 +39,6 @@
     transition: all .2s ease-out
   &:hover
     .a-meta
-      color: $main
+      color: $main-text
     .a-help
       background-color: $main
diff --git a/app/assets/stylesheets/blocks/shared/_page-nav.sass b/app/assets/stylesheets/blocks/shared/_page-nav.sass
@@ -1,7 +1,7 @@
 .page-nav
   +position(right 0, top 3.5rem)
   flex: 1
-  min-width: 14rem
+  min-width: 20rem
   position: sticky
   background-color: $base
   border: solid 1px #dadada
@@ -36,15 +36,15 @@
     border-bottom: none
 
 .page-nav__item-link
-  padding: .375rem .75rem
-  +text-block(.75rem 1.4, block $muted-text)
+  padding: .5rem .75rem
+  +text-block(.8125rem 1.4, block $muted-text)
   +block-link
   transition: all .1s ease-in
   background-color: transparent
   .page-nav__item:last-child &
     +border-radius(bottom, .25rem)
   &:hover
-    color: $main
+    color: $main-text
     text-decoration: underline
   &.is-current
     pointer-events: none

diff --git a/app/assets/stylesheets/blocks/shared/_page-tags-nav.sass b/app/assets/stylesheets/blocks/shared/_page-tags-nav.sass
@@ -5,7 +5,7 @@
   +media-breakpoint-up(md)
     +position(sticky, right 0, top 3.5rem)
     flex: 1
-    min-width: 16rem
+    min-width: 20rem
     margin-left: 1.5rem
   +media-breakpoint-down(sm)
     margin-top: 1rem

diff --git a/app/assets/stylesheets/blocks/shared/_tab-nav.sass b/app/assets/stylesheets/blocks/shared/_tab-nav.sass
@@ -1,5 +1,11 @@
 .tab-nav
   border-bottom: solid 1px $background-shade
+  &.is-centered
+    border-bottom: none
+    .tab-nav__items
+      justify-content: center
+      padding-top: 1.5rem
+      padding-bottom: 0
   &:not(:last-child)
     margin-bottom: 1.5rem
 
@@ -26,7 +32,7 @@
   transition: all.2s ease-out
   &:hover
     background-color: shade($background-shade, 10%)
-    color: $main
+    color: $main-text
   &.is-active
     background-color: $accent
-    color: $main
+    color: $main-text
diff --git a/app/assets/stylesheets/blocks/thread/_thread-comments.sass b/app/assets/stylesheets/blocks/thread/_thread-comments.sass
@@ -34,7 +34,7 @@ $thread-header-author: 3.5rem
     margin-right: 0
 
 .thread-comment__title-link
-  color: $main
+  color: $main-text
   height: 100%
   display: flex
   align-items: center

diff --git a/app/assets/stylesheets/blocks/thread/_thread-list-item-actions.sass b/app/assets/stylesheets/blocks/thread/_thread-list-item-actions.sass
@@ -38,4 +38,4 @@
     margin-right: .5em
   &:hover
     background-color: tint($main, 95%)
-    color: $main
+    color: $main-text
diff --git a/app/assets/stylesheets/blocks/thread/_thread-list-item-meta.sass b/app/assets/stylesheets/blocks/thread/_thread-list-item-meta.sass
@@ -22,7 +22,7 @@
     +margin(horizontal, .125em)
 .thread-list-item-meta__item-link
   +hover-link-reversal
-  color: $main
+  color: $main-text
 
 .thread-list-item-meta__item-note
   +text-block(.75rem 1.4, $default-text)