From a1909c7242d812dc841af17c17ef28a2401cb2f7 Mon Sep 17 00:00:00 2001
From: Gabriel Engel <gabriel.engel@gmail.com>
Date: Sat, 5 Nov 2016 01:50:28 -0200
Subject: [PATCH] simplifying css
---
.../assets/stylesheets/base.less | 6 ----
.../stylesheets/utils/_colors.import.less | 30 ++++---------------
packages/rocketchat-ui/views/cmsPage.html | 2 +-
3 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index 59c28ef0bc9..071b16179c8 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -541,12 +541,6 @@ textarea[disabled] {
}
.form-group {
- .-btn {
- margin-left: 2px;
- &:nth-child(1) {
- margin-left: 3px;
- }
- }
.input-group {
padding: 2px 0;
}
diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
index f9493851178..d77e10f5011 100755
--- a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
+++ b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
@@ -9,7 +9,6 @@
@pending-color: #fcb316;
@component-color: @input-font-color;
@selection-color: @info-active-font-color;
-
@primary-background-contrast: contrast(@primary-background-color, #444);
@primary-action-contrast: contrast(@primary-action-color, #444);
@secondary-action-contrast: contrast(@secondary-action-color, #444);
@@ -231,28 +230,13 @@ label.required:after {
// new layout buttons
.button {
.buttonColors(@secondary-action-contrast, @secondary-action-color);
- &.button-primary,
- &.primary,
- &.save,
- &.send,
- &.start {
+ &.primary {
.buttonColors(@primary-action-contrast, @primary-action-color);
}
- // TODO: Secondary button usage needs refactor and guidelines to be consistent
- // &.back,
- // &.cancel,
- // &.secondary {
- // .buttonColors(@secondary-action-contrast,@secondary-action-color);
- // }
- &.danger,
- &.delete,
- &.delete-role,
- &.end,
- &.logout,
- &.mute-user,
- &.remove,
- &.remove-user,
- &.stop-call {
+ &.secondary {
+ .buttonColors(@secondary-action-contrast, @secondary-action-color);
+ }
+ &.danger {
.buttonColors(@error-contrast, @error-color);
}
&.external-login {
@@ -1254,10 +1238,6 @@ a.github-fork {
color: white;
}
-.green {
- color: green;
-}
-
.flex-tab-bar {
background: #FCFCFC;
.tab-button {
diff --git a/packages/rocketchat-ui/views/cmsPage.html b/packages/rocketchat-ui/views/cmsPage.html
index 5c56e2952c0..9cd5c7fbddb 100644
--- a/packages/rocketchat-ui/views/cmsPage.html
+++ b/packages/rocketchat-ui/views/cmsPage.html
@@ -1,7 +1,7 @@
<template name="cmsPage">
<div class="cms-page">
<div class="cms-page-close">
- <a href="/login" class="button button-primary"><i class="icon-cancel"></i></a>
+ <a href="/login" class="button primary"><i class="icon-cancel"></i></a>
</div>
{{{page}}}
</div>
--
GitLab