Merge pull request #2276 from weseek/imprv/login-register-final-fix

Imprv/login register final fix

src/client/styles/scss/theme/_apply-colors-kibela.scss

@@ -1,185 +1,187 @@
 body.kibela {
-  .icon-link,
-  .CodeMirror-hint-active,
-  .grw-nav-main-left-tab,
-  .tav-pane,
-  .active {
-    color: $subthemecolor;
-  }
+  .growi:not(.login-page) {
+    .icon-link,
+    .CodeMirror-hint-active,
+    .grw-nav-main-left-tab,
+    .tav-pane,
+    .active {
+      color: $subthemecolor;
+    }
 
-  .bg-white {
-    background: #fefffe !important;
-  }
+    .bg-white {
+      background: #fefffe !important;
+    }
 
-  .bg-primary {
-    background-color: $primary !important;
-  }
+    .bg-primary {
+      background-color: $primary !important;
+    }
 
-  .grw-subnavbar {
-    background-color: rgba(lighten($bgcolor-global, 50%), 1);
-  }
+    .grw-subnavbar {
+      background-color: rgba(lighten($bgcolor-global, 50%), 1);
+    }
 
-  /* kibela block */
-  .kibela-border-top {
-    border-top: solid 0.4em $thickborder;
-  }
+    /* kibela block */
+    .kibela-border-top {
+      border-top: solid 0.4em $thickborder;
+    }
 
-  /* page wrapper */
-  #page-wrapper {
-    background-color: $bgcolor-global;
-  }
+    /* page wrapper */
+    #page-wrapper {
+      background-color: $bgcolor-global;
+    }
 
-  .search-input-group,
-  .search-typeahead {
-    .btn {
-      background-color: transparent;
+    .search-input-group,
+    .search-typeahead {
+      .btn {
+        background-color: transparent;
+      }
     }
-  }
 
-  .btn-open-dropzone {
-    background: $themelight;
-  }
+    .btn-open-dropzone {
+      background: $themelight;
+    }
 
-  /* page list */
-  .page-list {
-    background: white;
-  }
+    /* page list */
+    .page-list {
+      background: white;
+    }
 
-  .page-attachments-row {
-    background-color: #e5ecf1;
-  }
+    .page-attachments-row {
+      background-color: #e5ecf1;
+    }
 
-  /* round */
-  .round-corner-top {
-    border-top: solid 0.4em $thickborder;
-  }
+    /* round */
+    .round-corner-top {
+      border-top: solid 0.4em $thickborder;
+    }
 
-  /* admin navigation */
-  .admin-navigation {
-    .list-group-item {
-      background-color: transparent;
+    /* admin navigation */
+    .admin-navigation {
+      .list-group-item {
+        background-color: transparent;
 
-      &:hover {
-        background: #eee;
+        &:hover {
+          background: #eee;
+        }
+      }
+
+      .list-group-item.active {
+        color: white;
+        background: $bgcolor-navbar-active;
       }
     }
 
-    .list-group-item.active {
-      color: white;
-      background: $bgcolor-navbar-active;
+    /* search page */
+    .search-result-list,
+    .page-list-li {
+      background: $themelight;
     }
-  }
 
-  /* search page */
-  .search-result-list,
-  .page-list-li {
-    background: $themelight;
-  }
+    /* Tabs */
+    .nav.nav-tabs {
+      > .nav-item {
+        color: $color-link;
+        background: transparent;
 
-  /* Tabs */
-  .nav.nav-tabs {
-    > .nav-item {
-      color: $color-link;
-      background: transparent;
+        &:hover,
+        &:focus {
+          > .nav-link {
+            color: $color-link-hover;
+          }
+        }
 
-      &:hover,
-      &:focus {
         > .nav-link {
-          color: $color-link-hover;
+          color: $color-link;
         }
-      }
-
-      > .nav-link {
-        color: $color-link;
-      }
 
-      > .nav-link.active {
-        background: transparent !important;
-        border-bottom: solid 2.7px $thickborder;
+        > .nav-link.active {
+          background: transparent !important;
+          border-bottom: solid 2.7px $thickborder;
+        }
       }
     }
-  }
-
-  /* wiki */
-  .wiki {
-    h1 {
-      border-bottom: solid 2px $thickborder !important;
-    }
 
-    h2 {
-      border-color: solid 1px $thickborder;
-    }
+    /* wiki */
+    .wiki {
+      h1 {
+        border-bottom: solid 2px $thickborder !important;
+      }
 
-    // change color of highlighted header in wiki (default: orange)
-    .code-line.revision-head.highlighted {
-      color: $themelight;
-      background-color: lighten($bgcolor-theme, 20%);
+      h2 {
+        border-color: solid 1px $thickborder;
+      }
 
-      .icon-note,
-      .icon-link {
+      // change color of highlighted header in wiki (default: orange)
+      .code-line.revision-head.highlighted {
         color: $themelight;
+        background-color: lighten($bgcolor-theme, 20%);
+
+        .icon-note,
+        .icon-link {
+          color: $themelight;
+        }
       }
     }
-  }
 
-  /* Modal */
-  .modal-title {
-    color: #ffffff; // override header colors
-  }
-  .modal-content {
-    background-color: $themelight;
-  }
-
-  /* Inline Code */
-  :not(.hljs) > code:not(.hljs) {
-    color: $color-inline-code;
-    background-color: $bgcolor-inline-code;
-    border: solid 1px $bordercolor-inline-code;
-    border-radius: 0.35em;
-  }
+    /* Modal */
+    .modal-title {
+      color: #ffffff; // override header colors
+    }
+    .modal-content {
+      background-color: $themelight;
+    }
 
-  /* button */
-  .btn-primary {
-    background: $primary;
-    border: 1px solid $primary;
-  }
+    /* Inline Code */
+    :not(.hljs) > code:not(.hljs) {
+      color: $color-inline-code;
+      background-color: $bgcolor-inline-code;
+      border: solid 1px $bordercolor-inline-code;
+      border-radius: 0.35em;
+    }
 
-  /* edit */
-  .CodeMirror {
-    border: solid 1.2px #d8d8d8;
-    border-top: solid 0.3em $thickborder !important;
-  }
+    /* button */
+    .btn-primary {
+      background: $primary;
+      border: 1px solid $primary;
+    }
 
-  &.on-edit {
-    .page-editor-preview-container {
-      background: white !important;
+    /* edit */
+    .CodeMirror {
+      border: solid 1.2px #d8d8d8;
+      border-top: solid 0.3em $thickborder !important;
     }
-  }
 
-  /* navbar */
-  .grw-navbar {
-    .nav-item > .nav-link {
-      &:hover {
-        color: $color-link-nabvar-hover;
-      }
-      &:focus {
-        color: $color-link-nabvar;
+    &.on-edit {
+      .page-editor-preview-container {
+        background: white !important;
       }
     }
-    #personal-dropdown {
-      a.nav-link {
-        color: $color-global;
+
+    /* navbar */
+    .grw-navbar {
+      .nav-item > .nav-link {
+        &:hover {
+          color: $color-link-nabvar-hover;
+        }
+        &:focus {
+          color: $color-link-nabvar;
+        }
+      }
+      #personal-dropdown {
+        a.nav-link {
+          color: $color-global;
+        }
       }
     }
-  }
 
-  /* h */
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    color: $color-header;
+    /* h */
+    h1,
+    h2,
+    h3,
+    h4,
+    h5,
+    h6 {
+      color: $color-header;
+    }
   }
 }

src/client/styles/scss/theme/antarctic.scss

@@ -127,6 +127,11 @@ html[dark] {
       background-color: transparent;
     }
   }
+
+  a#login.link-switch,
+  a#register.link-switch {
+    color: rgba(black, 0.5);
+  }
 }
 
 //== Dark Mode

src/client/styles/scss/theme/spring.scss

@@ -13,26 +13,6 @@
 // $light: #;
 // $dark: #;
 
-.growi:not(.login-page) {
-  // add background-image
-  #page-wrapper,
-  .page-editor-preview-container {
-    background-image: url('/images/themes/spring/spring02.svg');
-    background-attachment: fixed;
-    background-position: bottom;
-    background-size: cover;
-  }
-}
-
-.growi.login-page {
-  #page-wrapper {
-    background-image: url('/images/themes/spring/spring.svg');
-    background-attachment: fixed;
-    background-position: bottom;
-    background-size: cover;
-  }
-}
-
 $themecolor: #ffb8c6;
 $themelight: #fff0f5;
 $subthemecolor: #67a856;
@@ -118,6 +98,32 @@ html[dark] {
   @import 'apply-colors';
   @import 'apply-colors-light';
 
+  .growi:not(.login-page) {
+    // add background-image
+    #page-wrapper,
+    .page-editor-preview-container {
+      background-image: url('/images/themes/spring/spring02.svg');
+      background-attachment: fixed;
+      background-position: bottom;
+      background-size: cover;
+    }
+  }
+
+  .growi.login-page {
+    #page-wrapper {
+      background-color: $themelight;
+      background-image: url('/images/themes/spring/spring.svg');
+      background-attachment: fixed;
+      background-position: bottom;
+      background-size: cover;
+    }
+  }
+
+  a#login.link-switch,
+  a#register.link-switch {
+    color: $color-global;
+  }
+
   .table {
     background-color: $bgcolor-global;
   }

src/client/styles/scss/theme/wood.scss

@@ -134,6 +134,18 @@ html[dark] {
       border: none;
     }
   }
+
+  // login and register
+
+  .login-header,
+  .login-dialog {
+    background-color: rgba(black, 0.1);
+  }
+
+  a#login.link-switch,
+  a#register.link-switch {
+    color: rgba(black, 0.5);
+  }
 }
 
 //== Dark Mode