pupupu

commit

7548dd4a204b3bc963a42d440699060f1449af28

parent

fcfba3e5ffb08327489940771d24a3dfcd246c25

Author

Tobias Bengfort <tobias.bengfort@posteo.de>

Date

2018-10-20 20:39

refactor styling

Diffstat

4 files changed, 44 insertions, 44 deletions

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

@@ -6,6 +6,6 @@
    6     6     "simplemde": "^1.11.2"
    7     7   },
    8     8   "devDependencies": {
    9    -1     "mfbs": "^4.0.0"
   -1     9     "mfbs": "github:xi/mfbs#master"
   10    10   }
   11    11 }

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

@@ -1,4 +1,8 @@
    1     1 @import "../node_modules/mfbs/sass/variables";
   -1     2 
   -1     3 $color-link-visited: $color-link;
   -1     4 $color-link-visited-focus: $color-link-focus;
   -1     5 
    2     6 @import "../node_modules/mfbs/sass/base";
    3     7 @import "../node_modules/mfbs/sass/form";
    4     8 @import "../node_modules/mfbs/sass/layout";
@@ -9,37 +13,39 @@ textarea {
    9    13 	margin-bottom: $spacer;
   10    14 }
   11    15 
   12    -1 .button--danger {
   13    -1 	@include button-color(red, white, darkred);
   -1    16 .CodeMirror-scroll,
   -1    17 textarea {
   -1    18 	max-height: 60vh;
   14    19 }
   15    20 
   16    -1 .button--small {
   17    -1 	line-height: 1.5;
   18    -1 	padding: 0 0.3em;
   -1    21 input[type="file"] {
   -1    22 	border: 0;
   -1    23 	padding: 0;
   19    24 }
   20    25 
   21    -1 .input--invisible {
   22    -1 	padding: 0;
   23    -1 	border: 0;
   -1    26 .form--line {
   -1    27 	display: flex;
   -1    28 	margin-bottom: $spacer;
   -1    29 
   -1    30 	input,
   -1    31 	select {
   -1    32 		flex: 1 1 auto;
   -1    33 		min-width: 0;
   -1    34 		margin-right: $padding;
   -1    35 	}
   24    36 }
   25    37 
   26    -1 .CodeMirror-scroll,
   27    -1 textarea {
   28    -1 	max-height: 60vh;
   -1    38 button {
   -1    39 	white-space: nowrap;
   29    40 }
   30    41 
   31    -1 header {
   32    -1 	border-bottom: 1px solid $color-border;
   33    -1 	margin-bottom: 2 * $spacer;
   34    -1 	padding: ($padding / 2) 0;
   35    -1 	display: flex;
   36    -1 	flex-flow: row wrap;
   37    -1 	justify-content: space-between;
   38    -1 	align-items: center;
   -1    42 .button--danger {
   -1    43 	@include button-color(red, white, darkred);
   39    44 }
   40    45 
   41    -1 header form {
   42    -1 	display: inline;
   -1    46 .button--small {
   -1    47 	line-height: 1.5;
   -1    48 	padding: 0 0.3em;
   43    49 }
   44    50 
   45    51 .button-row {
@@ -48,6 +54,12 @@ header form {
   48    54 	margin-bottom: $spacer;
   49    55 }
   50    56 
   -1    57 header {
   -1    58 	border-bottom: 1px solid $color-border;
   -1    59 	margin-bottom: 2 * $spacer;
   -1    60 	padding: ($padding / 2) 0;
   -1    61 }
   -1    62 
   51    63 .file-list {
   52    64 	list-style: none;
   53    65 	margin: 0;
@@ -61,12 +73,6 @@ header form {
   61    73 		align-items: center;
   62    74 	}
   63    75 
   64    -1 	.flex-ignore {
   65    -1 		display: flex;
   66    -1 		flex: 1 1 auto;
   67    -1 		align-items: center;
   68    -1 	}
   69    -1 
   70    76 	.file-list__main {
   71    77 		flex: 1 1 auto;
   72    78 	}

diff --git a/templates/site.html b/templates/site.html

@@ -2,10 +2,7 @@
    2     2 
    3     3 {% block main %}
    4     4     <form method="POST">
    5    -1         <label>
    6    -1             {{ 'Metadata'|trans }}
    7    -1             <textarea name="yml">{{ yml }}</textarea>
    8    -1         </label>
   -1     5         <textarea name="yml">{{ yml }}</textarea>
    9     6 
   10     7         <div class="button-row">
   11     8             <div>

diff --git a/templates/uploads.html b/templates/uploads.html

@@ -24,17 +24,14 @@
   24    24                 {% endif %}
   25    25             </li>
   26    26         {% endfor %}
   27    -1         <li>
   28    -1             <form method="post" enctype="multipart/form-data" class="flex-ignore">
   29    -1                 <input type="file" name="file" class="input--invisible file-list__main">
   30    -1                 <input type="submit" value="{{ 'Upload file'|trans }}" class="button--small">
   31    -1             </form>
   32    -1         </li>
   33    -1         <li>
   34    -1             <form method="post" class="flex-ignore">
   35    -1                 <input type="text" name="folder" placeholder="{{ 'name'|trans }}" class="input--invisible file-list__main">
   36    -1                 <input type="submit" value="{{ 'Create folder'|trans }}" class="button--small">
   37    -1             </form>
   38    -1         </li>
   39    27     </ul>
   -1    28 
   -1    29     <form method="post" enctype="multipart/form-data" class="form--line">
   -1    30         <input type="file" name="file">
   -1    31         <button>{{ 'Upload file'|trans }}</button>
   -1    32     </form>
   -1    33     <form method="post" class="form--line">
   -1    34         <input type="text" name="folder">
   -1    35         <button>{{ 'Create folder'|trans }}</button>
   -1    36     </form>
   40    37 {% endblock %}