From 44a85f546c9d9da39b219ef36e57692279229c03 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Wed, 7 Jun 2017 20:50:47 +0200
Subject: [PATCH] Cleanup

---
 .../pages/users/users-page.component.html     |  4 ++--
 .../pages/users/users-page.component.scss     | 13 +++-------
 .../assets/pages/assets-page.component.html   |  2 +-
 .../assets/pages/assets-page.component.scss   | 24 +++++++++----------
 .../contents/content-item.component.html      |  2 +-
 .../contents/content-item.component.scss      |  4 ----
 .../contents/contents-page.component.html     |  2 +-
 .../pages/schema/schema-page.component.scss   |  5 ----
 .../contributors-page.component.html          |  4 ++--
 .../contributors-page.component.scss          | 13 +++-------
 .../pages/languages/language.component.html   |  2 +-
 .../pages/languages/language.component.scss   |  4 ----
 .../languages/languages-page.component.scss   | 14 ++---------
 .../settings/settings-area.component.scss     |  5 ----
 src/Squidex/app/theme/_lists.scss             |  4 ++++
 15 files changed, 31 insertions(+), 71 deletions(-)

diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html
index 38a8a716f..84ed1525e 100644
--- a/src/Squidex/app/features/administration/pages/users/users-page.component.html
+++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html
@@ -63,10 +63,10 @@
                                 <img class="user-picture" [attr.title]="user.name" [attr.src]="user.pictureUrl" />
                             </td>
                             <td>
-                                <span class="user-name">{{user.displayName}}</span>
+                                <span class="user-name table-cell">{{user.displayName}}</span>
                             </td>
                             <td>
-                                <span class="user-email">{{user.email}}</span>
+                                <span class="user-email table-cell">{{user.email}}</span>
                             </td>
                             <td class="col-right">
                                 <span *ngIf="user.id !== currentUserId">
diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.scss b/src/Squidex/app/features/administration/pages/users/users-page.component.scss
index 47c1bd80f..cff4ad6ef 100644
--- a/src/Squidex/app/features/administration/pages/users/users-page.component.scss
+++ b/src/Squidex/app/features/administration/pages/users/users-page.component.scss
@@ -1,14 +1,7 @@
 @import '_vars';
 @import '_mixins';
 
-.user {
-    &-name,
-    &-email {
-        @include truncate;
-    }
-
-    &-email {
-        font-style: italic;
-        font-size: .8rem;
-    }
+.user-email {
+    font-style: italic;
+    font-size: .8rem;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html
index ecfb2e77c..a5b49b441 100644
--- a/src/Squidex/app/features/assets/pages/assets-page.component.html
+++ b/src/Squidex/app/features/assets/pages/assets-page.component.html
@@ -35,7 +35,7 @@
                     <span class="btn btn-success" (click)="fileInput.click()">
                         <span>Select File</span>
 
-                        <input class="btn-input" type="file" (change)="addFiles($event.target.files)" #fileInput />
+                        <input class="file-drop-button-input" type="file" (change)="addFiles($event.target.files)" #fileInput />
                     </span>
                 </div>
 
diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.scss b/src/Squidex/app/features/assets/pages/assets-page.component.scss
index 68f6ea771..7aaa25813 100644
--- a/src/Squidex/app/features/assets/pages/assets-page.component.scss
+++ b/src/Squidex/app/features/assets/pages/assets-page.component.scss
@@ -18,6 +18,17 @@
         cursor: copy;
     }
 
+    &-button-input {
+        width: 0;
+        opacity: 0;
+        overflow: hidden;
+        position: absolute;
+    }
+
+    &-button {
+        margin: .5rem 0;
+    }
+
     &-or {
         font-size: .8rem;
     }
@@ -25,19 +36,6 @@
     &-info {
         color: darken($color-border, 30%);
     }
-
-    &-button {
-        margin: .5rem 0;
-    }
-}
-
-.btn-input {
-    width: 0;
-    height: 0;
-    opacity: 0;
-    overflow: hidden;
-    position: absolute;
-    z-index: -1;
 }
 
 .row {
diff --git a/src/Squidex/app/features/content/pages/contents/content-item.component.html b/src/Squidex/app/features/content/pages/contents/content-item.component.html
index a84546e53..76465f74a 100644
--- a/src/Squidex/app/features/content/pages/contents/content-item.component.html
+++ b/src/Squidex/app/features/content/pages/contents/content-item.component.html
@@ -1,5 +1,5 @@
 <td *ngFor="let value of values">
-    <span class="field">
+    <span class="table-cell">
         {{value}}
     </span>
 </td>
diff --git a/src/Squidex/app/features/content/pages/contents/content-item.component.scss b/src/Squidex/app/features/content/pages/contents/content-item.component.scss
index fdedf5041..727784a9c 100644
--- a/src/Squidex/app/features/content/pages/contents/content-item.component.scss
+++ b/src/Squidex/app/features/content/pages/contents/content-item.component.scss
@@ -1,10 +1,6 @@
 @import '_vars';
 @import '_mixins';
 
-.field {
-    @include truncate;
-}
-
 .content {
     & {
         cursor: pointer;
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
index e609a3f72..387ec91f1 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html
+++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
@@ -10,7 +10,7 @@
 
                 <sqx-shortcut keys="ctrl+shift+r" (trigger)="load(true)"></sqx-shortcut>
                 <sqx-shortcut keys="ctrl+shift+f" (trigger)="findInput.focus()"></sqx-shortcut>
-                <sqx-shortcut keys="ctrl+shift+f" (trigger)="newButton.click()"></sqx-shortcut>
+                <sqx-shortcut keys="ctrl+shift+g" (trigger)="newButton.click()"></sqx-shortcut>
 
                 <form class="form-inline" (ngSubmit)="search()">
                     <input class="form-control" #findInput [formControl]="contentsFilter" placeholder="Search for content" />
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss
index 5d5c69edf..e564511d0 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss
@@ -1,11 +1,6 @@
 @import '_vars';
 @import '_mixins';
 
-.panel {
-    min-width: 48rem;
-    max-width: 48rem;
-}
-
 .btn-publishing {
     &.disabled,
     &:disabled {
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
index 14b1258ac..d07357b26 100644
--- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
+++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
@@ -33,10 +33,10 @@
                                 <img class="user-picture" [attr.title]="contributor.contributorId | userName" [attr.src]="contributor.contributorId | userPicture" />
                             </td>
                             <td>
-                                <span class="user-name">{{contributor.contributorId | userName}}</span>
+                                <span class="user-name table-cell">{{contributor.contributorId | userName}}</span>
                             </td>
                             <td>
-                                <span class="user-email">{{contributor.contributorId | userEmail}}</span>
+                                <span class="user-email table-cell">{{contributor.contributorId | userEmail}}</span>
                             </td>
                             <td>
                                 <select class="form-control" [ngModel]="contributor.permission" (ngModelChange)="changePermission(contributor, $event)" [disabled]="currentUserId === contributor.contributorId">
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss
index 9a9bb11a2..55d887c00 100644
--- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss
+++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss
@@ -1,16 +1,9 @@
 @import '_vars';
 @import '_mixins';
 
-.user {
-    &-name,
-    &-email {
-        @include truncate;
-    }
-
-    &-email {
-        font-style: italic;
-        font-size: .8rem;
-    }
+.user-email {
+    font-style: italic;
+    font-size: .8rem;
 }
 
 .contributors-limit {
diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.html b/src/Squidex/app/features/settings/pages/languages/language.component.html
index 317bf6905..dfbecff92 100644
--- a/src/Squidex/app/features/settings/pages/languages/language.component.html
+++ b/src/Squidex/app/features/settings/pages/languages/language.component.html
@@ -5,7 +5,7 @@
                 <span class="language-code" [class.language-optional]="language.isOptional" [class.language-master]="language.isMaster">{{language.iso2Code}}</span>
             </div>
             <div class="col col-6">
-                <span class="language-name" [class.language-optional]="language.isOptional" [class.language-master]="language.isMaster">{{language.englishName}}</span>
+                <span class="language-name table-cell" [class.language-optional]="language.isOptional" [class.language-master]="language.isMaster">{{language.englishName}}</span>
             </div>
             <div class="col col-4">
                 <div class="float-right">
diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.scss b/src/Squidex/app/features/settings/pages/languages/language.component.scss
index f32ca58c0..10c6c8849 100644
--- a/src/Squidex/app/features/settings/pages/languages/language.component.scss
+++ b/src/Squidex/app/features/settings/pages/languages/language.component.scss
@@ -4,10 +4,6 @@
 $field-header: #e7ebef;
 
 .language {
-    &-name {
-        @include truncate;
-    }
-
     &-master {
         font-weight: bold;
     }
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.scss b/src/Squidex/app/features/settings/pages/languages/languages-page.component.scss
index c853726be..346960d5b 100644
--- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.scss
+++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.scss
@@ -1,16 +1,6 @@
 @import '_vars';
 @import '_mixins';
 
-.language {
-    &-select {
-        width: 16rem;
-    }
-
-    &-name {
-        @include truncate;
-    }
-
-    &-default {
-        margin: 0;
-    }
+.language-select {
+    width: 16rem;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/settings/settings-area.component.scss b/src/Squidex/app/features/settings/settings-area.component.scss
index 255c79a1b..3bda24ee9 100644
--- a/src/Squidex/app/features/settings/settings-area.component.scss
+++ b/src/Squidex/app/features/settings/settings-area.component.scss
@@ -1,11 +1,6 @@
 @import '_vars';
 @import '_mixins';
 
-.panel {
-    min-width: 16rem;
-    max-width: 16rem;
-}
-
 .nav-link {
     position: relative;
     padding-top: .6rem;
diff --git a/src/Squidex/app/theme/_lists.scss b/src/Squidex/app/theme/_lists.scss
index 6dd1de47a..0e500a1bc 100644
--- a/src/Squidex/app/theme/_lists.scss
+++ b/src/Squidex/app/theme/_lists.scss
@@ -156,6 +156,10 @@
     }
 }
 
+.table-cell {
+    @include truncate;
+}
+
 .pagination {
     & {
         margin-top: 1rem;