From 07d967bb11c06d11ca46c0da2a9725ad55476c09 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Thu, 12 Mar 2015 10:09:38 +0100 Subject: [PATCH] deprecate some css --- .../sonar-web/src/main/less/deprecated.less | 130 ++++++++++++++- .../sonar-web/src/main/less/init/forms.less | 5 + server/sonar-web/src/main/less/style.less | 150 ------------------ .../app/views/layouts/_layout.html.erb | 8 +- 4 files changed, 136 insertions(+), 157 deletions(-) diff --git a/server/sonar-web/src/main/less/deprecated.less b/server/sonar-web/src/main/less/deprecated.less index eb1ad7a0ba2..bcc68a4f0e4 100644 --- a/server/sonar-web/src/main/less/deprecated.less +++ b/server/sonar-web/src/main/less/deprecated.less @@ -92,6 +92,7 @@ padding: 2px 4px; } +// use `.alert.alert-warning` instead .warning, .modal-warning { margin: 0 0 8px; padding: 5px 8px; @@ -100,6 +101,7 @@ color: @orange; } +// use `.alert.alert-danger` instead .error, .modal-error { margin: 0 0 8px; padding: 5px 8px; @@ -108,12 +110,13 @@ color: @red; } +// use `.alert.alert-success` or `.alert.alert-info` instead .notice, .modal-notice { margin: 0 0 8px; padding: 5px 8px; - border: 2px solid @blue; + border: 2px solid @green; background-color: @white; - color: @blue; + color: @green; } .info { @@ -405,6 +408,125 @@ div.autocompleteNote { cursor: default; } -.link-red { - color: @red !important; +a.external { + background: url('../images/links/external.png') no-repeat 100% 0; + padding: 0 16px 0 0; +} + +.fav { + display: inline-block; + background: url('../images/star.png') no-repeat 100% 0; + width: 16px; + height: 16px; + vertical-align: text-bottom; +} + +.notfav { + display: inline-block; + background: url('../images/star_off.png') no-repeat 100% 0; + width: 16px; + height: 16px; + vertical-align: text-bottom; +} + +/* DUPLICATIONS */ + +.duplications { + max-width: 100%; +} + +.duplications td.item { + text-align: right; + vertical-align: top; + padding: 0; +} + +.duplications td.item p { + padding: 3px 5px; +} + +.duplications td.fileItem { + text-align: left; + vertical-align: top; + padding: 0; + white-space: nowrap; +} + +.duplications td.fileItem p { + padding: 3px 5px; +} + +.duplications td.item p.selected, .duplications td.fileItem p.selected { + background-color: #EFEFEF; + border-top: 1px solid #DDD; + border-bottom: 1px solid #DDD; + padding: 3px 5px; +} + +.duplications td.fileItem p.selected a { + text-decoration: none; +} + +.duplications td.sourceItem { + padding: 0; + background-color: #EFEFEF; + border: 1px solid #DDD; + border-left: none; +} + +.duplications td.sourceItem p { + padding: 3px; +} + +.duplicationsMessage { + padding: 10px; +} + +.discussion { + width: 100%; + border: 1px solid #DDDDDD; +} + +.discussionComment.first { + border-top: none; +} + +.discussionComment { + background-color: #EFEFEF; + border-top: 1px solid #DDDDDD; + line-height: 1.5em; + margin: 0; + padding: 5px 10px; + + h4 { + font-size: 90%; + margin-bottom: 2px; + } + + h4 img { + vertical-align: sub; + } + + ol li { + list-style: decimal inside; + } + + ul li { + list-style: square inside; + } + + pre { + padding: 10px; + border: 1px dashed #DDD; + color: #444; + font-size: 12px; + } +} + +div.comment-excerpt { + background-color: transparent; + margin-top: 5px; + margin-bottom: 5px; + color: #777777; + font-size: 90%; } diff --git a/server/sonar-web/src/main/less/init/forms.less b/server/sonar-web/src/main/less/init/forms.less index aa19189d02c..4403489ccf6 100644 --- a/server/sonar-web/src/main/less/init/forms.less +++ b/server/sonar-web/src/main/less/init/forms.less @@ -181,3 +181,8 @@ input[type=button] { .input-small { width: 80px; } + +em.mandatory { + color: #990000; + font-style: italic; +} diff --git a/server/sonar-web/src/main/less/style.less b/server/sonar-web/src/main/less/style.less index 087d421cad0..46c7ee988e7 100644 --- a/server/sonar-web/src/main/less/style.less +++ b/server/sonar-web/src/main/less/style.less @@ -24,156 +24,6 @@ @import (reference) "components/ui"; @import (reference) "components/typography"; -.ie-warn { - color: #EEE; - background: #FF5252; - padding: 0 5px; -} - -.ie-warn a { - color: #EEE; - text-decoration: underline; -} - -/* - GENERAL -*/ - -em.mandatory { - color: #990000; - font-style: italic; -} - -a.external { - background: url('../images/links/external.png') no-repeat 100% 0; - padding: 0 16px 0 0; -} - -.fav { - display: inline-block; - background: url('../images/star.png') no-repeat 100% 0; - width: 16px; - height: 16px; - vertical-align: text-bottom; -} - -.notfav { - display: inline-block; - background: url('../images/star_off.png') no-repeat 100% 0; - width: 16px; - height: 16px; - vertical-align: text-bottom; -} - -/* ------------------- SETUP / MIGRATION PAGES ------------------- */ -.migration { - background-image: url("../images/logo.png"); - background-repeat: no-repeat; - background-position: top right; -} - -/* DUPLICATIONS */ - -.duplications { - max-width: 100%; -} - -.duplications td.item { - text-align: right; - vertical-align: top; - padding: 0; -} - -.duplications td.item p { - padding: 3px 5px; -} - -.duplications td.fileItem { - text-align: left; - vertical-align: top; - padding: 0; - white-space: nowrap; -} - -.duplications td.fileItem p { - padding: 3px 5px; -} - -.duplications td.item p.selected, .duplications td.fileItem p.selected { - background-color: #EFEFEF; - border-top: 1px solid #DDD; - border-bottom: 1px solid #DDD; - padding: 3px 5px; -} - -.duplications td.fileItem p.selected a { - text-decoration: none; -} - -.duplications td.sourceItem { - padding: 0; - background-color: #EFEFEF; - border: 1px solid #DDD; - border-left: none; -} - -.duplications td.sourceItem p { - padding: 3px; -} - -.duplicationsMessage { - padding: 10px; -} - -.discussion { - width: 100%; - border: 1px solid #DDDDDD; -} - -.discussionComment.first { - border-top: none; -} - -.discussionComment { - background-color: #EFEFEF; - border-top: 1px solid #DDDDDD; - line-height: 1.5em; - margin: 0; - padding: 5px 10px; - - h4 { - font-size: 90%; - margin-bottom: 2px; - } - - h4 img { - vertical-align: sub; - } - - ol li { - list-style: decimal inside; - } - - ul li { - list-style: square inside; - } - - pre { - padding: 10px; - border: 1px dashed #DDD; - color: #444; - font-size: 12px; - } -} - -div.comment-excerpt { - background-color: transparent; - margin-top: 5px; - margin-bottom: 5px; - color: #777777; - font-size: 90%; -} - /* ACTION PLANS */ table.actionPlans { margin-top: 10px; diff --git a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb index c72125fbcf8..05650669b80 100644 --- a/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb +++ b/server/sonar-web/src/main/webapp/WEB-INF/app/views/layouts/_layout.html.erb @@ -50,10 +50,12 @@ Plugins - Web Service API <% unless DatabaseVersion.production? %> -

Embedded database should be used for evaluation purpose only -

The embedded database will not scale, it will not support upgrading to newer versions of SonarQube, and there is no support for migrating your data out of it into a different database engine. +
+

Embedded database should be used for evaluation purpose only

+

The embedded database will not scale, it will not support upgrading to newer versions of SonarQube, and there is no support for migrating your data out of it into a different database engine.

+
<% end %> - + <% end %> -- 2.39.5