Merge tag 'v0.9.8-preview.1' into merge-upstream

tearaikazuki · Jul 18, 2019 · f48e04f · f48e04f
2 parents 1a56b08 + 503a8e2
commit f48e04f
Show file tree

Hide file tree

Showing 44 changed files with 498 additions and 216 deletions.
diff --git a/app/app.ts b/app/app.ts
@@ -25,6 +25,7 @@ import moment from 'moment';
 import { setupGlobalContextMenuForEditableElement } from 'util/menus/GlobalMenu';
 import VModal from 'vue-js-modal';
 import VeeValidate from 'vee-validate';
+import ChildWindow from 'components/windows/ChildWindow.vue';
 
 const { ipcRenderer, remote } = electron;
 
@@ -157,8 +158,9 @@ document.addEventListener('DOMContentLoaded', () => {
       i18n,
       store,
       render: h => {
-        const componentName = windowsService.state[windowId].componentName;
+        if (windowId === 'child') return h(ChildWindow);
 
+        const componentName = windowsService.state[windowId].componentName;
         return h(windowsService.components[componentName]);
       }
     });

diff --git a/app/components/ApiSettings.vue b/app/components/ApiSettings.vue
@@ -7,13 +7,15 @@
     </div>
 
     <div class="section">
-      <ObsTextInput :value="tokenInput">
-        <button
-            class="button button--default button--input"
-            @click="generateToken">
-          Update
-        </button>
-      </ObsTextInput>
+      <div class="section-content">
+        <ObsTextInput :value="tokenInput">
+          <button
+              class="button button--default"
+              @click="generateToken">
+            Update
+          </button>
+        </ObsTextInput>
+      </div>
     </div>
 
 

diff --git a/app/components/AppearanceSettings.vue b/app/components/AppearanceSettings.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
     <div class="section">
-      <GenericForm v-model="settingsFormData" @input="saveSettings" />
+      <div class="section-content">
+        <GenericForm v-model="settingsFormData" @input="saveSettings" />
+      </div>
     </div>
   </div>
 </template>

diff --git a/app/components/ExperimentalSettings.vue b/app/components/ExperimentalSettings.vue
@@ -1,11 +1,8 @@
 <template>
   <div>
     <div class="section">
-    </div>
-
-    <!--<div class="section">-->
       <!--<GenericForm v-model="settingsFormData" @input="saveSettings" />-->
-    <!--</div>-->
+    </div>
 
   </div>
 </template>

diff --git a/app/components/HotkeyGroup.vue b/app/components/HotkeyGroup.vue
@@ -1,15 +1,19 @@
 <template>
 <div class="section">
-  <div class="section-title--dropdown">
+  <div
+    class="section-title section-title--dropdown"
+    v-if="title"
+    :class="{ 'section-title--opened': !collapsed }"
+  >
     <h4
       v-if="title"
       @click="collapsed = !collapsed">
       <i
         v-if="collapsed === true"
-        class="icon-plus"/>
+        class="icon-plus section-title__icon"/>
       <i
         v-if="collapsed === false"
-        class="icon-minus"/>
+        class="icon-minus section-title__icon"/>
       {{ title }}
     </h4>
   </div>

diff --git a/app/components/LanguageSettings.vue b/app/components/LanguageSettings.vue
@@ -1,6 +1,8 @@
 <template>
 <div class="section">
-  <GenericForm :value="settings" @input="save"></GenericForm>
+  <div class="section-content">
+    <GenericForm :value="settings" @input="save"></GenericForm>
+  </div>
 </div>
 </template>
 

diff --git a/app/components/Login.vue.ts b/app/components/Login.vue.ts
@@ -9,7 +9,6 @@ import electron from 'electron';
 @Component({})
 export default class Login extends Vue {
   @Inject() userService: UserService;
-  @Inject() onboardingService: OnboardingService;
 
   get loggedIn() {
     return this.userService.isLoggedIn();
@@ -35,7 +34,7 @@ export default class Login extends Vue {
   }
 
   login() {
-    this.onboardingService.start({ isLogin: true });
+    this.userService.showLogin();
   }
 
   openUserpage() {

diff --git a/app/components/NotificationsSettings.vue b/app/components/NotificationsSettings.vue
@@ -9,7 +9,9 @@
       </button>
     </div>
     <div class="section">
-      <GenericForm v-model="settingsFormData" @input="saveNotificationsSettings" />
+      <div class="section-content">
+        <GenericForm v-model="settingsFormData" @input="saveNotificationsSettings" />
+      </div>
     </div>
     <div class="section">
       <h4>

diff --git a/app/components/Tabs.vue b/app/components/Tabs.vue
@@ -36,6 +36,6 @@
 }
 
 .tab-content {
-  padding-top: 60px;
+  padding-top: 54px;
 }
 </style>
diff --git a/app/components/obs/inputs/ObsInput.ts b/app/components/obs/inputs/ObsInput.ts
@@ -496,18 +496,6 @@ export function setupConfigurableDefaults(
       defaultSettings[obsProp.name] = items[0].value;
       continue;
     }
-
-    let validItem = false;
-
-    /* If there is a setting, make sure it's a valid item */
-    for (let i = 0; i < items.length; ++i) {
-      if (settings[obsProp.name] === items[i].value) {
-        validItem = true;
-        break;
-      }
-    }
-
-    if (!validItem) defaultSettings[obsProp.name] = items[0].value;
   } while ((obsProp = obsProp.next()));
   const needUpdate = Object.keys(defaultSettings).length > 0;
   if (needUpdate) configurable.update(defaultSettings);

diff --git a/app/components/pages/Onboarding.vue b/app/components/pages/Onboarding.vue
@@ -20,10 +20,7 @@
   .button--lg {
     width: 300px;
     padding: 0 0;
-    font-size: 12px;
-    letter-spacing: 1px;
-    font-weight: normal;
-    margin-top: 15px;
+    margin-top: 16px;
   }
 }
 
@@ -59,7 +56,6 @@
   color: @text-primary;
   font-size: 22px;
   margin-bottom: 20px;
-  letter-spacing: .5px;
 }
 
 .onboarding-title--sm {
@@ -85,7 +81,8 @@
 
   a {
     text-decoration: underline;
-    transition: all 275ms;
+    .transition();
+
     &:hover {
       color: @white;
     }
@@ -146,7 +143,7 @@
   top: 0;
   height: 240px;
   width: auto;
-  margin: 15px 0;
+  margin: 16px 0;
 
   img {
     height: 100%;

diff --git a/app/components/pages/Studio.vue b/app/components/pages/Studio.vue
@@ -65,7 +65,6 @@
   flex-grow: 1;
   background-color: @bg-tertiary;
   display: flex;
-  align-items: center;
   justify-content: center;
 
   .message {

diff --git a/app/components/pages/onboarding_steps/SceneCollectionsImport.vue b/app/components/pages/onboarding_steps/SceneCollectionsImport.vue
@@ -23,11 +23,11 @@
 @import "../../../styles/_colors";
 
 .scene-collections-list {
-  margin: 0;
+  margin-left: 0;
   padding: 10px;
   width: 100%;
   height: 200px;
-  color: white;
+  color: @white;
   list-style: none;
   overflow: auto;
   border-radius: 3px;

diff --git a/app/components/shared/DropdownMenu.vue b/app/components/shared/DropdownMenu.vue
@@ -8,7 +8,7 @@
     </div>
 
     <button slot="reference" class="dropdown-menu__toggle">
-      <span class="scene-name">{{ title }}</span><i class="icon-down-arrow"/>
+      <span class="scene-name">{{ title }}</span><i :class="icon || 'icon-down-arrow'"/>
     </button>
 
   </popper>
@@ -68,6 +68,9 @@
 
 .dropdown-menu__item {
   white-space: nowrap;
+  max-width: 300px;
+  overflow: hidden;
+  text-overflow: ellipsis;
   cursor: pointer;
   color: @text-secondary;
 

diff --git a/app/components/shared/HelpTip.vue b/app/components/shared/HelpTip.vue
@@ -46,7 +46,7 @@
   font-size: 20px;
   cursor: pointer;
   opacity: .6;
-  .transition;
+  .transition();
 
   &:hover {
     opacity: 1;

diff --git a/app/components/shared/Hotkey.vue b/app/components/shared/Hotkey.vue
@@ -26,6 +26,8 @@
 <script lang="ts" src="./Hotkey.vue.ts"></script>
 
 <style lang="less" scoped>
+@import "../../styles/index";
+
 .hotkey {
   display: flex;
   flex-direction: row;
@@ -55,8 +57,9 @@
   }
 }
 
-.bindings-enter-active, .bindings-leave-active {
-  transition: all 0.2s;
+.bindings-enter-active,
+.bindings-leave-active {
+  .transition();
 }
 
 .bindings-enter, .bindings-leave-to {

diff --git a/app/components/shared/NavItem.vue b/app/components/shared/NavItem.vue
@@ -32,7 +32,7 @@
     .semibold;
 
     i {
-       color: @text-primary;
+      color: @text-primary;
     }
   }
 
@@ -47,8 +47,8 @@
 
   i {
     position: relative;
-    margin-right: -15px;
-    left: -25px;
+    margin-right: -16px;
+    left: -24px;
     width: 16px;
   }
 }

diff --git a/app/components/shared/inputs/ColorInput.vue b/app/components/shared/inputs/ColorInput.vue
@@ -3,22 +3,17 @@
 
     <div class="input-wrapper">
       <div class="colorpicker">
-        <div class="input-container">
+        <div
+            class="colorpicker__text"
+            @click="togglePicker">
+          <input
+              class="colorpicker__input"
+              type="text"
+              readonly
+              :value="value">
           <div
-              class="colorpicker__text"
-              @click="togglePicker">
-            <input
-                class="colorpicker__input"
-                type="text"
-                readonly
-                :value="value">
-            <div
-                class="colorpicker__swatch"
-                :style="swatchStyle"/>
-          </div>
-          <div v-if="metadata && metadata.tooltip" class="w-tooltip">
-            <i class="icon-question icon-btn" v-tooltip="metadata.tooltip" />
-          </div>
+              class="colorpicker__swatch"
+              :style="swatchStyle"/>
         </div>
         <color-picker
             :value="{hex: value}"
@@ -39,11 +34,6 @@
     width: 220px;
   }
 
-  .input-container {
-    display: flex;
-    align-items: center;
-  }
-
   .colorpicker__text {
     position: relative;
     cursor: pointer;

diff --git a/app/components/shared/inputs/FontFamilyInput.vue b/app/components/shared/inputs/FontFamilyInput.vue
@@ -6,9 +6,6 @@
       :options="fonts">
     </multiselect>
   </div>
-  <div class="w-tooltip">
-    <i class="icon-question icon-btn" :v-tooltip="tooltipText" />
-  </div>
 </div>
 </template>
 

diff --git a/app/components/shared/inputs/FontFamilyInput.vue.ts b/app/components/shared/inputs/FontFamilyInput.vue.ts
@@ -10,10 +10,5 @@ import { IInputMetadata } from './index';
 export default class FontFamilyInput extends BaseInput<string, IInputMetadata> {
   @Prop() value: string;
 
-  tooltipText = $t(
-    'The Google Font to use for the text. Visit http://google.com/fonts to find one!'
-    + 'Popular Fonts include: Open Sans, Roboto, Oswald, Lato, and Droid Sans.'
-  );
-
   fonts: string[] = [];
 }
diff --git a/app/components/shared/inputs/FontSize.vue b/app/components/shared/inputs/FontSize.vue
@@ -1,7 +1,5 @@
 <template>
-  <div>
-    <slider-input :metadata="sliderOptions" :value="sliderValue" @input="value => updateValue(value)"/>
-  </div>
+  <slider-input :metadata="sliderOptions" :value="sliderValue" @input="value => updateValue(value)"/>
 </template>
 
 <script lang="ts" src="./FontSize.vue.ts"></script>