summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/0.7/Dockerfile2
-rw-r--r--web/sass-files/sass/partials/_modal.scss10
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss2
-rw-r--r--web/web.go1
4 files changed, 11 insertions, 4 deletions
diff --git a/docker/0.7/Dockerfile b/docker/0.7/Dockerfile
index 4a8623d33..6e82fd809 100644
--- a/docker/0.7/Dockerfile
+++ b/docker/0.7/Dockerfile
@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
WORKDIR /mattermost
# Copy over files
-ADD https://github.com/mattermost/platform/releases/download/v0.7.0/mattermost.tar.gz /
+ADD https://github.com/mattermost/platform/releases/download/v0.7.1/mattermost.tar.gz /
RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
ADD config_docker.json /
ADD docker-entry.sh /
diff --git a/web/sass-files/sass/partials/_modal.scss b/web/sass-files/sass/partials/_modal.scss
index b94ed2113..d32306cbc 100644
--- a/web/sass-files/sass/partials/_modal.scss
+++ b/web/sass-files/sass/partials/_modal.scss
@@ -118,12 +118,11 @@
}
&#more_channels {
.modal-body {
- padding: 5px 10px;
+ padding: 0;
}
}
.more-channel-table {
margin: 0;
- table-layout: fixed;
p {
font-size: 0.9em;
overflow: hidden;
@@ -138,16 +137,23 @@
}
tbody {
> tr {
+ &:hover td {
+ background: #f7f7f7;
+ }
&:first-child {
td {
border: none;
}
}
td {
+ width: 100%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ padding: 8px 8px 8px 15px;
&.td--action {
+ text-align: right;
+ padding: 8px 15px 8px 8px;
width: 70px;
vertical-align: middle;
}
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 933be96ff..0a504b765 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -50,7 +50,7 @@
right: 0;
width: 72%;
color: #777;
- background: #DCF0FF;
+ background: #2389D7;
@include border-radius(50px);
margin: 0 auto;
padding: 3px 0 4px;
diff --git a/web/web.go b/web/web.go
index c79815a35..1709e1eec 100644
--- a/web/web.go
+++ b/web/web.go
@@ -561,6 +561,7 @@ func signupCompleteOAuth(c *api.Context, w http.ResponseWriter, r *http.Request)
}
user.TeamId = team.Id
+ user.EmailVerified = true
ruser := api.CreateUser(c, team, user)
if c.Err != nil {