Skip to content

Commit

Permalink
Work in progress
Browse files Browse the repository at this point in the history
  • Loading branch information
RaphaelGauthier committed Feb 6, 2024
1 parent 0e16f85 commit eabf8c3
Show file tree
Hide file tree
Showing 5 changed files with 118 additions and 30 deletions.
@@ -0,0 +1,57 @@
/*
*************************************************************************************
* Copyright 2024 Normation SAS
*************************************************************************************
*
* This file is part of Rudder.
*
* Rudder is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* In accordance with the terms of section 7 (7. Additional Terms.) of
* the GNU General Public License version 3, the copyright holders add
* the following Additional permissions:
* Notwithstanding to the terms of section 5 (5. Conveying Modified Source
* Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
* Public License version 3, when you create a Related Module, this
* Related Module is not considered as a part of the work and may be
* distributed under the license agreement of your choice.
* A "Related Module" means a set of sources files including their
* documentation that, without modification of the Source Code, enables
* supplementary functions or services in addition to those offered by
* the Software.
*
* Rudder is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Rudder. If not, see <http://www.gnu.org/licenses/>.
*
*************************************************************************************
*/

// --- MAIN COLORS
$rudder-success : #13BEB7;
$rudder-primary : #337ab7;
$rudder-warning : #EF9600;
$rudder-danger : #DA291C;

// --- POLICY MODE
$rudder-audit : #1384be;
$rudder-enforce : #1384be;

// --- TEXT & LINK
$rudder-txt-primary : #041922;
$rudder-txt-secondary : #72829D;
$rudder-txt-link : #1295C2;

// --- BACKGROUNDS
$rudder-bg-gray : #F8F9FC;

// --- BORDERS
$rudder-border-color : #D6DEEF;
@@ -0,0 +1,60 @@
/*
*************************************************************************************
* Copyright 2024 Normation SAS
*************************************************************************************
*
* This file is part of Rudder.
*
* Rudder is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* In accordance with the terms of section 7 (7. Additional Terms.) of
* the GNU General Public License version 3, the copyright holders add
* the following Additional permissions:
* Notwithstanding to the terms of section 5 (5. Conveying Modified Source
* Versions) and 6 (6. Conveying Non-Source Forms.) of the GNU General
* Public License version 3, when you create a Related Module, this
* Related Module is not considered as a part of the work and may be
* distributed under the license agreement of your choice.
* A "Related Module" means a set of sources files including their
* documentation that, without modification of the Source Code, enables
* supplementary functions or services in addition to those offered by
* the Software.
*
* Rudder is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Rudder. If not, see <http://www.gnu.org/licenses/>.
*
*************************************************************************************
*/

@use 'sass:color';
@import "./rudder-variables";

// --- VARIABLES
$primary : $rudder-primary;
$success : $rudder-success;
$warning : $rudder-warning;
$danger : $rudder-danger;
$body-color : $rudder-txt-primary;
$link-color : $rudder-txt-link;

@import "../../node_modules/bootstrap/scss/bootstrap";

/* --- BUTTONS OVERRIDE
-- Bootstrap is using the WCAG 2.0 algorithm to determine the (text, hover, disabled..) colors of the button following its background color.
-- According to the WCAG algorithm, the success color we used isn't dark enough to have a white text, so we have to override the btn-success rule
*/
.btn-success {
color: #fff !important;
&:hover, &:focus, &:active, &:visited{
background-color: color.scale($rudder-success, $lightness: -10%);
}
}
Expand Up @@ -293,33 +293,6 @@ pre.json-beautify code.elmsh {
background-color: #fff;
border-color: #d6deef;
}
.modal .btn-success,
.modal .btn-success[disabled]:hover,
.content-wrapper .btn-success,
.content-wrapper .btn-success[disabled]:hover ,
.content-wrapper .open > .dropdown-toggle.btn-success{
background-color: #13BEB7;
border-color: #109f9a;
background-image: none !important;
}
.modal .btn-success:hover,
.modal .btn-success:focus:hover,
.content-wrapper .btn-success:hover,.content-wrapper .btn-success:focus:hover ,
.content-wrapper .open > .dropdown-toggle.btn-success:focus,
.content-wrapper .open > .dropdown-toggle.btn-success:hover{
background-color: #11b0a9;
border-color: #108f8b;
}
.content-wrapper .btn-success:focus,.content-wrapper .btn-success:focus ,
.modal .btn-success:focus,.modal .btn-success:focus {
background-color: #13BEB7;
border-color: #109f9a;
}
.content-wrapper .btn-success:active,.content-wrapper .btn-success:active:focus ,
.modal .btn-success:active,.modal .btn-success:active:focus {
background-color: #10a19c;
border-color: #109f9a;
}

.sidebar-menu>li>a>.fa{
margin-right: 2px;
Expand Down
Expand Up @@ -76,7 +76,6 @@ ul {
}
.content-wrapper .rudder-template .jstree .jstree-node a.jstree-anchor:hover,
.content-wrapper .rudder-template .jstree .jstree-node.jstree-leaf a.jstree-anchor{
color: #1295c2;
cursor: pointer;
}
.content-wrapper .rudder-template .jstree .jstree-anchor .btn.create{
Expand Down Expand Up @@ -587,7 +586,6 @@ ul {

.rudder-template .sidebar-navbar ul > li > a,
.rudder-template .main-navbar ul > li > a{
color: #1295c2;
padding: 0;
background-color: transparent !important;
border: none !important;
Expand Down
Expand Up @@ -18,7 +18,7 @@

<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder.css" media="screen" />

<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/libs/bootstrap.min.css" media="screen" />
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-bootstrap.css" media="screen" />

<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-compliance.css" media="screen" />
<link type="text/css" rel="stylesheet" data-lift="with-cached-resource" href="/style/rudder/rudder-quicksearch.css" media="screen" />
Expand Down

0 comments on commit eabf8c3

Please sign in to comment.