Merge branch 'master' into docker

SpongePowered · Mar 5, 2018 · 5bb3dd0 · 5bb3dd0
2 parents 2bd7fab + 0db8c43
commit 5bb3dd0
Show file tree

Hide file tree

Showing 119 changed files with 4,127 additions and 864 deletions.
diff --git a/app/Bootstrap.scala b/app/Bootstrap.scala
@@ -5,6 +5,7 @@ import db.ModelService
 import db.impl.access.ProjectBase
 import discourse.OreDiscourseApi
 import ore.OreConfig
+import ore.project.ProjectTask
 import ore.user.UserSyncTask
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 
@@ -17,6 +18,7 @@ trait Bootstrap {
   val forums: OreDiscourseApi
   val config: OreConfig
   val userSync: UserSyncTask
+  val projectTask: ProjectTask
 
   val Logger = play.api.Logger("Bootstrap")
 
@@ -30,6 +32,8 @@ trait Bootstrap {
 
   this.userSync.start()
 
+  this.projectTask.start()
+
   if (this.config.security.getBoolean("requirePgp").get)
     Security.addProvider(new BouncyCastleProvider)
 
@@ -41,4 +45,5 @@ trait Bootstrap {
 class BootstrapImpl @Inject()(override val modelService: ModelService,
                               override val forums: OreDiscourseApi,
                               override val config: OreConfig,
-                              override val userSync: UserSyncTask) extends Bootstrap
+                              override val userSync: UserSyncTask,
+                              override val projectTask: ProjectTask) extends Bootstrap
diff --git a/app/ErrorHandler.scala b/app/ErrorHandler.scala
@@ -34,7 +34,7 @@ class ErrorHandler @Inject()(env: Environment,
       if (exception.cause.isInstanceOf[TimeoutException])
         GatewayTimeout(views.html.errors.timeout())
       else
-        InternalServerError(views.html.errors.error(exception.getMessage))
+        InternalServerError(views.html.errors.error())
     }
   }
 

diff --git a/app/assets/stylesheets/_creator.scss b/app/assets/stylesheets/_creator.scss
@@ -2,7 +2,6 @@
 @import 'pallette';
 
 .project-create-steps {
-  @include rounded-corners();
   background-color: #fafafa;
   color: #ccc;
   border: 1px solid $lighter;
@@ -118,7 +117,7 @@
 
 .table-members {
   border-top: none;
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid $lighter;
   .input-group { max-width: 35%; }
   tbody > tr > td { padding: 10px; }
   tr > td:last-child { text-align: right; }
@@ -131,7 +130,7 @@
 }
 
 .release-bulletin {
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid $lighter;
   > div {
     width: 90%;
     margin: 10px auto 0;

diff --git a/app/assets/stylesheets/_editor.scss b/app/assets/stylesheets/_editor.scss
@@ -2,7 +2,6 @@
 @import 'utils';
 
 .page-rendered, .page-edit textarea {
-  @include rounded-corners();
   min-height: 350px;
   margin-bottom: 20px;
   width: 100%;
@@ -89,7 +88,7 @@ button.open:hover {
 }
 
 .page-editor-tabs > li > a:hover {
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid $lighter;
 }
 
 .page-editor-tabs > li > a:hover,

diff --git a/app/assets/stylesheets/_nav.scss b/app/assets/stylesheets/_nav.scss
@@ -31,7 +31,7 @@
 
 .navbar-nav > li > .main-dropdown, .user-dropdown {
   @include no-box-shadow();
-  border-radius: 0 0 4px 4px;
+  border-radius: 0;
   border: 1px solid #e4e4e4;
 }
 
@@ -46,6 +46,7 @@
 
 .user-dropdown > li {
   position: relative;
+
   .unread {
     bottom: 6px;
     margin-left: 5px;
@@ -54,25 +55,17 @@
 
 .navbar-main {
   .navbar-right > li > a { padding: 0; }
-  .navbar-right {
-    @include padding-vert(9px, 9px);
-    padding-right: 20px;
-  }
-}
-
-.project-search {
-  @include size(0, 40px);
-  padding: 3px;
-  overflow: hidden;
 }
 
 .nav-icon {
   @include transition2(background-color, 0.5s);
   cursor: pointer;
-  padding: 7px;
-  margin-right: 5px;
   text-align: center;
 
+  &:not(:last-child) {
+    margin-right: 20px;
+  }
+
   .icon {
     @include transition2(color, 0.5s);
     cursor: pointer;
@@ -81,30 +74,43 @@
   }
 }
 
-.nav-icon:hover {
-  background-color: white;
-  .icon { color: black; }
+.nav-icon:hover, .nav-icon:hover a {
+  .icon { color: white; }
+  .user-avatar {
+    background: white;
+  }
 }
 
-.new-icon {
-  .caret { padding-bottom: 10px; }
+.authors-icon {
+  margin-top: 19px;
 }
 
-.new-icon:hover {
-  background-color: transparent;
-  .icon { color: #F6CF17; }
+.no-caret {
+  .caret {
+    display: none;
+  }
 }
 
-.user-controls {
-  @include padding-vert(5px, 17px);
-}
+li.user-controls {
+  margin-top: 15.5px;
 
-.new-controls {
-  @include padding-vert(10px, 19px);
+  > .dropdown-menu {
+    margin-top: 15px;
+    margin-right: -5px;
+  }
 }
 
-.user-avatar:hover {
-  background-color: white;
+li.new-controls {
+  margin-top: 19.5px;
+
+  > .dropdown-menu {
+    margin-top: 17px;
+    margin-right: -5px;
+  }
+
+  .caret {
+    margin-bottom: 10px;
+  }
 }
 
 .user-dropdown > li > a {
@@ -116,6 +122,7 @@
 }
 
 .btn-group-login {
+  margin-top: 10.5px;
   padding: 4px;
 }
 
@@ -127,10 +134,13 @@
   @include size(12px, 12px);
   @include circle();
   position: absolute;
-  background-image: linear-gradient(#e6b800, #FFD21A);
+  background-image: linear-gradient(#CC0000, #B70000);
 }
 
 .user-toggle {
   position: relative;
-  .unread { right: 10px; }
+  .unread {
+    right: 10px;
+    top: -4px;
+  }
 }
diff --git a/app/assets/stylesheets/_panel.scss b/app/assets/stylesheets/_panel.scss
@@ -0,0 +1,12 @@
+.panel.panel-default {
+  border: 1px solid $lighter;
+}
+
+.panel > .panel-pagination {
+  background: $sponge_grey;
+  text-align: center;
+  border-top: 1px solid $lighter;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
diff --git a/app/assets/stylesheets/_project.scss b/app/assets/stylesheets/_project.scss
@@ -147,9 +147,8 @@
 }
 
 .channel {
-  border-radius: 6px;
-  padding: 4px 6px;
   font-weight: bold;
+  padding: 2px 4px;
   text-align: center;
   color: white;
   cursor: default;

diff --git a/app/assets/stylesheets/_user.scss b/app/assets/stylesheets/_user.scss
@@ -147,8 +147,6 @@ textarea[name="pgp-pub-key"] {
   text-align: center;
   font-size: 10px;
   bottom: 9px;
-  border-bottom-left-radius: 4px;
-  border-bottom-right-radius: 4px;
 }
 
 #form-avatar input[name="avatar-url"] {
@@ -158,7 +156,7 @@ textarea[name="pgp-pub-key"] {
 .user-header {
   @include size(100%, 150px);
   padding: 20px;
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid $lighter;
   margin-bottom: 40px;
 
   .user-badge {
@@ -264,7 +262,6 @@ textarea[name="pgp-pub-key"] {
   height: 25px;
   top: 30%;
   right: 1%;
-  @include rounded-corners();
 }
 
 .btn-mark-read:hover {
@@ -299,7 +296,7 @@ textarea[name="pgp-pub-key"] {
 }
 
 .user-cancel:hover {
-  background-color: #ddd;
+  background-color: $lighter;
 }
 
 .invite {
@@ -333,7 +330,6 @@ textarea[name="pgp-pub-key"] {
 }
 
 .prompt {
-  @include rounded-corners();
   z-index: 0;
   display: block;
 
@@ -355,3 +351,9 @@ textarea[name="pgp-pub-key"] {
   top: -5px;
   left: 275px;
 }
+
+#new-page {
+  #new-page-label {
+    color: $sponge_grey;
+  }
+}