Jared Norris 8 vuotta sitten
vanhempi
commit
df8697f59f
2 muutettua tiedostoa jossa 32 lisäystä ja 68 poistoa
  1. 21
    66
      .idea/workspace.xml
  2. 11
    2
      VueApp/src/components/NavBar.vue

+ 21
- 66
.idea/workspace.xml Näytä tiedosto

@@ -2,7 +2,8 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="17e0a915-606d-4826-92ae-ad6ec8d45623" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" beforeDir="false" afterPath="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" afterDir="false" />
6 7
     </list>
7 8
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 9
     <option name="TRACKING_ENABLED" value="true" />
@@ -12,33 +13,12 @@
12 13
     <option name="LAST_RESOLUTION" value="IGNORE" />
13 14
   </component>
14 15
   <component name="FileEditorManager">
15
-    <leaf>
16
-      <file leaf-file-name="ElevationGraph.vue" pinned="false" current-in-tab="true">
17
-        <entry file="file://$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue">
16
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
17
+      <file leaf-file-name="NavBar.vue" pinned="false" current-in-tab="true">
18
+        <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
18 19
           <provider selected="true" editor-type-id="text-editor">
19
-            <state relative-caret-position="144">
20
-              <caret line="138" column="24" selection-start-line="138" selection-start-column="24" selection-end-line="138" selection-end-column="24" />
21
-            </state>
22
-          </provider>
23
-        </entry>
24
-      </file>
25
-      <file leaf-file-name="GoogleMap.vue" pinned="false" current-in-tab="false">
26
-        <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
27
-          <provider selected="true" editor-type-id="text-editor">
28
-            <state relative-caret-position="-763">
29
-              <caret line="32" column="31" lean-forward="true" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
30
-              <folding>
31
-                <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
32
-              </folding>
33
-            </state>
34
-          </provider>
35
-        </entry>
36
-      </file>
37
-      <file leaf-file-name="Main.vue" pinned="false" current-in-tab="false">
38
-        <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
39
-          <provider selected="true" editor-type-id="text-editor">
40
-            <state relative-caret-position="-117">
41
-              <caret line="38" column="43" lean-forward="true" selection-start-line="38" selection-start-column="43" selection-end-line="38" selection-end-column="43" />
20
+            <state relative-caret-position="495">
21
+              <caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
42 22
             </state>
43 23
           </provider>
44 24
         </entry>
@@ -82,8 +62,8 @@
82 62
         <option value="$PROJECT_DIR$/VueApp/src/main.js" />
83 63
         <option value="$PROJECT_DIR$/VueApp/src/components/Main.vue" />
84 64
         <option value="$PROJECT_DIR$/VueApp/src/App.vue" />
85
-        <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
86 65
         <option value="$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue" />
66
+        <option value="$PROJECT_DIR$/VueApp/src/components/NavBar.vue" />
87 67
       </list>
88 68
     </option>
89 69
   </component>
@@ -112,8 +92,6 @@
112 92
       <foldersAlwaysOnTop value="true" />
113 93
     </navigator>
114 94
     <panes>
115
-      <pane id="AndroidView" />
116
-      <pane id="Scope" />
117 95
       <pane id="ProjectPane">
118 96
         <subPane>
119 97
           <expand>
@@ -143,7 +121,9 @@
143 121
           <select />
144 122
         </subPane>
145 123
       </pane>
124
+      <pane id="AndroidView" />
146 125
       <pane id="PackagesPane" />
126
+      <pane id="Scope" />
147 127
     </panes>
148 128
   </component>
149 129
   <component name="PropertiesComponent">
@@ -235,14 +215,15 @@
235 215
       <workItem from="1532553474100" duration="225000" />
236 216
       <workItem from="1532696400445" duration="1212000" />
237 217
       <workItem from="1533040907385" duration="12379000" />
218
+      <workItem from="1533210336881" duration="733000" />
238 219
     </task>
239 220
     <servers />
240 221
   </component>
241 222
   <component name="TimeTrackingManager">
242
-    <option name="totallyTimeSpent" value="92123000" />
223
+    <option name="totallyTimeSpent" value="93373000" />
243 224
   </component>
244 225
   <component name="ToolWindowManager">
245
-    <frame x="0" y="23" width="1920" height="709" extended-state="0" />
226
+    <frame x="-358" y="-1080" width="1920" height="1080" extended-state="0" />
246 227
     <editor active="true" />
247 228
     <layout>
248 229
       <window_info anchor="right" id="Palette" order="3" />
@@ -255,7 +236,7 @@
255 236
       <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
256 237
       <window_info anchor="bottom" id="Version Control" order="7" />
257 238
       <window_info anchor="bottom" id="Run" order="2" />
258
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.47712418" />
239
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.29054725" />
259 240
       <window_info id="Capture Tool" order="2" />
260 241
       <window_info id="Designer" order="2" />
261 242
       <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30777422" />
@@ -268,35 +249,12 @@
268 249
       <window_info anchor="right" id="Theme Preview" order="3" />
269 250
       <window_info id="Favorites" order="2" side_tool="true" />
270 251
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
271
-      <window_info anchor="right" id="Palette" order="3" />
272
-      <window_info anchor="right" id="Theme Preview" order="3" />
273
-      <window_info id="Designer" order="2" />
274 252
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
275
-      <window_info anchor="right" id="Capture Analysis" order="3" />
276
-      <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
277 253
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
278
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
279
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.30457935" />
280
-      <window_info id="Learn" order="2" />
281 254
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
282
-      <window_info anchor="bottom" id="TODO" order="6" />
283
-      <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
284
-      <window_info anchor="bottom" id="Version Control" order="7" />
285
-      <window_info anchor="bottom" id="Run" order="2" />
286
-      <window_info id="Image Layers" order="2" />
287
-      <window_info id="Capture Tool" order="2" />
288
-      <window_info id="UI Designer" order="2" />
289
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
290
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
291
-      <window_info anchor="right" id="Database" order="3" />
292
-      <window_info anchor="right" id="Palette&#9;" order="3" />
293 255
       <window_info anchor="bottom" id="Message" order="0" />
294
-      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
295 256
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
296 257
       <window_info anchor="bottom" id="Find" order="1" />
297
-      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.29054725" />
298
-      <window_info anchor="right" id="Maven Projects" order="3" />
299
-      <window_info id="Favorites" order="2" side_tool="true" />
300 258
     </layout>
301 259
   </component>
302 260
   <component name="TypeScriptGeneratedFilesManager">
@@ -484,7 +442,7 @@
484 442
     </entry>
485 443
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/ElevationGraph.vue">
486 444
       <provider selected="true" editor-type-id="text-editor">
487
-        <state relative-caret-position="144">
445
+        <state relative-caret-position="2070">
488 446
           <caret line="138" column="24" selection-start-line="138" selection-start-column="24" selection-end-line="138" selection-end-column="24" />
489 447
         </state>
490 448
       </provider>
@@ -498,25 +456,22 @@
498 456
     </entry>
499 457
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/GoogleMap.vue">
500 458
       <provider selected="true" editor-type-id="text-editor">
501
-        <state relative-caret-position="-763">
502
-          <caret line="32" column="31" lean-forward="true" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
503
-          <folding>
504
-            <element signature="n#style#0;n#gmap-map#0;n#div#0;n#template#0;n#!!top" expanded="true" />
505
-          </folding>
459
+        <state relative-caret-position="480">
460
+          <caret line="32" column="31" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
506 461
         </state>
507 462
       </provider>
508 463
     </entry>
509 464
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/Main.vue">
510 465
       <provider selected="true" editor-type-id="text-editor">
511
-        <state relative-caret-position="-117">
512
-          <caret line="38" column="43" lean-forward="true" selection-start-line="38" selection-start-column="43" selection-end-line="38" selection-end-column="43" />
466
+        <state relative-caret-position="570">
467
+          <caret line="38" column="43" selection-start-line="38" selection-start-column="43" selection-end-line="38" selection-end-column="43" />
513 468
         </state>
514 469
       </provider>
515 470
     </entry>
516 471
     <entry file="file://$PROJECT_DIR$/VueApp/src/components/NavBar.vue">
517 472
       <provider selected="true" editor-type-id="text-editor">
518
-        <state relative-caret-position="426">
519
-          <caret line="39" column="83" selection-start-line="39" selection-start-column="83" selection-end-line="39" selection-end-column="83" />
473
+        <state relative-caret-position="495">
474
+          <caret line="33" column="9" lean-forward="true" selection-start-line="33" selection-start-column="9" selection-end-line="33" selection-end-column="9" />
520 475
         </state>
521 476
       </provider>
522 477
     </entry>

+ 11
- 2
VueApp/src/components/NavBar.vue Näytä tiedosto

@@ -3,7 +3,12 @@
3 3
 
4 4
     <b-navbar-toggle target="nav_collapse"></b-navbar-toggle>
5 5
 
6
-    <b-navbar-brand href="#">Potential Energy</b-navbar-brand>
6
+    <b-navbar-brand>
7
+      Potential Energy
8
+    </b-navbar-brand>
9
+    <b-navbar-brand class="beta">
10
+      Beta
11
+    </b-navbar-brand>
7 12
 
8 13
     <b-collapse is-nav id="nav_collapse">
9 14
       <b-navbar-nav class="ml-auto">
@@ -45,5 +50,9 @@
45 50
 </script>
46 51
 
47 52
 <style scoped>
48
-
53
+  .beta {
54
+    margin-top: 3px;
55
+    font-size: 0.75em;
56
+    color: gray;
57
+  }
49 58
 </style>