Merge pull request #806 from munen/integration

Release v5.3.1
voicerepublic · Jun 2, 2017 · feb4b90 · feb4b90
2 parents 5dff7dc + 2c0cbe1
commit feb4b90
Show file tree

Hide file tree

Showing 33 changed files with 418 additions and 240 deletions.
diff --git a/Gemfile b/Gemfile
@@ -60,6 +60,7 @@ gem 'redcarpet'                    # markdown parser & renderer
 gem 'inifile', require: false
 gem 'trickery'
 gem 'greensock-rails'
+gem "autoprefixer-rails"
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> in views

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -102,6 +102,8 @@ GEM
     arel (6.0.3)
     auphonic (0.1.0)
       faraday
+    autoprefixer-rails (6.7.7)
+      execjs
     babel-source (5.8.35)
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
@@ -634,6 +636,7 @@ DEPENDENCIES
   airbrake (~> 5.0)
   angularjs-file-upload-rails (~> 1.1.0)
   annotator
+  autoprefixer-rails
   better_errors
   binding_of_caller
   browser

diff --git a/Vagrantfile b/Vagrantfile
diff --git a/app/assets/stylesheets/_buttons.scss b/app/assets/stylesheets/_buttons.scss
@@ -143,4 +143,23 @@ button, .button {
 
 .close-button {
     background: none;
+}
+
+.stage-button {
+    border: none;
+    margin: 0;
+    border-radius: 2px;
+    box-shadow: 0 1px 2px rgba($talk-dark, 0.2);
+    background: rgba(white, 0.5);
+    color: $vr-green;
+
+    &:hover {
+        background: $vr-green;
+        color: $white;
+    }
+    svg {
+        margin-right: 12px;
+        width: 18px;
+        height: 18px;
+    }
 }
diff --git a/app/assets/stylesheets/_settings.scss b/app/assets/stylesheets/_settings.scss
@@ -114,7 +114,7 @@ $talk-dark: #29292b !default;
 $primary-color: #2c46b0 !default; // vr blue
 $secondary-color: #54c6c6 !default; // vr turq
 $alert-color: #f82847 !default; // vr red
-$success-color: #60BD70 !important; // vr greeen (new from nick)
+$success-color: #60BD70 !default; // vr greeen (new from nick)
 $warning-color: #ffed00 !default; // vr yellow
 $info-color: #fef1de !default; // vr beige
 $brand-purple: #a339cd !default; //vr-purple
@@ -129,6 +129,7 @@ $vr-red: $alert-color;
 $vr-purple: $brand-purple;
 $vr-yellow: $warning-color;
 $vr-beige: $info-color;
+$vr-green: $success-color;
 $topbar-dark: #35363b !default;
 
 $input-error-color: $vr-red;

diff --git a/app/assets/stylesheets/_venue.scss b/app/assets/stylesheets/_venue.scss
@@ -177,7 +177,8 @@ a.help-link {
 }
 
 .venues {
-    overflow: visible;
+    // overflow: hidden;
+    // max-height: 100vh;
 }
 
 //New stuff:
@@ -542,21 +543,7 @@ hr {
 }
 
 #toggles .button {
-    border: none;
-    margin: 0;
-    border-radius: 2px;
-    box-shadow: 0 1px 2px rgba($talk-dark, 0.2);
-    background: rgba(white, 0.5);
-    color: $success-color;
-    &:hover {
-        background: $success-color;
-        color: white;
-    }
-    svg {
-        margin-right: 12px;
-        width: 18px;
-        height: 18px;
-    }
+
     &.active {
         background: none;
         color: $success-color;
@@ -574,15 +561,28 @@ hr {
             pointer-events: none;
         }
     }
-    &#device-label {
-        box-shadow: none;
-        pointer-events: none;
+
+}
+
+#device-label {
+    box-shadow: none;
+    pointer-events: none;
+    height: 30px;
+    background: none;
+    color: $oil;
+    font-size: .8rem;
+    text-transform: uppercase;
+    letter-spacing: .05rem;
+    display: inline-block;
+    margin-right: 12px;
+    .strong {
+        font-weight: 700;
+    }
+    svg {
+        width: 30px;
         height: 30px;
-        background: none;
-        color: $oil;
-        svg {
-            margin-right: 6px;
-        }
+        margin-right: 6px;
+        vertical-align: middle;
     }
 }
 
@@ -1096,8 +1096,10 @@ svg#logo {
 //messages
 #message-container {
     padding: 12px 6px;
-    background: #f8f8f8;
+    // background: #f8f8f8;
     min-height: 100vh;
+    max-height: 100vh;
+    overflow-y: scroll;
     padding-bottom: 10px;
     @include breakpoint(medium) {
         padding-bottom: 60px;
@@ -1110,16 +1112,20 @@ svg#logo {
 }
 
 .message-losenge {
-    background: $vr-beige;
+
     margin: 6px;
     @include box-shadow(3px, 0.3);
     border-radius: 4px;
-    padding: 6px;
+    padding: 12px;
     font-size: .9rem;
     color: #333;
     padding-bottom: 21px;
-    max-width: 60%;
+    // max-width: 80%;
     position: relative;
+    background-color: white;
+    animation: 
+        fadeLosenge 5s,
+        bounce .5s;
     &.right {
         background: white;
     }
@@ -1205,4 +1211,30 @@ svg#logo {
         margin-right: 2px;
         margin-top: -3px;
     }
+}
+
+#circleButton:hover {
+    fill:darken($success-color,10%);
+    transition: darken .2s;
+}
+
+@keyframes fadeLosenge {
+  0% {
+    background-color: $vr-yellow;
+  }
+  60% {
+    background-color: $vr-yellow;
+  }
+
+  100% {
+    background-color: #fff;
+  }
+}
+
+@keyframes bounce {
+  0% { transform: scale(.8); opacity: 0 }
+  50% { transform: scale(1.2); opacity: .7; }
+  60% { transform: scale(0.9); opacity: 1 }
+  80% { transform: scale(1.1) }
+  100% { transform: scale(1) }
 }
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -15,7 +15,7 @@
  *= require foundation
  */
 
-@import "settings";
+// @import "settings";
 @import "foundation_and_overrides";
 /*@import "animate.min.css";*/
 /*

diff --git a/app/controllers/devices_controller.rb b/app/controllers/devices_controller.rb
@@ -57,6 +57,9 @@ def show
     end
 
     @device = Device.find_by(identifier: params[:id])
+
+    not_found if @device.nil?
+
     @devices_count = current_user.organizations.map(&:devices).flatten.count
     # TODO raise error if @device.nil?
   end

diff --git a/app/models/talk.rb b/app/models/talk.rb
@@ -624,7 +624,7 @@ def after_end
     venue.require_disconnect! if venue.connected?
 
     # experimental
-    venue.force_disconnect!
+    venue.force_disconnect! unless venue.public_ip_address.nil?
   end
 
   # FIXME cleanup the wget/cp spec mess with