Skip to content
Snippets Groups Projects
Commit e2ad7be2 authored by Karl Prieb's avatar Karl Prieb
Browse files

create secondary-background-color class

parent e85480d4
No related merge requests found
Showing
with 22 additions and 45 deletions
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
{{#unless $value.isToggle}} {{#unless $value.isToggle}}
{{#if $value.canEdit room}} {{#if $value.canEdit room}}
{{#if editing $key}} {{#if editing $key}}
<div class="buttons"> <div class="buttons secondary-background-color">
<button type="button" class="button cancel"> <button type="button" class="button cancel">
<i class="icon-cancel"></i> <i class="icon-cancel"></i>
</button> </button>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
{{{_ "Showing_results" customemoji.length}}} {{{_ "Showing_results" customemoji.length}}}
</div> </div>
<div class="list"> <div class="list">
<table> <table class="secondary-background-color">
<thead> <thead>
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color">&nbsp;</th> <th class="content-background-color border-component-color">&nbsp;</th>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
{{/unless}} {{/unless}}
</div> </div>
</section> </section>
<section class="flex-tab"> <section class="flex-tab secondary-background-color">
{{> Template.dynamic template=flexTemplate data=flexData}} {{> Template.dynamic template=flexTemplate data=flexData}}
</section> </section>
</template> </template>
...@@ -61,6 +61,10 @@ ...@@ -61,6 +61,10 @@
background-color: @primary-action-color; background-color: @primary-action-color;
} }
.secondary-background-color {
background-color: @secondary-background-color;
}
.border-component-color { .border-component-color {
border-color: @component-color; border-color: @component-color;
} }
...@@ -159,14 +163,9 @@ ...@@ -159,14 +163,9 @@
* Document components * Document components
*/ */
.secondary-background-color {
background-color: @secondary-background-color;
}
.page-container { .page-container {
table { table {
overflow: hidden; overflow: hidden;
background-color: @secondary-background-color;
} }
tr:hover td { tr:hover td {
...@@ -391,7 +390,6 @@ a:hover { ...@@ -391,7 +390,6 @@ a:hover {
*/ */
.spotlight { .spotlight {
> .spotlight-input { > .spotlight-input {
background-color: @secondary-background-color;
color: @secondary-font-color; color: @secondary-font-color;
> i { > i {
...@@ -505,22 +503,9 @@ a:hover { ...@@ -505,22 +503,9 @@ a:hover {
&.selectable .selected { &.selectable .selected {
background-color: @selection-background; background-color: @selection-background;
} }
.load-more span {
background-color: @secondary-background-color;
}
} }
} }
.message-popup {
background: @content-background-color;
}
.message-popup-title {
background-color: @secondary-background-color;
// border-bottom-color: #E7E7E7;
}
.popup-item { .popup-item {
&.selected { &.selected {
color: @primary-action-contrast; color: @primary-action-contrast;
...@@ -582,10 +567,6 @@ a:hover { ...@@ -582,10 +567,6 @@ a:hover {
ul li:hover { ul li:hover {
background-color: @tertiary-background-color; background-color: @tertiary-background-color;
} }
.message-dropdown-close {
background-color: @secondary-background-color;
}
} }
.is-bot, .is-bot,
...@@ -674,8 +655,6 @@ a:hover { ...@@ -674,8 +655,6 @@ a:hover {
* Flex tabs / admin fly-out panels * Flex tabs / admin fly-out panels
*/ */
.flex-tab { .flex-tab {
background-color: @secondary-background-color;
input, input,
select, select,
textarea { textarea {
...@@ -700,8 +679,6 @@ a:hover { ...@@ -700,8 +679,6 @@ a:hover {
.channel-settings { .channel-settings {
.buttons { .buttons {
background-color: @secondary-background-color;
.button { .button {
.buttonColors(lighten(@primary-font-color, 25%), @secondary-background-color); .buttonColors(lighten(@primary-font-color, 25%), @secondary-background-color);
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<div class="content"> <div class="content">
{{#if hasPermission 'view-statistics'}} {{#if hasPermission 'view-statistics'}}
<h3>{{_ "Rocket.Chat"}}</h3> <h3>{{_ "Rocket.Chat"}}</h3>
<table class="statistics-table"> <table class="statistics-table secondary-background-color">
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color">{{_ "Version"}}</th> <th class="content-background-color border-component-color">{{_ "Version"}}</th>
<td class="border-component-color">{{statistics.version}}</td> <td class="border-component-color">{{statistics.version}}</td>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
{{/if}} {{/if}}
<h3>{{_ "Commit"}}</h3> <h3>{{_ "Commit"}}</h3>
<table class="statistics-table"> <table class="statistics-table secondary-background-color">
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color">{{_ "Hash"}}</th> <th class="content-background-color border-component-color">{{_ "Hash"}}</th>
<td class="border-component-color">{{info.commit.hash}}</td> <td class="border-component-color">{{info.commit.hash}}</td>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
{{#if hasPermission 'view-statistics'}} {{#if hasPermission 'view-statistics'}}
{{#if isReady}} {{#if isReady}}
<h3>{{_ "Runtime_Environment"}}</h3> <h3>{{_ "Runtime_Environment"}}</h3>
<table class="statistics-table"> <table class="statistics-table secondary-background-color">
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color">{{_ "OS_Type"}}</th> <th class="content-background-color border-component-color">{{_ "OS_Type"}}</th>
<td class="border-component-color">{{statistics.os.type}}</td> <td class="border-component-color">{{statistics.os.type}}</td>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</table> </table>
<h3>{{_ "Build_Environment"}}</h3> <h3>{{_ "Build_Environment"}}</h3>
<table class="statistics-table"> <table class="statistics-table secondary-background-color">
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color">{{_ "OS_Platform"}}</th> <th class="content-background-color border-component-color">{{_ "OS_Platform"}}</th>
<td class="border-component-color">{{build.platform}}</td> <td class="border-component-color">{{build.platform}}</td>
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
<h3>{{_ "Usage"}}</h3> <h3>{{_ "Usage"}}</h3>
<table class="statistics-table"> <table class="statistics-table secondary-background-color">
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color">{{_ "Stats_Total_Users"}}</th> <th class="content-background-color border-component-color">{{_ "Stats_Total_Users"}}</th>
<td class="border-component-color">{{statistics.totalUsers}}</td> <td class="border-component-color">{{statistics.totalUsers}}</td>
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
{{{_ "Showing_results" roomCount}}} {{{_ "Showing_results" roomCount}}}
</div> </div>
<div class="list"> <div class="list">
<table> <table class="secondary-background-color">
<thead> <thead>
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color" width="30%">{{_ "Name"}}</th> <th class="content-background-color border-component-color" width="30%">{{_ "Name"}}</th>
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
{{/unless}} {{/unless}}
</div> </div>
</section> </section>
<section class="flex-tab"> <section class="flex-tab secondary-background-color">
{{> Template.dynamic template=flexTemplate data=flexData}} {{> Template.dynamic template=flexTemplate data=flexData}}
</section> </section>
</template> </template>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
{{{_ "Showing_results" users.length}}} {{{_ "Showing_results" users.length}}}
</div> </div>
<div class="list"> <div class="list">
<table> <table class="secondary-background-color">
<thead> <thead>
<tr class="admin-table-row"> <tr class="admin-table-row">
<th class="content-background-color border-component-color">&nbsp;</th> <th class="content-background-color border-component-color">&nbsp;</th>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
{{/unless}} {{/unless}}
</div> </div>
</section> </section>
<section class="flex-tab"> <section class="flex-tab secondary-background-color">
{{> Template.dynamic template=flexTemplate data=flexData}} {{> Template.dynamic template=flexTemplate data=flexData}}
</section> </section>
</template> </template>
<template name="messageDropdown"> <template name="messageDropdown">
<div class="message-dropdown"> <div class="message-dropdown">
<ul> <ul>
<li class="message-dropdown-close border-component-color"><i class=" icon-angle-left" aria-label="{{_ "Close"}}"></i></li> <li class="message-dropdown-close secondary-background-color border-component-color"><i class=" icon-angle-left" aria-label="{{_ "Close"}}"></i></li>
{{#if actions.length}} {{#if actions.length}}
{{#each actions}} {{#each actions}}
<li class="{{id}} {{classes}} message-action" title="{{_ i18nLabel}}" data-id="{{id}}"><i class="{{icon}}" aria-label="{{_ i18nLabel}}"></i></li> <li class="{{id}} {{classes}} message-action" title="{{_ i18nLabel}}" data-id="{{id}}"><i class="{{icon}}" aria-label="{{_ i18nLabel}}"></i></li>
......
<template name="messagePopup"> <template name="messagePopup">
{{#if isOpen}} {{#if isOpen}}
<div class="message-popup-position"> <div class="message-popup-position">
<div class="message-popup {{cls}}"> <div class="message-popup content-background-color {{cls}}">
{{#if title}} {{#if title}}
<div class="message-popup-title"> <div class="message-popup-title secondary-background-color">
{{title}} {{title}}
</div> </div>
{{/if}} {{/if}}
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="unread-rooms background-primary-action-color bottom-unread-rooms hidden"> <div class="unread-rooms background-primary-action-color bottom-unread-rooms hidden">
{{_ "More_unreads"}} <i class="icon-down-big"></i> {{_ "More_unreads"}} <i class="icon-down-big"></i>
</div> </div>
<div class="flex-nav animated-hidden"> <div class="flex-nav primary-background-color animated-hidden">
<section> <section>
{{> Template.dynamic template=flexTemplate data=flexData}} {{> Template.dynamic template=flexTemplate data=flexData}}
</section> </section>
......
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
{{> messageBox}} {{> messageBox}}
</footer> </footer>
</section> </section>
<section class="flex-tab"> <section class="flex-tab secondary-background-color">
{{> Template.dynamic template=flexTemplate data=flexData}} {{> Template.dynamic template=flexTemplate data=flexData}}
</section> </section>
</div> </div>
......
<template name="spotlight"> <template name="spotlight">
<div class="spotlight hidden background-transparent-darker"> <div class="spotlight hidden background-transparent-darker">
<div class="spotlight-input"> <div class="spotlight-input secondary-background-color">
<i class="icon-search"></i> <i class="icon-search"></i>
<input type="text" name="spotlight"> <input type="text" name="spotlight">
{{> messagePopup popupConfig}} {{> messagePopup popupConfig}}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment