From 044e4e4b21372f498c5af14c5c2dfe7ff4113a0e Mon Sep 17 00:00:00 2001 From: Philipp Bankonier Date: Thu, 27 Jun 2019 15:32:40 +0200 Subject: [PATCH] ui: re-add custom css (#3431) This readds the custom.css file to overwrite the default cloudstack styles. Currently this is only possible by adding them to the custom.scss in the repository and compile them into the cloudstack3.css. Now there is an empty custom.css created when compiling the scss source. This custom.css can be overwritten with the custom styles afterwards. This functionality was broken by #3328. --- ui/css/custom.css | 23 +++++++++++++++++++++++ ui/css/src/scss/cloudstack3.scss | 2 -- ui/css/src/scss/custom.scss | 21 +++++++++++++++++++++ ui/css/src/scss/custom/custom.scss | 21 --------------------- ui/index.html | 1 + 5 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 ui/css/custom.css create mode 100644 ui/css/src/scss/custom.scss delete mode 100644 ui/css/src/scss/custom/custom.scss diff --git a/ui/css/custom.css b/ui/css/custom.css new file mode 100644 index 00000000000..544d2ebbf85 --- /dev/null +++ b/ui/css/custom.css @@ -0,0 +1,23 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +* +* +* Use custom.css to override the default CloudStack styles +*/ + +/*# sourceMappingURL=src/sourcemaps/custom.css.map */ diff --git a/ui/css/src/scss/cloudstack3.scss b/ui/css/src/scss/cloudstack3.scss index 0d523cad937..fc6c367d36a 100644 --- a/ui/css/src/scss/cloudstack3.scss +++ b/ui/css/src/scss/cloudstack3.scss @@ -88,5 +88,3 @@ @import 'components/button-export'; @import 'components/jquery-ui'; @import 'components/token-input-facebook'; - -@import 'custom/custom'; diff --git a/ui/css/src/scss/custom.scss b/ui/css/src/scss/custom.scss new file mode 100644 index 00000000000..021362338d8 --- /dev/null +++ b/ui/css/src/scss/custom.scss @@ -0,0 +1,21 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +* +* +* Use custom.css to override the default CloudStack styles +*/ diff --git a/ui/css/src/scss/custom/custom.scss b/ui/css/src/scss/custom/custom.scss deleted file mode 100644 index 57ccdb3457e..00000000000 --- a/ui/css/src/scss/custom/custom.scss +++ /dev/null @@ -1,21 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -//* Use custom.scss to override the default CloudStack styles -//* Use it as your global @import file for many scss files. -//* Use lines like @import "database.scss"; inside here only. -//* Custom scss is imported on bottom of cloudstack3.scss diff --git a/ui/index.html b/ui/index.html index 1dddbd3cdc8..23fac1b7dd9 100644 --- a/ui/index.html +++ b/ui/index.html @@ -26,6 +26,7 @@ +