Skip to content

Commit 044e4e4

Browse files
pbankonieryadvr
pbankonier
authored and
yadvr
committed
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.
1 parent 4ce0562 commit 044e4e4

5 files changed

Lines changed: 45 additions & 23 deletions

File tree

‎ui/css/custom.css‎

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ui/css/src/scss/cloudstack3.scss‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,3 @@
8888
@import 'components/button-export';
8989
@import 'components/jquery-ui';
9090
@import 'components/token-input-facebook';
91-
92-
@import 'custom/custom';

‎ui/css/src/scss/custom.scss‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*
19+
*
20+
* Use custom.css to override the default CloudStack styles
21+
*/

‎ui/css/src/scss/custom/custom.scss‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎ui/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<link type="text/css" rel="stylesheet" href="lib/jquery-ui/css/jquery-ui.css" />
2727
<link type="text/css" rel="stylesheet" href="lib/reset.css"/>
2828
<link type="text/css" rel="stylesheet" href="css/cloudstack3.css" />
29+
<link type="text/css" rel="stylesheet" href="css/custom.css" />
2930
</head>
3031
<body>
3132
<!-- CloudStack widget content -->

0 commit comments

Comments
 (0)