Merge pull request #1094 from ElixirTeSS/spaces-themes

Spaces

Author: fbacall

README.md

@@ -57,3 +57,7 @@ See [here](docs/customization.md) for an overview of how you can customize your
 ## API
 
 See [here](docs/api.md) for details on programmatic access to TeSS via its API.
+
+## Multi-space TeSS
+
+See [here](docs/spaces.md) for details on configuring a multi-space TeSS.

app/assets/config/manifest.js

@@ -1,3 +1,3 @@
 //= link_tree ../images
-//= link application.css
+//= link_directory ../stylesheets/themes .css
 //= link application.js

app/assets/images/themes/blue

@@ -0,0 +1 @@
+../modern

app/assets/images/themes/default

@@ -0,0 +1 @@
+../modern

app/assets/images/themes/green

@@ -0,0 +1 @@
+../modern

app/assets/images/themes/space

@@ -0,0 +1 @@
+../modern

app/assets/javascripts/templates/autocompleter/user_id.hbs

@@ -0,0 +1,7 @@
+<li data-id="{{ item.id }}">
+    <input type="hidden" name="{{ prefix }}[]" value="{{ item.id }}" />
+    {{ item.name }}
+    <a href="#" class="delete-list-item btn btn-icon">
+        <i class="icon cross-icon icon-sm icon-greyscale"></i>
+    </a>
+</li>

app/assets/stylesheets/application.scss

@@ -13,8 +13,7 @@
  */
 // "bootstrap-sprockets" must be imported before "bootstrap" and "bootstrap/variables"
 @import "bootstrap-sprockets";
-@import "mixins/variables";
-// *** Colour changes can be done here! ***
+@import "bootstrap/variables";
 @import "bootstrap";
 @import "font-awesome-sprockets";
 @import "font-awesome";
@@ -123,7 +122,7 @@ div.wrapper {
   flex-shrink: 0;
 
   .sidebar-group {
-    background: #FFFFFF;
+    background: $panel-bg;
     @include floating-card;
     border-radius: 6px;
     > ul {
@@ -144,8 +143,8 @@ div.wrapper {
       width: calc(100% - 40px);
       position: absolute;
       z-index: $zindex-modal;
-      background: white;
-      border-bottom: 1px solid #ccc;
+      background: $panel-bg;
+      border-bottom: 1px solid $panel-default-border;
       border-radius: $border-radius-large;
       top: 0;
       left: 20px;

app/assets/stylesheets/bootstrap-tweaks.scss

@@ -41,25 +41,25 @@ a.btn {
 
   li.prev {
     span, a {
-      background-image: image-url("modern/icons/chevron-left-icon.svg");
+      background-image: image-url("#{$theme-base}/icons/chevron-left-icon.svg");
     }
   }
 
   li.next {
     span, a {
-      background-image: image-url("modern/icons/chevron-right-icon.svg");
+      background-image: image-url("#{$theme-base}/icons/chevron-right-icon.svg");
     }
   }
 
   li.first {
     span, a {
-      background-image: image-url("modern/icons/double-left-icon.svg");
+      background-image: image-url("#{$theme-base}/icons/double-left-icon.svg");
     }
   }
 
   li.last {
     span, a {
-      background-image: image-url("modern/icons/double-right-icon.svg");
+      background-image: image-url("#{$theme-base}/icons/double-right-icon.svg");
     }
   }
 

app/assets/stylesheets/home.scss

@@ -377,10 +377,10 @@ ul.content-providers-grid {
 }
 
 .home-title-link {
-  color: $primary-color;
+  color: unset;
   text-decoration: none;
   &:hover{
-    color: $primary-color;
+    color: unset;
     text-decoration: none;
   }
 }