Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Rocket.Chat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RocketChat
Rocket.Chat
Commits
a9b46a66
Commit
a9b46a66
authored
8 years ago
by
Karl Prieb
Browse files
Options
Downloads
Patches
Plain Diff
create tertiary-background-color class
parent
fe430d33
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/rocketchat-theme/server/colors.less
+7
-3
7 additions, 3 deletions
packages/rocketchat-theme/server/colors.less
packages/rocketchat-ui-account/account/avatar/prompt.html
+9
-9
9 additions, 9 deletions
packages/rocketchat-ui-account/account/avatar/prompt.html
with
16 additions
and
12 deletions
packages/rocketchat-theme/server/colors.less
+
7
−
3
View file @
a9b46a66
...
...
@@ -106,6 +106,13 @@
.background-attention-color {
background-color: @attention-color;
}
// Minor Colors
.tertiary-background-color {
background-color: @tertiary-background-color;
}
// transparent
.background-transparent-darkest {
...
...
@@ -368,11 +375,8 @@ a:hover {
}
.avatar-suggestion-item {
background-color: @tertiary-background-color;
.avatar {
background-size: cover;
background-color: @tertiary-background-color;
}
.question-mark::before {
...
...
This diff is collapsed.
Click to expand it.
packages/rocketchat-ui-account/account/avatar/prompt.html
+
9
−
9
View file @
a9b46a66
<template
name=
"avatarSuggestion"
>
{{#if .}}
<div
class=
"avatar-suggestion-item"
>
<div
class=
"avatar"
style=
"background-image: url({{blob}});"
>
<div
class=
"avatar-suggestion-item
tertiary-background-color
"
>
<div
class=
"avatar
tertiary-background-color
"
style=
"background-image: url({{blob}});"
>
</div>
<div
class=
"action"
>
<button
type=
"button"
class=
"button primary {{service}} select-service"
>
{{_ "Use_service_avatar" service}}
</button>
...
...
@@ -12,8 +12,8 @@
<template
name=
"avatarSuggestionLogin"
>
{{#if .}}
<div
class=
"avatar-suggestion-item"
>
<div
class=
"avatar question-mark icon-user"
></div>
<div
class=
"avatar-suggestion-item
tertiary-background-color
"
>
<div
class=
"avatar question-mark icon-user
tertiary-background-color
"
></div>
<div
class=
"action"
>
<button
type=
"button"
class=
"button primary {{.}} login-with-service"
>
{{_ "Login_with" .}}
</button>
</div>
...
...
@@ -36,7 +36,7 @@
</header>
<div>
<div
class=
"avatar-suggestions"
>
<div
class=
"avatar-suggestion-item"
>
<div
class=
"avatar-suggestion-item
tertiary-background-color
"
>
{{> avatar username=initialsUsername }}
{{#with service='initials'}}
<div
class=
"action"
>
...
...
@@ -44,8 +44,8 @@
</div>
{{/with}}
</div>
<div
class=
"avatar-suggestion-item"
>
<div
style=
"background-image: url({{upload.blob}});"
class=
"avatar {{#unless upload}}question-mark icon-upload{{/unless}}"
>
<div
class=
"avatar-suggestion-item
tertiary-background-color
"
>
<div
style=
"background-image: url({{upload.blob}});"
class=
"avatar
tertiary-background-color
{{#unless upload}}question-mark icon-upload{{/unless}}"
>
</div>
<div
class=
"action"
>
<div
class=
"button primary"
>
{{_ "Select_file"}}
...
...
@@ -56,9 +56,9 @@
{{/with}}
</div>
</div>
<div
class=
"avatar-suggestion-item"
>
<div
class=
"avatar-suggestion-item
tertiary-background-color
"
>
{{#with service='url'}}
<div
class=
"avatar question-mark icon-upload"
></div>
<div
class=
"avatar question-mark icon-upload
tertiary-background-color
"
></div>
<div
class=
"action"
>
<div
class=
"input-line"
>
<input
type=
"text"
name=
"avatarurl"
id=
"avatarurl"
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment