Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix color issues #5180

Merged
merged 6 commits into from
Dec 12, 2016
Merged

Fix color issues #5180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6763e59
color issues: fix attachment buttons background on hover
karlprieb Dec 12, 2016
6ee7276
color issues: fix light blue button
karlprieb Dec 12, 2016
96a286a
color issues: fix server connection status
karlprieb Dec 12, 2016
9070aed
fix colors: inline code
karlprieb Dec 12, 2016
6c96436
color issues: fix multiline growth
karlprieb Dec 12, 2016
56bfe59
color issues: fix stream-info and formatting-tips alignment
karlprieb Dec 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/rocketchat-theme/assets/stylesheets/base.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2027,6 +2027,7 @@ label.required:after {
min-height: @footer-min-height;
}
.message-form {
margin-bottom: 18px;
> .message-input {
border-width: 1px;
overflow: hidden;
Expand Down Expand Up @@ -2096,7 +2097,7 @@ label.required:after {
}
.formatting-tips {
float: right;
height: 23px;
height: 25px;
font-size: 11px;
padding: 3px;
display: -webkit-flex;
Expand Down Expand Up @@ -2137,7 +2138,9 @@ label.required:after {
}
.stream-info {
font-size: 12px;
height: 25px;
padding: 3px;
float: left;
}
.editing-commands {
display: none;
Expand Down
21 changes: 17 additions & 4 deletions packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
@pending-background: lighten(@pending-color, 45%);
@pending-border: lighten(@pending-color, 30%);
@window-border-color: @component-color;
@code-background-color: #f8f8f8;
@code-border-color: #ccc;
@code-font-color: #333;

/** ----------------------------------------------------------------------------
* Document components
Expand All @@ -37,9 +40,9 @@ body {
}

code {
background-color: @transparent-dark;
border-color: @component-color;
color: @secondary-font-color;
background-color: @code-background-color;
border-color: @code-border-color;
color: @code-font-color;
}

blockquote:before {
Expand Down Expand Up @@ -271,6 +274,9 @@ blockquote:before {
}
.message-buttons {
.buttonColors(lighten(@primary-font-color, 25%), @secondary-background-color);
&:hover {
background-color: mix(@secondary-background-color, contrast(@primary-font-color), 20%);
}
}
textarea {
&.editing {
Expand Down Expand Up @@ -675,6 +681,9 @@ i.status-offline {
&.secondary {
.buttonColors(@secondary-action-contrast, @secondary-action-color);
}
&.tertiary {
.buttonColors(@primary-action-contrast, @selection-color);
}
&.danger {
.buttonColors(@error-contrast, @error-color);
}
Expand Down Expand Up @@ -734,11 +743,15 @@ i.status-offline {
}

.alert-warning {
color: @pending-color;
color: darken(@pending-color, 25%);
background-color: @pending-background;
border-color: @pending-border;
}

.alert-link {
.linkColors(@link-font-color, darken(@link-font-color, 10%));
}

.alert-danger {
color: @error-color;
background-color: @error-background;
Expand Down
2 changes: 1 addition & 1 deletion packages/rocketchat-theme/assets/stylesheets/utils/_mixins.import.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,6 @@
background-color: @bg;
&:hover {
color: mix(@color, contrast(@bg), 60%);
background-color: fadein(mix(@bg, contrast(@color), 60%), 25%);
background-color: mix(@bg, contrast(@color), 60%);
}
}
4 changes: 2 additions & 2 deletions packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ <h3 title="{{username}}"><i class="status-{{status}}"></i> {{username}}</h3>
{{#if isOwner}}
<button class="button button-block danger unset-owner"><span>{{_ "Remove_as_owner"}}</span></button>
{{else}}
<button class="button button-block secondary set-owner"><span>{{_ "Set_as_owner"}}</span></button>
<button class="button button-block tertiary set-owner"><span>{{_ "Set_as_owner"}}</span></button>
{{/if}}
{{/if}}
{{#if canSetModerator}}
{{#if isModerator}}
<button class="button button-block danger unset-moderator"><span>{{_ "Remove_as_moderator"}}</span></button>
{{else}}
<button class="button button-block secondary set-moderator"><span>{{_ "Set_as_moderator"}}</span></button>
<button class="button button-block tertiary set-moderator"><span>{{_ "Set_as_moderator"}}</span></button>
{{/if}}
{{/if}}
{{#if canMuteUser}}
Expand Down