Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

8 files changed, 117 insertions, 87 deletions

diff --git a/assets/css/src/base.css b/assets/css/src/base.css
index dd78ec84..7f5642e7 100644
--- a/assets/css/src/base.css
+++ b/assets/css/src/base.css
@@ -70,3 +70,7 @@ hr {
 .web-notification-icon:hover {
     color: #000;
 }
+
+.smaller {
+    font-size: 0.85em;
+}
diff --git a/assets/css/src/form.css b/assets/css/src/form.css
index 24dcb0fc..e42b345b 100644
--- a/assets/css/src/form.css
+++ b/assets/css/src/form.css
@@ -146,11 +146,6 @@ input.form-input-large {
     width: 400px;
 }
 
-.form-row {
-    margin-top: 10px;
-    margin-bottom: 20px;
-}
-
 .form-column {
     float: left;
     margin-right: 3%;
@@ -161,6 +156,12 @@ input.form-input-large {
     margin-top: 15px;
 }
 
+.form-clear {
+    clear: both;
+    padding-top: 20px;
+    padding-bottom: 10px;
+}
+
 .form-login {
     width: 350px;
     margin: 0 auto;
diff --git a/assets/css/src/header.css b/assets/css/src/header.css
index 946a665b..f4903128 100644
--- a/assets/css/src/header.css
+++ b/assets/css/src/header.css
@@ -55,6 +55,11 @@ nav .active a {
     color: #d40000;
 }
 
+/* user links on the left */
+header .user-links .dropdown {
+    margin-left: 15px;
+}
+
 /* title tooltip */
 header h1 .tooltip {
     opacity: 0.3;
diff --git a/assets/css/src/listing.css b/assets/css/src/listing.css
index c40c4821..e96197e4 100644
--- a/assets/css/src/listing.css
+++ b/assets/css/src/listing.css
@@ -5,7 +5,7 @@
     margin-bottom: 20px;
     border: 1px solid #ddd;
     color: #333;
-    background-color: #fefefe;
+    background-color: #fcfcfc;
     overflow: auto;
 }
 
diff --git a/assets/css/src/project.css b/assets/css/src/project.css
new file mode 100644
index 00000000..a4670ef9
--- /dev/null
+++ b/assets/css/src/project.css
@@ -0,0 +1,8 @@
+.project-creation-options {
+    max-width: 500px;
+    border-left: 3px dotted #efefef;
+    margin-top: 20px;
+    padding-left: 15px;
+    padding-bottom: 5px;
+    padding-top: 5px;
+}
\ No newline at end of file
diff --git a/assets/css/src/sidebar.css b/assets/css/src/sidebar.css
index a9d56865..25b510b8 100644
--- a/assets/css/src/sidebar.css
+++ b/assets/css/src/sidebar.css
@@ -1,90 +1,65 @@
-/* sidebar */
 .sidebar-container {
     margin-top: 10px;
-    position: relative;
-    clear: both;
+    height: 100%;
+    display: -ms-flexbox;
+    display: -webkit-box;
+    display: -moz-box;
+    display: -ms-box;
+    display: box;
+    -ms-flex-direction: row;
+    -webkit-box-orient: horizontal;
+    -moz-box-orient: horizontal;
+    -ms-box-orient: horizontal;
+    box-orient: horizontal;
 }
 
 .sidebar-content {
-    margin-left: 23%;
-    width: 76%;
-    position: absolute;
+    padding-left: 10px;
+    -ms-flex: 1;
+    -webkit-box-flex: 1;
+    -moz-box-flex: 1;
+    -ms-box-flex: 1;
+    box-flex: 1;
 }
 
 .sidebar {
-    width: 20%;
-    float: left;
-    padding: 10px;
-    padding-top: 0;
-    border: 1px solid #ddd;
-    background: #fdfdfd;
-    border-radius: 5px;
+    padding-right: 10px;
+    border-right: 1px dotted #eee;
+    font-size: 0.95em;
+    width: 240px;
+    -ms-flex: 0 100px;
+    -webkit-box-flex: 0;
+    -moz-box-flex: 0;
+    -ms-box-flex: 0;
+    box-flex: 0;
 }
 
-.sidebar li {
-    list-style-type: square;
-    margin-left: 30px;
-    line-height: 1.8em;
-}
-
-.sidebar li.active a {
-    color: #000;
-    font-weight: bold;
+.sidebar a {
     text-decoration: none;
 }
 
-.sidebar li.active a:focus,
-.sidebar li.active a:hover {
-    text-decoration: underline;
-}
-
-.sidebar-collapsed .sidebar {
-    width: 10px;
-    padding-bottom: 0;
-    float: none;
+.sidebar li {
+    list-style-type: none;
+    line-height: 35px;
+    border-bottom: 1px dotted #efefef;
 }
 
-.sidebar-collapsed .sidebar-content {
-    margin: 0;
-    margin-top: 15px;
-    width: 100%;
+.sidebar li:hover {
+    border-left: 5px solid #555;
+    padding-left: 8px;
 }
 
-.sidebar-collapse {
-    text-align: right;
+.sidebar li.active {
+    border-left: 5px solid #333;
+    padding-left: 8px;
 }
 
-.sidebar-collapse a,
-.sidebar-expand a {
+.sidebar li.active a {
     color: #333;
-    text-decoration: none;
-}
-
-.sidebar-collapse a:hover,
-.sidebar-expand a:hover {
-    color: #DF5353;
-}
-
-@media only screen and (max-width: 1024px) {
-    .sidebar {
-        width: 25%;
-    }
-
-    .sidebar-content {
-        margin-left: 30%;
-        width: 70%;
-    }
+    font-weight: bold;
 }
 
-@media only screen and (max-width: 767px) {
-    .sidebar {
-        width: 95%;
-        float: none;
-    }
-
-    .sidebar-content {
-        margin: 0;
-        margin-top: 15px;
-        width: 100%;
-    }
+.sidebar li.active a:focus,
+.sidebar li.active a:hover {
+    color: #555;
 }
diff --git a/assets/css/src/task.css b/assets/css/src/task.css
index 7bfb63e2..534152a3 100644
--- a/assets/css/src/task.css
+++ b/assets/css/src/task.css
@@ -168,24 +168,36 @@ span.task-board-date-overdue {
 }
 
 /* task view */
-.task-show-details {
-    position: relative;
-    border-radius: 5px;
-    padding-bottom: 10px;
+#task-summary h2 {
+    color: #666;
+    font-size: 2.5em;
+    margin-top: 0;
+    padding-top: 0;
+}
+
+.task-summary-container {
+    border: 2px solid #000;
+    border-radius: 8px;
+    padding: 15px;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-direction: row;
+    flex-direction: row;
+    -webkit-justify-content: space-between;
+    justify-content: space-between;
+}
+
+.task-summary-column {
+    font-size: 0.9em;
+    color: #666;
 }
 
-.task-show-details h2 {
-    font-size: 1.8em;
-    margin: 0;
-    margin-bottom: 25px;
-    padding: 0;
-    padding-left: 10px;
-    padding-right: 10px;
+.task-summary-column span {
+    color: #555;
 }
 
-.task-show-details li {
-    margin-left: 25px;
-    list-style-type: circle;
+.task-summary-column li {
+    line-height: 23px;
 }
 
 .task-show-section {
@@ -329,3 +341,9 @@ div.color-square-selected {
     height: 28px;
     box-shadow: 3px 2px 10px 0 rgba(180,180,180,0.9);
 }
+
+/* Assign to me */
+.assign-me {
+    font-size: 0.8em;
+    vertical-align: bottom;
+}
diff --git a/assets/css/src/tooltip.css b/assets/css/src/tooltip.css
index f74ac09a..84d709c9 100644
--- a/assets/css/src/tooltip.css
+++ b/assets/css/src/tooltip.css
@@ -76,3 +76,22 @@ div.ui-tooltip {
 .ui-tooltip ul {
     margin-left: 20px;
 }
+
+.ui-tooltip dl {
+    margin: -5px 0 0 0;
+    padding: 0;
+}
+
+.ui-tooltip dt {
+    margin-top: 5px;
+}
+
+.ui-tooltip dd {
+   margin-left: 0;
+}
+
+.ui-tooltip .progress {
+    display: inline-block;
+    min-width: 3em;
+    text-align: right;
+}
\ No newline at end of file