Просмотр исходного кода

Improve the settings slide-in view

Johannes Zellner 11 лет назад
Родитель
Сommit
8021642849
3 измененных файлов с 62 добавлено и 60 удалено
  1. 53 52
      frontend/index.html
  2. 7 0
      frontend/scss/index.scss
  3. 2 8
      frontend/scss/settings.scss

+ 53 - 52
frontend/index.html

@@ -72,13 +72,65 @@
         </div>
       </div>
 
+      <div class="container main">
+        <div class="row">
+          <div class="col s2 tags">
+            <div v-show="!busyTags" class="right-align">
+              <br/>
+              <div v-for="tag in tags | orderBy 'usage' -1" style="text-overflow: ellipsis; overflow: hidden;">
+                <a href="{{'/#search?#' + tag.name}}" v-on:click="tagSearch(tag)" transition="present">#{{ tag.name }}</a>
+              </div>
+              <br/>
+            </div>
+            <div v-show="busyTags">
+              <br/>
+              <br/>
+              <br/>
+              <center><i class="spinner"></i></center>
+            </div>
+          </div>
+          <div class="col s8">
+            <div class="card" v-on:click="giveAddFocus()">
+              <div class="card-content right-align">
+                <textarea v-el:addinput placeholder="Add something..." v-model="thingContent" v-bind:class="{ active: !!thingContent }"></textarea>
+                <button v-el:addbutton class="waves-effect waves-teal btn-flat" v-on:click="addThing()" v-bind:class="{ hide: !thingContent }">add</button>
+              </div>
+            </div>
+            <div v-show="!busyThings">
+              <div class="card thing" v-for="thing in things">
+                  <div class="col s12 thing-title-date">
+                    {{ thing.createdAt | prettyDateOffset }}
+                    <span v-show="thing.edit">
+                      <button class="waves-effect waves-teal btn-flat" v-on:click="cancelEdit(thing)">cancel</button>
+                      <button class="waves-effect waves-teal btn green" v-on:click="saveEdit(thing)">save</button>
+                    </span>
+                    <span v-show="!thing.edit">
+                      <button class="waves-effect waves-teal btn-flat" v-on:click="showThingDel(thing)">delete</button>
+                      <button class="waves-effect waves-teal btn-flat" v-on:click="showThingEdit(thing)">edit</button>
+                    </span>
+                </div>
+                <div class="card-content" v-show="thing.edit"><textarea v-model="thing.content" style="height: 200px"></textarea></div>
+                <div class="card-content" v-show="!thing.edit">{{{ thing.richContent | markdown }}}</div>
+              </div>
+            </div>
+            <div v-show="busyThings">
+              <br/>
+              <br/>
+              <br/>
+              <center><i class="spinner"></i></center>
+            </div>
+          </div>
+        </div>
+      </div>
+
       <div class="fixed-action-btn" style="bottom: 45px; right: 24px;">
         <a class="btn-floating btn-large" v-on:click="showSettings()">
           <i class="large material-icons">reorder</i>
         </a>
       </div>
 
-      <div class="settings" id="settings">
+      <div class="settings" id="settings" v-bind:class="{ 'open': open }">
+        <div class="backdrop" v-bind:class="{ 'open': open }" v-on:click="hide()"></div>
         <div class="container" v-bind:class="{ 'open': open }">
           <div class="section">
             <h5>Interface</h5>
@@ -129,57 +181,6 @@
           </div>
         </div>
       </div>
-
-      <div class="container main">
-        <div class="row">
-          <div class="col s2 tags">
-            <div v-show="!busyTags" class="right-align">
-              <br/>
-              <div v-for="tag in tags | orderBy 'usage' -1" style="text-overflow: ellipsis; overflow: hidden;">
-                <a href="{{'/#search?#' + tag.name}}" v-on:click="tagSearch(tag)" transition="present">#{{ tag.name }}</a>
-              </div>
-              <br/>
-            </div>
-            <div v-show="busyTags">
-              <br/>
-              <br/>
-              <br/>
-              <center><i class="spinner"></i></center>
-            </div>
-          </div>
-          <div class="col s8">
-            <div class="card" v-on:click="giveAddFocus()">
-              <div class="card-content right-align">
-                <textarea v-el:addinput placeholder="Add something..." v-model="thingContent" v-bind:class="{ active: !!thingContent }"></textarea>
-                <button v-el:addbutton class="waves-effect waves-teal btn-flat" v-on:click="addThing()" v-bind:class="{ hide: !thingContent }">add</button>
-              </div>
-            </div>
-            <div v-show="!busyThings">
-              <div class="card thing" v-for="thing in things">
-                  <div class="col s12 thing-title-date">
-                    {{ thing.createdAt | prettyDateOffset }}
-                    <span v-show="thing.edit">
-                      <button class="waves-effect waves-teal btn-flat" v-on:click="cancelEdit(thing)">cancel</button>
-                      <button class="waves-effect waves-teal btn green" v-on:click="saveEdit(thing)">save</button>
-                    </span>
-                    <span v-show="!thing.edit">
-                      <button class="waves-effect waves-teal btn-flat" v-on:click="showThingDel(thing)">delete</button>
-                      <button class="waves-effect waves-teal btn-flat" v-on:click="showThingEdit(thing)">edit</button>
-                    </span>
-                </div>
-                <div class="card-content" v-show="thing.edit"><textarea v-model="thing.content" style="height: 200px"></textarea></div>
-                <div class="card-content" v-show="!thing.edit">{{{ thing.richContent | markdown }}}</div>
-              </div>
-            </div>
-            <div v-show="busyThings">
-              <br/>
-              <br/>
-              <br/>
-              <center><i class="spinner"></i></center>
-            </div>
-          </div>
-        </div>
-      </div>
     </div>
 
     <div id="guacamoly-settings-node" class="hide"></div>

+ 7 - 0
frontend/scss/index.scss

@@ -73,3 +73,10 @@ textarea {
         height: 200px;
     }
 }
+
+.action {
+    display: inline-block;
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}

+ 2 - 8
frontend/scss/settings.scss

@@ -5,18 +5,12 @@
     top: 0;
     left: 0;
     overflow: hidden;
+    z-index: -1;
 
     &.open {
         z-index: 2000;
     }
 
-    .action {
-        display: inline-block;
-        position: absolute;
-        top: 20px;
-        right: 20px;
-    }
-
     .container {
         position: absolute;
         top: 0;
@@ -26,7 +20,6 @@
         background-color: white;
         transition: right 250ms;
         box-shadow: 0 8px 17px 0 rgba(0,0,0,.2),0 6px 20px 0 rgba(0,0,0,.19);
-        z-index: 2000;
         overflow: auto;
         padding: 20px;
         padding-top: 50px;
@@ -37,6 +30,7 @@
     }
 
     .backdrop {
+        display: block;
         width: 100%;
         height: 100%;
         position: fixed;