Merge pull request #94 from standardnotes/redesign

Redesign

Author: antsgar

.env.sample

@@ -30,5 +30,6 @@ NGINX_CONFIG_PATH=
 DOMAINS_FOLDER_PATH=
 CERTIFICATES_FOLDER_PATH=
 
-# ImageMagick
-IMAGE_MAGICK_PATH=
+# hCaptcha
+HCAPTCHA_SECRET_KEY=
+HCAPTCHA_SITE_KEY=

.gitignore

@@ -21,18 +21,7 @@
 /app/assets/templates/generated/
 
 # Ignore bower components
-/vendor/assets/bower_components/
 /node_modules
-/vendor/assets/javascripts/app.js
-/vendor/assets/javascripts/compiled.js
-/vendor/assets/javascripts/transpiled.js
-/vendor/assets/javascripts/compiled.min.js
-/vendor/assets/javascripts/lib.js
-/vendor/assets/javascripts/templates.js
-
-/vendor/assets/stylesheets/app.css
-/vendor/assets/stylesheets/app.css.map
-
 /.sass-cache
 
 # Ignore ENV variables config

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/simple-captcha"]
-	path = vendor/simple-captcha
-	url = [email protected]:mobitar/simple-captcha.git

Dockerfile

@@ -37,8 +37,6 @@ USER listed
 
 COPY --chown=$UID:$GID package.json yarn.lock Gemfile Gemfile.lock /listed/
 
-COPY --chown=$UID:$GID vendor /listed/vendor
-
 RUN yarn install --frozen-lockfile
 
 RUN gem install bundler && bundle install

Gemfile

@@ -18,7 +18,6 @@ gem 'haml-rails'
 gem 'whenever'
 gem 'redcarpet'
 gem 'rack-cors', :require => 'rack/cors'
-gem 'simple_captcha2', :path => 'vendor/simple-captcha', require: 'simple_captcha'
 gem 'react_on_rails', '11.3'
 gem 'webpacker', '~> 4'
 

Gemfile.lock

@@ -1,9 +1,3 @@
-PATH
-  remote: vendor/simple-captcha
-  specs:
-    simple_captcha2 (0.4.3)
-      rails (>= 4.1)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -311,7 +305,6 @@ DEPENDENCIES
   safe_yaml
   sanitize
   sass-rails (~> 5.0)
-  simple_captcha2!
   spring
   spring-watcher-listen (~> 2.0.0)
   tzinfo-data

app/assets/stylesheets/application.scss

@@ -13,261 +13,5 @@
  *= require_self
  */
 
-@import "vars";
-@import "queries";
 @import "stylekit";
-@import "posts";
-@import "guestbook_entry";
-@import "authors";
-@import "help";
-@import "usage";
 @import "rouge";
-@import "subscriptions";
-
-* {
-  box-sizing: border-box;
-}
-
-html,
-body {
-  margin: 0;
-  font-family: sans-serif;
-  line-height: 1.5;
-  color: var(--body-text-color);
-  background-color: var(--background-color);
-  font-size: 18px;
-  height: 100%;
-}
-
-body {
-  padding: 1rem 6rem 4px 6rem;
-  max-width: 1200px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-@include MQ-Xsmall() {
-  body {
-    padding: 1.5rem 1.5rem;
-  }
-}
-
-@include MQ-Small() {
-  body {
-    padding: 1.5rem 2rem;
-  }
-}
-
-h2 {
-  font-size: 1.4rem;
-}
-
-.block {
-  display: block;
-}
-
-a {
-  color: var(--link-color);
-  text-decoration: none;
-
-  &:hover {
-    text-decoration: underline;
-  }
-}
-
-.faded {
-  opacity: 0.3;
-}
-
-input,
-textarea {
-  border: 1px solid rgba(black, 0.1);
-  resize: none;
-
-  &:focus {
-    outline: none;
-  }
-}
-
-textarea {
-  padding: 8px;
-}
-
-hr {
-  $hr-height: 35px;
-  display: block;
-  border: 0;
-  text-align: center;
-  box-sizing: content-box;
-  height: $hr-height;
-  padding-top: 10px;
-  border: 0 !important;
-
-  &.left {
-    text-align: left;
-  }
-
-  &:before {
-    font-family: Georgia, Cambria, "Times New Roman", Times, serif;
-    font-weight: 400;
-    font-style: italic;
-    font-size: 28px;
-    letter-spacing: 0.3em;
-    content: "...";
-    display: inline-block;
-    margin-right: 0.6em;
-    color: var(--body-text-color);
-    position: relative;
-    top: -$hr-height/2;
-  }
-}
-
-blockquote {
-  border-left: 2px solid #cdcdcd;
-  padding-left: 20px;
-  opacity: 0.8;
-  margin-left: 0;
-}
-
-h1,
-h2,
-h3 {
-  margin-top: 0;
-  margin-bottom: 4px;
-  -webkit-margin-after: 4px;
-}
-
-#main-container {
-  display: -webkit-box;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-orient: vertical;
-  -webkit-box-direction: normal;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  min-height: 100%;
-}
-
-#content-container {
-  -webkit-box-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-}
-
-#footer {
-  font-size: 12px;
-  color: gray;
-  margin-top: 30px;
-  margin-bottom: 15px;
-
-  .left {
-    float: left;
-
-    .listed {
-      color: var(--body-text-color);
-      display: inline-block;
-      padding-right: 8px;
-    }
-    .via {
-      color: gray;
-      display: inline-block;
-    }
-
-    .links {
-      display: inline;
-      border-left: 1px solid var(--body-text-color);
-      padding-left: 8px;
-
-      a {
-        margin-right: 5px;
-      }
-    }
-
-    * {
-      display: inline-block;
-    }
-  }
-
-  a {
-    color: var(--body-text-color);
-  }
-  .right {
-    float: right;
-  }
-}
-
-.mt-5 {
-  margin-top: 5px !important;
-}
-
-.mt-10 {
-  margin-top: 10px !important;
-}
-
-.mt-15 {
-  margin-top: 15px !important;
-}
-
-.mt-20 {
-  margin-top: 20px !important;
-}
-
-.mt-30 {
-  margin-top: 30px !important;
-}
-
-.mt-40 {
-  margin-top: 40px !important;
-}
-
-.mt-50 {
-  margin-top: 50px !important;
-}
-
-button {
-  border: none;
-  cursor: pointer;
-
-  @mixin wide-button() {
-    font-weight: bold;
-    text-align: center;
-    padding: 10px;
-    font-size: 16px;
-    min-width: 200px;
-
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-
-  &.black {
-    @include wide-button();
-    background-color: black;
-    color: white;
-  }
-
-  &.white {
-    @include wide-button();
-    background-color: white;
-    color: black;
-    border: 1px solid rgba(gray, 0.2);
-  }
-}
-
-.wrap {
-  word-wrap: break-word;
-}
-
-input.delete-blog {
-  background-color: red;
-  color: white;
-  font-weight: bold;
-}
-
-div.alert.error {
-  border-width: thin;
-  border-style: dotted;
-  text-align: center;
-  margin-bottom: 10px;
-  color: red;
-}