From c0d225c6d8ac3f1f7f07047f6527d16d173d3550 Mon Sep 17 00:00:00 2001 From: nickago Date: Fri, 24 Jul 2015 13:50:56 -0700 Subject: Removed ability to place MM in an iframe --- web/templates/head.html | 7 +++++++ web/web.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/web/templates/head.html b/web/templates/head.html index d14340998..7a7d4fe8e 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -36,6 +36,13 @@ + + diff --git a/web/web.go b/web/web.go index 1d59ef946..68e2a5226 100644 --- a/web/web.go +++ b/web/web.go @@ -219,7 +219,6 @@ func signupTeamComplete(c *api.Context, w http.ResponseWriter, r *http.Request) page := NewHtmlTemplatePage("signup_team_complete", "Complete Team Sign Up") page.Props["Email"] = props["email"] - page.Props["DisplayName"] = props["display_name"] page.Props["Data"] = data page.Props["Hash"] = hash page.Render(c, w) -- cgit v1.2.3-1-g7c22 From 2bfe9eea5634fbfd1af328e28c4d1ef8d0411d5c Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 28 Jul 2015 20:41:24 +0500 Subject: MM-1730 - Updating logo in emails --- api/templates/email_change_body.html | 2 +- api/templates/find_teams_body.html | 2 +- api/templates/invite_body.html | 2 +- api/templates/password_change_body.html | 2 +- api/templates/post_body.html | 2 +- api/templates/reset_body.html | 2 +- api/templates/signup_team_body.html | 2 +- api/templates/verify_body.html | 2 +- api/templates/welcome_body.html | 2 +- web/static/images/Bladekick-logodark.png | Bin 7754 -> 10380 bytes web/static/images/Mattermost-logodark.png | Bin 7754 -> 10380 bytes 11 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html index 434dffba5..439fffd5b 100644 --- a/api/templates/email_change_body.html +++ b/api/templates/email_change_body.html @@ -8,7 +8,7 @@ - diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html index 75a59be47..a73ed0ad4 100644 --- a/api/templates/find_teams_body.html +++ b/api/templates/find_teams_body.html @@ -8,7 +8,7 @@
+
- diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html index 917895d5e..ad0658e3d 100644 --- a/api/templates/invite_body.html +++ b/api/templates/invite_body.html @@ -8,7 +8,7 @@
+
- diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html index ffa06de99..1d4a6e1c8 100644 --- a/api/templates/password_change_body.html +++ b/api/templates/password_change_body.html @@ -8,7 +8,7 @@
+
- diff --git a/api/templates/post_body.html b/api/templates/post_body.html index c077fc000..0aa913db5 100644 --- a/api/templates/post_body.html +++ b/api/templates/post_body.html @@ -8,7 +8,7 @@
+
- diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html index 05a3c538a..4c2fec1e7 100644 --- a/api/templates/reset_body.html +++ b/api/templates/reset_body.html @@ -8,7 +8,7 @@
+
- diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html index 92230a364..5e60a042b 100644 --- a/api/templates/signup_team_body.html +++ b/api/templates/signup_team_body.html @@ -8,7 +8,7 @@
+
- diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html index f1fdc7c95..1a68c16f5 100644 --- a/api/templates/verify_body.html +++ b/api/templates/verify_body.html @@ -8,7 +8,7 @@
+
- diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html index 5760a1378..cc4d95fb1 100644 --- a/api/templates/welcome_body.html +++ b/api/templates/welcome_body.html @@ -8,7 +8,7 @@
+
- diff --git a/web/static/images/Bladekick-logodark.png b/web/static/images/Bladekick-logodark.png index 8f1268fdd..c16978ba8 100644 Binary files a/web/static/images/Bladekick-logodark.png and b/web/static/images/Bladekick-logodark.png differ diff --git a/web/static/images/Mattermost-logodark.png b/web/static/images/Mattermost-logodark.png index 8f1268fdd..c16978ba8 100644 Binary files a/web/static/images/Mattermost-logodark.png and b/web/static/images/Mattermost-logodark.png differ -- cgit v1.2.3-1-g7c22 From 0bfc769b4dc03538b5ee1897a33febf7a45226a2 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 28 Jul 2015 11:41:44 -0400 Subject: updated user sign up page and login page with new UI details --- web/react/components/login.jsx | 2 +- web/react/components/signup_user_complete.jsx | 5 ++--- web/react/pages/signup_user_complete.jsx | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 45b558dca..fe0a47777 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -105,7 +105,7 @@ module.exports = React.createClass({
Sign in to:

{ teamDisplayName }

-

on { teamName }

+

on { config.SiteName }

{ server_error } diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index 36fa27ad7..670aab943 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -40,7 +40,7 @@ module.exports = React.createClass({ this.setState({name_error: "", email_error: "", password_error: "", server_error: ""}); - this.state.user.allow_marketing = this.refs.email_service.getDOMNode().checked; + this.state.user.allow_marketing = true; client.createUser(this.state.user, this.state.data, this.state.hash, function(data) { @@ -125,7 +125,7 @@ module.exports = React.createClass({
Welcome to:
-

"teamDisplayName"

+

{ this.props.teamDisplayName }

on { config.SiteName }

Let's create your account

{ signup_message } @@ -147,7 +147,6 @@ module.exports = React.createClass({ { password_error }
-

{ server_error } diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx index 60c3a609a..8f9be1f94 100644 --- a/web/react/pages/signup_user_complete.jsx +++ b/web/react/pages/signup_user_complete.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. -var SignupUserComplete =require('../components/signup_user_complete.jsx'); +var SignupUserComplete = require('../components/signup_user_complete.jsx'); global.window.setup_signup_user_complete_page = function(email, name, ui_name, id, data, hash, auth_services) { React.render( -- cgit v1.2.3-1-g7c22 From 95123302419c2ea73e239ef5a62d1a0148d801dc Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 28 Jul 2015 11:49:45 -0400 Subject: updated changing email in sign up flow to work properly --- web/react/components/signup_team_complete.jsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 450a95dd0..559009f44 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -42,11 +42,15 @@ WelcomePage = React.createClass({ state.email_error = ""; } - client.signupTeam(email, this.props.state.team.name, + client.signupTeam(email, function(data) { - this.props.state.wizard = "finished"; - this.props.updateParent(this.props.state); - window.location.href = "/signup_team_confirm/?email=" + encodeURI(email); + if (data["follow_link"]) { + window.location.href = data["follow_link"]; + } else { + this.props.state.wizard = "finished"; + this.props.updateParent(this.props.state); + window.location.href = "/signup_team_confirm/?email=" + encodeURIComponent(team.email); + } }.bind(this), function(err) { this.state.server_error = err.message; -- cgit v1.2.3-1-g7c22 From 3d94d047c00eecfaa5d61ce077aec33d6e25b3b3 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 28 Jul 2015 11:57:25 -0400 Subject: Adding rest of directories to eslint list --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 01986bf64..14a6ffc7d 100644 --- a/Makefile +++ b/Makefile @@ -66,6 +66,10 @@ install: check: install @echo Running ESLint... @$(ESLINT) web/react/components/* + @$(ESLINT) web/react/dispatcher/* + @$(ESLINT) web/react/pages/* + @$(ESLINT) web/react/stores/* + @$(ESLINT) web/react/utils/* test: install @mkdir -p logs -- cgit v1.2.3-1-g7c22 From 5a4b736c8a60e3662e2f020af444274a3fb083e8 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 28 Jul 2015 12:10:14 -0400 Subject: Adding style guide --- STYLE-GUIDE.md | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 STYLE-GUIDE.md diff --git a/STYLE-GUIDE.md b/STYLE-GUIDE.md new file mode 100644 index 000000000..345fe6cdc --- /dev/null +++ b/STYLE-GUIDE.md @@ -0,0 +1,161 @@ +# Mattermost Style Guide + +1. [GO](#go) +2. [Javascript](#javascript) +3. [React/JSX](#jsx) + + +## Go + +All go code must follow the golang official [Style Guide](https://golang.org/doc/effective_go.html) + +In addition all code must be run though the official go formater tool [gofmt](https://golang.org/cmd/gofmt/) + + +## Javascript + +Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) + +Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) + +The following is an abriged version of the [Airbnb Javascript Style Guide](https://github.com/airbnb/javascript/blob/master/README.md#airbnb-javascript-style-guide-), with modifications. Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. + +### Whitespace + +- Indentaiton is four spaces +- Use a space before the leading brace +- Use one space between the comma and the next argument in a bracketed list. No other space. +- Use whitespace to make code more readable. +- Do not use more than one newline to separate code blocks. +- Do not use a newline as the first line of a function + +```javascript +// Correct +function myFunction(parm1, parm2) { + stuff...; + + morestuff; +} + +// Incorrect +function myFunction ( parm1, parm2 ){ + stuff...; + + + morestuff; +} + +``` + +### Semicolons + +- You must use them always + +```javascript +// Correct +var x = 1; + +// Incorrect +var x = 1 +``` + +### Variables + +- Declarations must always use var, let or const. +- Perfer let or const over var. + +```javascript +// Correct +let x = 4; + +// OK +var x = 4; + +// Incorrect +x = 4; +``` + +### Blocks + +- Braces must be used on all multi-line blocks. +- Braces must start on the same line as the statment starting the block. +- Else and else if must be on the same line as the if block closing brace. + +```javascript +// Correct +if (somthing) { + stuff...; +} else if (otherthing) { + stuff...; +} + +// Incorrect +if (somthing) +{ + stuff...; +} +else +{ + stuff...; +} + +// Incorrect +if (somthing) stuff...; +if (somthing) + stuff...; + +``` + +### Strings + +- Use template strings instead of concatenation. + +```javascript +// Correct +function getStr(stuff) { + return "This is the ${stuff} string"; +} + +// Incorrect +function wrongGetStr(stuff) { + return "This is the " + stuff + " string"; +} +``` + +## React/JSX + +This is an abriged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. + +### General + +- Include only one React component per file. +- Use class \ extends React.Componet over React.createClass unless you need mixins +- CapitalCamelCase with .jsx extension for component filenames. +- Filenames should be the component name. + +### Alignment + +- Follow alignment styles shown below: +```xml +// Correct + + + + +// Correct + +``` + +### Nameing + +- Property names use camelCase. +- React component names use CapitalCamelCase. +- Do not use an understore for internal methods in a react component. + +```xml +// Correct + +``` -- cgit v1.2.3-1-g7c22 From bf5548ad6da9dc4a12ffde56658f7d9a9748cb80 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 28 Jul 2015 12:14:40 -0400 Subject: Minor tweaks to style guide --- STYLE-GUIDE.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/STYLE-GUIDE.md b/STYLE-GUIDE.md index 345fe6cdc..a370e7d74 100644 --- a/STYLE-GUIDE.md +++ b/STYLE-GUIDE.md @@ -2,7 +2,7 @@ 1. [GO](#go) 2. [Javascript](#javascript) -3. [React/JSX](#jsx) +3. [React-JSX](#react-jsx) ## Go @@ -122,7 +122,11 @@ function wrongGetStr(stuff) { } ``` -## React/JSX +## React-JSX + +Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) + +Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) This is an abriged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. -- cgit v1.2.3-1-g7c22 From 2e4d51b08f22b74802d4897a127685c162a2bef0 Mon Sep 17 00:00:00 2001 From: nickago Date: Tue, 28 Jul 2015 09:20:07 -0700 Subject: Fixed typo in delete_post_modal --- web/react/components/delete_post_modal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx index 11970bc2b..f0cb809af 100644 --- a/web/react/components/delete_post_modal.jsx +++ b/web/react/components/delete_post_modal.jsx @@ -98,7 +98,7 @@ module.exports = React.createClass({ : "" }
- +
-- cgit v1.2.3-1-g7c22 From c45cf5514f3c1d42d5ed4201ff976f21cee2580d Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Tue, 28 Jul 2015 12:42:17 -0400 Subject: update our postgresql index check to work with 9.2+ versions of postgresql --- store/sql_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/store/sql_store.go b/store/sql_store.go index 606b2cbc1..0d4f76a72 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -224,7 +224,7 @@ func (ss SqlStore) CreateFullTextIndexIfNotExists(indexName string, tableName st func (ss SqlStore) createIndexIfNotExists(indexName string, tableName string, columnName string, fullText bool) { if utils.Cfg.SqlSettings.DriverName == "postgres" { - _, err := ss.GetMaster().SelectStr("SELECT to_regclass($1)", indexName) + _, err := ss.GetMaster().SelectStr("SELECT $1::regclass", indexName) // It should fail if the index does not exist if err == nil { return -- cgit v1.2.3-1-g7c22 From f084188010ccc0b82f17b99e5cacde74e732c318 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Wed, 29 Jul 2015 07:52:11 -0400 Subject: added use of strings.Team to replace hardcoded mentions of 'team' --- web/react/components/signup_team_complete.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 559009f44..ebb40f17f 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -481,12 +481,12 @@ SendInivtesPage = React.createClass({
-

Invite Team Members

+

{"Invite " + utils.toTitleCase(strings.Team) + " Members"}

{ emails }
-

if you prefer, you can invite team members later
and skip this step for now.

+

{"if you prefer, you can invite " + strings.Team + " members later"}
and skip this step for now.

@@ -534,7 +534,7 @@ UsernamePage = React.createClass({

Your username

-
Select a memorable username that makes it easy for teammates to identify you:
+
{"Select a memorable username that makes it easy for " + strings.Team + "mates to identify you:"}
-- cgit v1.2.3-1-g7c22 From 9e64500e316199287a305a93d7ac6d12d78ea435 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Wed, 29 Jul 2015 08:20:26 -0400 Subject: Fixing spelling and clarifying a few parts of style guide. --- STYLE-GUIDE.md | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/STYLE-GUIDE.md b/STYLE-GUIDE.md index a370e7d74..e3fe2addf 100644 --- a/STYLE-GUIDE.md +++ b/STYLE-GUIDE.md @@ -9,20 +9,20 @@ All go code must follow the golang official [Style Guide](https://golang.org/doc/effective_go.html) -In addition all code must be run though the official go formater tool [gofmt](https://golang.org/cmd/gofmt/) +In addition all code must be run though the official go formatter tool [gofmt](https://golang.org/cmd/gofmt/) ## Javascript -Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) +Part of the build process is running ESLint. ESLint is the final authority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) -The following is an abriged version of the [Airbnb Javascript Style Guide](https://github.com/airbnb/javascript/blob/master/README.md#airbnb-javascript-style-guide-), with modifications. Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. +The following is an abridged version of the [Airbnb Javascript Style Guide](https://github.com/airbnb/javascript/blob/master/README.md#airbnb-javascript-style-guide-), with modifications. Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. ### Whitespace -- Indentaiton is four spaces +- Indentation is four spaces - Use a space before the leading brace - Use one space between the comma and the next argument in a bracketed list. No other space. - Use whitespace to make code more readable. @@ -62,23 +62,25 @@ var x = 1 ### Variables - Declarations must always use var, let or const. -- Perfer let or const over var. +- Prefer let or const over var. +- camelCase for all variable names. ```javascript // Correct -let x = 4; +let myVariable = 4; // OK -var x = 4; +var myVariable = 4; // Incorrect -x = 4; +myVariable = 4; +var my_variable = 4; ``` ### Blocks -- Braces must be used on all multi-line blocks. -- Braces must start on the same line as the statment starting the block. +- Braces must be used on all blocks. +- Braces must start on the same line as the statement starting the block. - Else and else if must be on the same line as the if block closing brace. ```javascript @@ -124,16 +126,16 @@ function wrongGetStr(stuff) { ## React-JSX -Part of the buld process is running ESLint. ESLint is the final athority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) +Part of the build process is running ESLint. ESLint is the final authority on all style issues. PRs will not be accepted unless there are no errors or warnings running ESLint. The ESLint configuration file can be found in: [web/react/.eslintrc](https://github.com/mattermost/platform/blob/master/web/react/.eslintrc.json) Instructions on how to use ESLint with your favourite editor can be found here: [http://eslint.org/docs/user-guide/integrations](http://eslint.org/docs/user-guide/integrations) -This is an abriged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. +This is an abridged version of the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react#airbnb-reactjsx-style-guide). Anything that is unclear here follow that guide. If there is a conflict, follow what is said below. ### General - Include only one React component per file. -- Use class \ extends React.Componet over React.createClass unless you need mixins +- Use class \ extends React.Component over React.createClass unless you need mixins - CapitalCamelCase with .jsx extension for component filenames. - Filenames should be the component name. @@ -153,7 +155,7 @@ This is an abriged version of the [Airbnb React/JSX Style Guide](https://github. ``` -### Nameing +### Naming - Property names use camelCase. - React component names use CapitalCamelCase. -- cgit v1.2.3-1-g7c22 From b0105bc1ed034af76fa2289e7a54920c56039e63 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 19:29:57 +0500 Subject: mm-1762 - Search improvements with some other minor Ui changes --- web/react/components/search_bar.jsx | 11 +++++-- web/react/components/sidebar_header.jsx | 10 ++++-- web/sass-files/sass/partials/_headers.scss | 42 ++++++++++++++++++++----- web/sass-files/sass/partials/_responsive.scss | 44 +++++++++++++++------------ web/sass-files/sass/partials/_search.scss | 37 ++++++++++++++-------- 5 files changed, 100 insertions(+), 44 deletions(-) diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx index f21f0cd58..e39cf5d46 100644 --- a/web/react/components/search_bar.jsx +++ b/web/react/components/search_bar.jsx @@ -36,6 +36,9 @@ module.exports = React.createClass({ } } }, + clearFocus: function(e) { + $('.search-bar__container').removeClass('focused'); + }, handleClose: function(e) { e.preventDefault(); @@ -57,6 +60,7 @@ module.exports = React.createClass({ }, handleUserFocus: function(e) { e.target.select(); + $('.search-bar__container').addClass('focused'); }, performSearch: function(terms, isMentionSearch) { if (terms.length) { @@ -92,13 +96,14 @@ module.exports = React.createClass({ render: function() { return (
-
Cancel
- +
+ Cancel + -
  • +
  • @@ -107,6 +107,12 @@ module.exports = React.createClass({ }; }, + toggleDropdown: function(e) { + e.preventDefault(); + e.stopPropagation(); + $('.team__header').find('.dropdown-toggle').trigger('click'); + }, + render: function() { var me = UserStore.getCurrentUser(); @@ -116,7 +122,7 @@ module.exports = React.createClass({ return (
    - + { me.last_picture_update ? .nav { > li { @@ -250,10 +276,10 @@ vertical-align: top; display: inline-block; width: 15px; - margin: 9px 4px 3px 0; + margin: 9px 6px 3px 0; &:hover { svg { - fill: #888; + fill: #777; } } a { @@ -263,6 +289,6 @@ svg { vertical-align: top; margin-top: 8px; - fill: #AAA; + fill: #aaa; } } diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 719934638..f3f9cd477 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -448,28 +448,39 @@ } } .search-bar__container { - padding: 10px 8px 13px; + padding: 0; + height: 45px; background: $primary-color; color: #fff; + &.focused { + .sidebar__collapse { + @include translateX(-45px); + } + .search__form { + padding-left: 10px; + padding-right: 67px; + } + .search__clear { + display: block; + } + } .search__form { border: none; - padding: 0 60px 0 35px; + padding: 7px 20px 0 45px; + height: 45px; + position: relative; + @include single-transition(all, 0.2s, linear); .form-control { - line-height: normal; - background: none; + border: none; + padding: 0 10px 0 31px; + background: rgba(black, 0.2); + @include border-radius(3px); color: #fff; - border-radius: 0; - padding: 0; - border-bottom: 1px solid #FFF; - border-bottom: 1px solid rgba(#fff, 0.4); - &:focus { - border-bottom: 1px solid rgba(#fff, 0.8); - } } input[type=text] { - @include input-placeholder { + @include input-placeholder { color: #fff; - color: rgba(#fff, 0.6); + color: rgba(#fff, 0.5); } } } @@ -550,11 +561,6 @@ .sidebar--right__close { display: none; } - .search__form { - .glyphicon { - color: #fff; - } - } } .inner__wrap { &.move--right { @@ -650,7 +656,7 @@ display: block; } .access__report { - margin: 0 0 15px 15px; + margin: 0 0 15px 15px; } .access__date { div { diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss index 794358320..0d005bfe2 100644 --- a/web/sass-files/sass/partials/_search.scss +++ b/web/sass-files/sass/partials/_search.scss @@ -1,23 +1,37 @@ .search-bar__container { padding: 8px 8px 8px 0; } -.sidebar__collapse { - width: auto; - height: auto; +.search__clear { + display: none; position: absolute; - top: 1px; - right: 15px; + right: 0; + line-height: 45px; + margin-right: 13px; + z-index: 5; + cursor: pointer; +} +.sidebar__collapse { cursor: pointer; - padding: 1em 0; z-index: 5; + fill: #FFF; + position: absolute; + left: 0; + font-size: 33px; + width: 45px; + @include single-transition(all, 0.2s, linear); + @include translateX(0px); + text-align: center; + padding-right: 2px; + line-height: 42px; display: none; } .sidebar__search-icon { position: absolute; - left: 15px; - top: 18px; - font-size: 16px; - @include opacity(0.8); + top: 15px; + margin-left: 10px; + font-size: 14px; + color: #fff; + color: rgba(#fff, 0.5); display: none; } .search__form { @@ -30,9 +44,8 @@ .sidebar--right & { width: 100%; } - .search-bar-box { + .search-bar { height: 40px; - border: 1px solid #ddd; padding-right: 30px; box-shadow: none; .search-bar__container & { -- cgit v1.2.3-1-g7c22 From bcc068e719efe0dd5fa2108e298ea5caaeea36e9 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 19:38:44 +0500 Subject: Fixing error markup in signup flow --- web/react/components/signup_team_complete.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index 21f9edef1..e7b37ef39 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -620,8 +620,8 @@ PasswordPage = React.createClass({ client.track('signup', 'signup_team_07_password'); - var password_error = this.state.password_error ? : null; - var server_error = this.state.server_error ? : null; + var password_error = this.state.password_error ?
    : null; + var server_error = this.state.server_error ?
    : null; return (
    -- cgit v1.2.3-1-g7c22 From 41dc0a3e3c68e610e5f67bcdfe49aeb4cc436d81 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 19:40:22 +0500 Subject: Improving css for form hints in signup flow --- web/sass-files/sass/partials/_signup.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 1a0c55f39..4b6ee79a1 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -74,7 +74,7 @@ .form__hint { font-size: 0.95em; color: #999; - margin: 10px 0; + margin: 10px 0 0; } .signup-team-confirm__container { -- cgit v1.2.3-1-g7c22 From 1e0abf74a3cfea6a540e922abf6e038018160fc4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 29 Jul 2015 20:24:28 +0500 Subject: Removing unused id on LHS dropdown --- web/react/components/sidebar_header.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index b6ca8c1a5..0156dc01a 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -75,7 +75,7 @@ var NavbarDropdown = React.createClass({ return (
      -
    • +
    • @@ -108,8 +108,6 @@ module.exports = React.createClass({ }, toggleDropdown: function(e) { - e.preventDefault(); - e.stopPropagation(); $('.team__header').find('.dropdown-toggle').trigger('click'); }, -- cgit v1.2.3-1-g7c22
    • +