voterunner

commit

a4eb2e751b482074f39e286ff395ee3a0b90fb2b

parent

881bcf31b907ea8cb0be4b4bb038cf1cbe5ec10c

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2017-11-18 09:58

use npm instead of bower

Diffstat

4 files changed, 4 insertions, 155 deletions

diff --git a/package.json b/package.json

@@ -11,6 +11,7 @@
   11    11 		"socket.io": "^1.7.4"
   12    12 	},
   13    13 	"devDependencies": {
   -1    14 		"mfbs": "^3.1.1",
   14    15 		"socket.io-client": "^1.7.4",
   15    16 		"virtual-dom": "^2.1.1"
   16    17 	},

diff --git a/static/scss/bower_components/mfbs/sass/base.scss b/static/scss/bower_components/mfbs/sass/base.scss

@@ -1,137 +0,0 @@
    1    -1 @viewport {
    2    -1     width: device-width;
    3    -1 }
    4    -1 
    5    -1 *,
    6    -1 *::before,
    7    -1 *::after {
    8    -1     box-sizing: inherit;
    9    -1     max-width: 100%;
   10    -1 }
   11    -1 
   12    -1 p, address, blockquote, pre, table, dl, ul, ol, figure, fieldset {
   13    -1     margin-top: 0;
   14    -1     margin-bottom: $spacer;
   15    -1 }
   16    -1 
   17    -1 html {
   18    -1     overflow-y: scroll;
   19    -1     background-color: $color-bg;
   20    -1     box-sizing: border-box;
   21    -1     color: $color-fg;
   22    -1     font-size: $font-size-max;
   23    -1     font-family: sans-serif;
   24    -1     line-height: 1.4;
   25    -1 }
   26    -1 body {
   27    -1     margin: 2em auto;
   28    -1     max-width: 36em;
   29    -1     padding: 0 $padding;
   30    -1 }
   31    -1 
   32    -1 h1, h2, h3, h4, h5, h6 {
   33    -1     line-height: 1.2;
   34    -1     margin-bottom: 0.8rem;
   35    -1     margin-top: 1.5 * $spacer;
   36    -1 }
   37    -1 
   38    -1 a {
   39    -1     color: $color-link;
   40    -1     text-decoration: underline;
   41    -1 
   42    -1     &:hover, &:focus, &:active {
   43    -1         color: $color-link-focus;
   44    -1     }
   45    -1 }
   46    -1 
   47    -1 a:not([href]) {
   48    -1     color: inherit;
   49    -1     text-decoration: inherit;
   50    -1 
   51    -1     &:hover, &:focus, &:active {
   52    -1         color: inherit;
   53    -1     }
   54    -1 }
   55    -1 
   56    -1 *::selection {
   57    -1     background: $color-link;
   58    -1     color: $color-bg;
   59    -1 }
   60    -1 
   61    -1 hr {
   62    -1     border: 0;
   63    -1     border-bottom: 1px solid $color-border;
   64    -1     margin: $spacer 0;
   65    -1 }
   66    -1 
   67    -1 pre, code {
   68    -1     font-size: 90%;
   69    -1     font-family: monospace;
   70    -1     background-color: $color-bg-tint;
   71    -1 }
   72    -1 code {
   73    -1     padding: 0 0.25em;
   74    -1 }
   75    -1 pre {
   76    -1     padding: $padding;
   77    -1     overflow: auto;
   78    -1     border: 1px solid $color-border;
   79    -1 
   80    -1     code {
   81    -1         background: none;
   82    -1         font-size: 100%;
   83    -1         padding: 0;
   84    -1     }
   85    -1 }
   86    -1 
   87    -1 ol, ul {
   88    -1     padding-left: $indentation;
   89    -1 }
   90    -1 dt {
   91    -1     font-weight: bold;
   92    -1 }
   93    -1 dd {
   94    -1     margin-left: $indentation;
   95    -1 }
   96    -1 
   97    -1 blockquote {
   98    -1     font-style: italic;
   99    -1     margin-left: $indentation;
  100    -1     margin-right: 0;
  101    -1 }
  102    -1 
  103    -1 table {
  104    -1     border-collapse: collapse;
  105    -1     border-spacing: 0;
  106    -1 
  107    -1     td, th {
  108    -1         text-align: start;
  109    -1         padding: $padding;
  110    -1         border-top: 1px solid $color-border;
  111    -1         vertical-align: top;
  112    -1     }
  113    -1 }
  114    -1 
  115    -1 textarea {
  116    -1     resize: vertical;
  117    -1 }
  118    -1 
  119    -1 fieldset {
  120    -1     border: 1px solid $color-border;
  121    -1 }
  122    -1 
  123    -1 // Prevent sub and sup affecting line-height.
  124    -1 sub, sup {
  125    -1     line-height: 0;
  126    -1 }
  127    -1 
  128    -1 @media print {
  129    -1     html {
  130    -1         background: transparent;
  131    -1         color: #000;  // Black prints faster:
  132    -1     }
  133    -1 
  134    -1     h2, h3 {
  135    -1         page-break-after: avoid;
  136    -1     }
  137    -1 }

diff --git a/static/scss/bower_components/mfbs/sass/variables.scss b/static/scss/bower_components/mfbs/sass/variables.scss

@@ -1,16 +0,0 @@
    1    -1 // colors
    2    -1 
    3    -1 $color-bg: #fff !default;
    4    -1 $color-fg: #333 !default;
    5    -1 $color-bg-tint: mix($color-bg, $color-fg, 95%) !default;
    6    -1 $color-border: mix($color-bg, $color-fg, 60%) !default;
    7    -1 $color-link: #0275d8 !default;
    8    -1 $color-link-focus: mix($color-link, $color-fg, 50%) !default;
    9    -1 $color-invalid: red !default;
   10    -1 
   11    -1 // lengths
   12    -1 $font-size-min: 0.9em !default;
   13    -1 $font-size-max: 1.2em !default;
   14    -1 $padding: 0.5em !default;
   15    -1 $spacer: 1em !default;
   16    -1 $indentation: 2rem !default;

diff --git a/static/scss/style.scss b/static/scss/style.scss

@@ -7,8 +7,9 @@ $color-border: #c0c0c0;
    7     7 
    8     8 $padding: 0.4em;
    9     9 
   10    -1 @import 'bower_components/mfbs/sass/variables';
   11    -1 @import 'bower_components/mfbs/sass/base';
   -1    10 @import '../../node_modules/mfbs/sass/variables';
   -1    11 @import '../../node_modules/mfbs/sass/base';
   -1    12 @import '../../node_modules/mfbs/sass/layout';
   12    13 
   13    14 @import 'base';
   14    15 @import 'layout';