summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrakiss <grakiss.wanglei@huawei.com>2017-11-10 10:11:18 +0000
committerLeo wang <grakiss.wanglei@huawei.com>2017-11-15 04:22:33 +0000
commitadedf4e0a6e405ead72f004047c9c06cb7f90496 (patch)
tree548d6aee8a8ea1e467220bbd5295645083f465b2
parent47d4daaa3df5c11462d698ff50c4dd2fe086d8d7 (diff)
Remove style.css for License issue
style.css is GPL 3.0 License based, we need to remove it. The origin css file is as bellow: https://www.opnfv.org/wp-content/themes/salient/style.css?ver=4.8.3 So I remove style.css, and write a new css file to replace it. Change-Id: I78a572f74c71081052767622903b371e22e158a4 Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
-rw-r--r--cvp/3rd_party/static/testapi-ui/assets/css/cvp-style.css82
-rw-r--r--cvp/3rd_party/static/testapi-ui/assets/css/style.css162
-rw-r--r--cvp/3rd_party/static/testapi-ui/components/application/application.html2
-rw-r--r--cvp/3rd_party/static/testapi-ui/components/results/results.html8
-rw-r--r--cvp/3rd_party/static/testapi-ui/index.html2
5 files changed, 88 insertions, 168 deletions
diff --git a/cvp/3rd_party/static/testapi-ui/assets/css/cvp-style.css b/cvp/3rd_party/static/testapi-ui/assets/css/cvp-style.css
new file mode 100644
index 00000000..1c4b048e
--- /dev/null
+++ b/cvp/3rd_party/static/testapi-ui/assets/css/cvp-style.css
@@ -0,0 +1,82 @@
+.nav>li>a {
+ font-size: 18px;
+}
+
+table {
+ font-size: 15px;
+}
+
+th {
+ font-size: 16px;
+}
+
+.dropdown-menu {
+ padding: 0px;
+}
+
+.dropdown-menu>li>a, .dropdown-menu>li>span {
+ display: block;
+ padding: 3px 20px;
+ clear: both;
+ font-weight: 400;
+ line-height: 1.42857143;
+ white-space: nowrap;
+ background-color: #1C1C1C;
+ color: #ccc;
+}
+
+.dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
+ font-size: 15px;
+ color: #27CFC3;
+ text-decoration: none;
+ background-color: #1C1C1C;
+}
+
+.pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover, .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover {
+ color: #fff;
+ background-color: #27CFC3;
+ border-color: #27CFC3;
+}
+
+
+.dropdown-menu {
+ border: 0px solid #ccc;
+}
+
+.dropdown-menu>li>span>i {
+ cursor: pointer;
+}
+
+.heading .logo {
+ display: inline-block;
+ padding-bottom: 30px;
+}
+
+.heading .slogan {
+ display: inline-block;
+ margin-left: 20px;
+}
+
+.badge-info {
+ color: #fff;
+ background-color: #27CFC3;
+ border-color: #27CFC3;
+}
+
+.opnfv-blue {
+ color: #27CFC3;
+}
+
+.field {
+ margin-bottom: 10px;
+}
+
+table .btn.medium {
+ padding: 0px 15px;
+}
+
+.cvp-btn {
+ background-color: #27CFC3;
+ font-weight: 700;
+ font-size: 12px;
+}
diff --git a/cvp/3rd_party/static/testapi-ui/assets/css/style.css b/cvp/3rd_party/static/testapi-ui/assets/css/style.css
deleted file mode 100644
index 44f14e07..00000000
--- a/cvp/3rd_party/static/testapi-ui/assets/css/style.css
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- Theme Name: Salient
- Theme URI: http://www.themenectar.com
- Author: ThemeNectar
- Author URI: http://themenectar.com
- Description: An Ultra Responsive Multi-Purpose Theme.
- Version: 8.1.0
- License: GNU General Public License version 3.0
- License URI: http://www.gnu.org/licenses/gpl-3.0.html
-
--------------------------------------------------------------------------
-
- 1. Browser Reset + Font Face
- 2. Globally Applied Styles
- 3. Header + Search Bar Styles
- 4. Plugin Related Styles
- 5. Page + Custom Page Layout Styles
- 6. Nectar Shortcode Styles
- 7. Footer Styles
- 8. Sidebar Styles
- 9. Blog + Pagination Styles
- 10. Comment Styles
- 11. General Form Styles
-
--------------------------------------------------------------------------*/
-
-/*-------------------------------------------------------------------------*/
-/* 1. Browser Reset + Font Face
-/*-------------------------------------------------------------------------*/
-
-@import url('https://fonts.googleapis.com/css?family=Open+Sans');
-
-.nectar-button span {
- left: 0px;
- display: inline-block;
- -webkit-transform: translateX(0);
- transform: translateX(0);
- transition: opacity .45s cubic-bezier(0.25,1,0.33,1),transform .45s cubic-bezier(0.25,1,0.33,1);
- -webkit-transition: opacity .45s cubic-bezier(0.25,1,0.33,1),-webkit-transform .45s cubic-bezier(0.25,1,0.33,1);
- position: relative;
-}
-
-.nectar-button.medium {
- border-radius: 3px 3px 3px 3px;
- padding: 10px 15px;
- font-size: 12px;
- letter-spacing: 2px;
- color: #FFF;
- box-shadow: 0 -2px rgba(0,0,0,0.1) inset;
- -moz-box-shadow: 0 -2px rgba(0,0,0,0.1) inset;
- -webkit-box-shadow: 0 -2px rgba(0,0,0,0.1) inset;
- -o-box-shadow: 0 -2px rgba(0,0,0,0.1) inset;
-}
-.nectar-button {
- border-radius: 5px 5px 5px 5px;
- -moz-border-radius: 5px 5px 5px 5px;
- -webkit-border-radius: 5px 5px 5px 5px;
- -o-border-radius: 5px 5px 5px 5px;
- box-shadow: 0 -3px rgba(0,0,0,0.1) inset;
- -moz-box-shadow: 0 -3px rgba(0,0,0,0.1) inset;
- -webkit-box-shadow: 0 -3px rgba(0,0,0,0.1) inset;
- -o-box-shadow: 0 -3px rgba(0,0,0,0.1) inset;
- transition: opacity .45s cubic-bezier(0.25,1,0.33,1);
- -moz-transition: opacity .45s cubic-bezier(0.25,1,0.33,1);
- -webkit-transition: opacity .45s cubic-bezier(0.25,1,0.33,1);
- -o-transition: opacity .45s cubic-bezier(0.25,1,0.33,1);
- color: #FFF;
- font-family: 'Open Sans';
- font-weight: 700;
- font-size: 12px;
- letter-spacing: 2px;
- padding: 13px 18px;
- position: relative;
- text-transform: uppercase;
- top: -3px;
- margin-bottom: 10px;
- opacity: 1;
- line-height: 20px;
- background-color: #27CFC3;
- display: inline-block;
-}
-
-.nav>li>a {
- font-size: 18px;
-}
-
-table {
- font-size: 15px;
-}
-
-th {
- font-size: 16px;
-}
-
-.dropdown-menu {
- padding: 0px;
-}
-
-.dropdown-menu>li>a, .dropdown-menu>li>span {
- display: block;
- padding: 3px 20px;
- clear: both;
- font-weight: 400;
- line-height: 1.42857143;
- white-space: nowrap;
- background-color: #1C1C1C;
- color: #ccc;
-}
-
-.dropdown-menu>li>a:focus, .dropdown-menu>li>a:hover {
- font-size: 15px;
- color: #27CFC3;
- text-decoration: none;
- background-color: #1C1C1C;
-}
-
-.nectar-button, a {
- cursor: pointer!important;
-}
-
-.pagination>.active>a, .pagination>.active>a:focus, .pagination>.active>a:hover, .pagination>.active>span, .pagination>.active>span:focus, .pagination>.active>span:hover {
- color: #fff;
- background-color: #27CFC3;
- border-color: #27CFC3;
-}
-
-table .nectar-button.medium {
- padding: 0px 15px;
-}
-
-
-.dropdown-menu {
- border: 0px solid #ccc;
-}
-
-.dropdown-menu>li>span>i {
- cursor: pointer;
-}
-
-.heading .logo {
- display: inline-block;
- padding-bottom: 30px;
-}
-
-.heading .slogan {
- display: inline-block;
- margin-left: 20px;
-}
-
-.badge-info {
- color: #fff;
- background-color: #27CFC3;
- border-color: #27CFC3;
-}
-
-.opnfv-blue {
- color: #27CFC3;
-}
-
-.field {
- margin-bottom: 10px;
-}
diff --git a/cvp/3rd_party/static/testapi-ui/components/application/application.html b/cvp/3rd_party/static/testapi-ui/components/application/application.html
index f82aedda..acf8ea3e 100644
--- a/cvp/3rd_party/static/testapi-ui/components/application/application.html
+++ b/cvp/3rd_party/static/testapi-ui/components/application/application.html
@@ -159,7 +159,7 @@ urpose. Once we understand more about your product or service, we can determine
</div>
</div>
<div class="Actions">
- <a class="nectar-button medium accent-color regular-button" ng-click="ctrl.openConfirmModal()" />submit</a>
+ <a class="btn btn-success cvp-btn medium accent-color regular-button" ng-click="ctrl.openConfirmModal()" />submit</a>
</div>
<div class="results-table" style="margin-top:30px;overflow:scroll">
<table class="table table-striped table-hover">
diff --git a/cvp/3rd_party/static/testapi-ui/components/results/results.html b/cvp/3rd_party/static/testapi-ui/components/results/results.html
index 5cdc6240..a28584c6 100644
--- a/cvp/3rd_party/static/testapi-ui/components/results/results.html
+++ b/cvp/3rd_party/static/testapi-ui/components/results/results.html
@@ -3,10 +3,10 @@
<form class="form-inline" ng-show="ctrl.isUserResults">
<h4>Upload Results<i class="glyphicon glyphicon-question-sign opnfv-blue" uib-tooltip="results file is logs.xxx.tar.gz under your dovetail installation path"></i></h4>
<div class="form-group col-m-3">
- <input class="form-contrl nectar-button medium accent-color regular-button" type = "file" file-model = "resultFile"/>
+ <input class="form-contrl btn btn-success cvp-btn medium accent-color regular-button" type = "file" file-model = "resultFile"/>
</div>
<div class="form-group col-m-3">
- <a class="nectar-button medium accent-color regular-button" ng-click="ctrl.uploadFile()"><span>upload result</span></a>
+ <a class="btn btn-success cvp-btn medium accent-color regular-button" ng-click="ctrl.uploadFile()"><span>upload result</span></a>
</div>
<div>
<lable>{{ctrl.uploadState}}</label>
@@ -44,7 +44,7 @@
<td><a ng-click="ctrl.gotoSUT(result.id)">info</a></td>
<td>
<div class="btn-group" uib-dropdown>
- <a id="single-button" type="button" class="nectar-button medium accent-color regular-button" uib-dropdown-toggle>
+ <a id="single-button" type="button" class="btn btn-success cvp-btn medium accent-color regular-button" uib-dropdown-toggle>
Operation<span class="caret"></span>
</a>
<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
@@ -61,7 +61,7 @@
</td>
<td>
<div class="btn-group" uib-dropdown>
- <a id="single-button" type="button" class="nectar-button medium accent-color regular-button" style="width:130px" uib-dropdown-toggle>
+ <a id="single-button" type="button" class="btn btn-success cvp-btn medium accent-color regular-button" style="width:130px" uib-dropdown-toggle>
Share List<span class="caret"></span>
</a>
<ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button" style="min-width:200%">
diff --git a/cvp/3rd_party/static/testapi-ui/index.html b/cvp/3rd_party/static/testapi-ui/index.html
index 8ca6e631..ffe01f13 100644
--- a/cvp/3rd_party/static/testapi-ui/index.html
+++ b/cvp/3rd_party/static/testapi-ui/index.html
@@ -29,7 +29,7 @@
<link rel="stylesheet" href="testapi-ui/assets/lib/ng-dialog/ngDialog.min.css" />
<link rel="stylesheet" href="testapi-ui/assets/lib/ng-dialog/ngDialog-theme-default.min.css" />
<link rel="stylesheet" href="testapi-ui/assets/lib/angular-xeditable-0.8.0/css/xeditable.min.css" />
- <link rel="stylesheet" href="testapi-ui/assets/css/style.css" />
+ <link rel="stylesheet" href="testapi-ui/assets/css/cvp-style.css" />
<link rel="stylesheet" href="testapi-ui/assets/css/ascend.css" />
<script src="testapi-ui/assets/lib/angular/angular.min.js"></script>