From 604522aa61c2d95f1041ef423e172a1903d02434 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Mon, 16 Dec 2019 18:07:59 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02314=20Regression:=20Work=20on=20Setup?= =?UTF-8?q?=20stylesheet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/setup.css | 61 +++++++++++++++++++---------- css/setup.scss | 103 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 108 insertions(+), 56 deletions(-) diff --git a/css/setup.css b/css/setup.css index acd3caf0c..a4df0632a 100644 --- a/css/setup.css +++ b/css/setup.css @@ -1,3 +1,25 @@ +/* + * Copyright (C) 2013-2019 Combodo SARL + * + * This file is part of iTop. + * + * iTop is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * iTop 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + */ + +/* Helpers classes */ +.center { + text-align: center; +} body { background-color: #eee; color: #1a202c; @@ -7,6 +29,19 @@ body { font-family: Tahoma, Verdana, Arial, Helvetica; overflow-y: auto; } +h1 { + color: #555; + font-size: 16pt; +} +h2 { + color: #1a202c; + font-size: 14pt; +} +h3 { + color: #1c94c4; + font-size: 12pt; + font-weight: bold; +} a { color: #1c94c4; text-decoration: none; @@ -45,22 +80,6 @@ a:hover { border: 3px solid #cbd2d9; border-top: none; } -.center { - text-align: center; -} -h1 { - color: #555; - font-size: 16pt; -} -h2 { - color: #1a202c; - font-size: 14pt; -} -h3 { - color: #1c94c4; - font-size: 12pt; - font-weight: bold; -} .next { width: 100%; text-align: right; @@ -180,15 +199,17 @@ h3.clickable.open { fieldset { border: none; padding: 0; - margin: 0; + margin: 30px 0 0 0; } fieldset > legend { - font-size: 12pt; margin-top: 25px; margin-bottom: 7px; - width: 100%; - border-bottom: 1px solid #718096; padding-bottom: 7px; + width: 100%; + color: #3c3c3c; + font-size: 12pt; + font-weight: bold; + border-bottom: 1px solid #d2d2d2; } #details > .message { margin-bottom: 6px; diff --git a/css/setup.scss b/css/setup.scss index 83321bc25..486b4a2d8 100644 --- a/css/setup.scss +++ b/css/setup.scss @@ -1,3 +1,31 @@ +/*! + * Copyright (C) 2013-2019 Combodo SARL + * + * This file is part of iTop. + * + * iTop is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * iTop 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 Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + */ + +///////// +// Colors +$content-border-color: #CBD2D9 !default; +$default-font-color: #1A202C !default; +$legend-border-color: #718096 !default; +$link-default-color: #1c94c4 !default; +$link-hover-color: #EA7D1E !default; + +/////////////////////// +// Messages to the user $message-default-border-color: #4A5568 !default; $message-default-text-color: #1A202C !default; $message-default-background-color: #F7FAFC !default; @@ -14,11 +42,11 @@ $message-error-border-color: #E53E3E !default; $message-error-text-color: #C53030 !default; $message-error-background-color: #FFF5F5 !default; -$content-border-color: #CBD2D9 !default; -$default-font-color: #1A202C !default; -$legend-border-color: #718096 !default; -$link-default-color: #1c94c4 !default; -$link-hover-color: #EA7D1E !default; +/* Helpers classes */ +.center { + text-align: center; +} + body { background-color: #eee; color: $default-font-color; @@ -28,6 +56,19 @@ body { font-family: Tahoma, Verdana, Arial, Helvetica; overflow-y: auto; } +h1 { + color: #555555; + font-size: 16pt; +} +h2 { + color: $default-font-color; + font-size: 14pt; +} +h3 { + color: #1C94C4; + font-size: 12pt; + font-weight: bold; +} a{ color: $link-default-color; text-decoration: none; @@ -35,6 +76,7 @@ a{ color: $link-hover-color; } } + #header { width: 600px; margin-left: auto; @@ -45,17 +87,18 @@ a{ height: 54px; border: 3px solid $content-border-color; border-bottom: none; -} -#header img { - border: 0; - vertical-align: middle; - margin-right: 20px; -} -#header h1 { - vertical-align: middle; - height: 54px; - noline-height: 54px; - margin: 0; + + img { + border: 0; + vertical-align: middle; + margin-right: 20px; + } + h1 { + vertical-align: middle; + height: 54px; + noline-height: 54px; + margin: 0; + } } #setup { width: 600px; @@ -66,23 +109,9 @@ a{ border: 3px solid $content-border-color; border-top: none; } -.center { - text-align: center; -} -h1 { - color: #555555; - font-size: 16pt; -} -h2 { - color: $default-font-color; - font-size: 14pt; -} -h3 { - color: #1C94C4; - font-size: 12pt; - font-weight: bold; -} + + .next { width: 100%; text-align: right; @@ -205,15 +234,17 @@ h3.clickable.open { fieldset{ border: none; padding: 0; - margin: 0; + margin: 30px 0 0 0; > legend{ - font-size: 12pt; margin-top: 25px; margin-bottom: 7px; - width: 100%; - border-bottom: 1px solid#718096; padding-bottom: 7px; + width: 100%; + color: #3C3C3C; + font-size: 12pt; + font-weight: bold; + border-bottom: 1px solid #D2D2D2; } }