src/app/layout/layout.component.scss
@@ -10,7 +10,7 @@ .load{ position: fixed; top: 50%; left: 50%; left: 0 !important; transform: translateY(-50%); span{ font-size: 66px; src/app/routes/authority-manager/operation-log/operation-log.component.html
@@ -49,7 +49,12 @@ <div class="panel panel-default opreation-log-container"> <div class="panel-body"> <!-- table start --> <div class="load" [hidden]="!Loading"><span><i class="fa fa-spinner fa-spin" ></i></span></div> <div class="load" [hidden]="!Loading"> <span> <i class="fa fa-spinner fa-spin" > </i> </span> </div> <table class="table table-striped table-list" [hidden]="Loading"> <!-- <table class="table table-striped table-bordered table-list" [mfRowsOnPage]="10"> --> <thead> src/app/routes/data-setting/choice-datasetset/choice-datasetset.component.html
@@ -1,16 +1,16 @@ <div class="modal-dialog"> <div class="modal-content"> <div class="load" [hidden]="!Loading"> <span> <i class="fa fa-spinner fa-spin"></i> </span> </div> <div class="modal-header"> <button type="button" class="close" (click)="close()">×</button> <h4 class="modal-title" style="color:white;">新建</h4> </div> <div class="modal-body"> <div class="data-set-right-inp" style="position: relative;"> <div class="load" [hidden]="!Loading"> <span> <i class="fa fa-spinner fa-spin"></i> </span> </div> <div class="data-set-left-sel" style="position: relative;"> <!-- {{database.database | translate}}: --> <!--<select class="form-control" [(ngModel)]="datasourceId" (ngModelChange)="datasource=$event;selectedSource()">--> src/app/routes/data-setting/data-set/data-set.component.html
@@ -5,11 +5,6 @@ <i class="fa fa-spinner fa-spin"></i> </span> </div> <div class="load" [hidden]="!rightLoading"> <span> <i class="fa fa-spinner fa-spin"></i> </span> </div> <app-data-set-add *ngIf="showadd" [(editdata)]="editdata" (showadd)="getTurnOffAdd($event)"></app-data-set-add> <div class="data-set-container" *ngIf="!showadd"> <div class=""> src/app/routes/data-setting/data-set/data-set.component.scss
@@ -96,8 +96,8 @@ } .load{ position: fixed; top: 50%; left: 50%; top: 0%; left: 0%; span{ font-size: 66px; color: #2faed4; src/app/routes/data-setting/data-source/add-source/upload-csv/upload-csv.component.html
@@ -17,7 +17,7 @@ <td class="col-md-2"><em class="red">*</em>{{labelInfo.selectFile | translate}}</td> <td> <label for="file1" class="file-upload"> <button class="btn btn-primary">{{labelInfo.selectFile | translate}}</button> <button class="mol_but but_hover">{{labelInfo.selectFile | translate}}</button> <input type="file" ng2FileSelect [uploader]="uploader" (change)="selectedFileOnChanged($event,1)" name="file" accept=".csv"> </label> </td> @@ -31,8 +31,8 @@ <!-- end --> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> --> <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> </div> </div> </div> src/app/routes/data-setting/data-source/add-source/upload-excel/upload-excel.component.html
@@ -17,7 +17,7 @@ <td class="col-md-2"><em class="red">*</em>{{labelInfo.selectFile | translate}}</td> <td> <label for="file1" class="file-upload"> <button class="btn btn-primary">{{labelInfo.selectFile | translate}}</button> <button class="mol_but but_hover">{{labelInfo.selectFile | translate}}</button> <input type="file" ng2FileSelect [uploader]="uploader" (change)="selectedFileOnChanged($event,1)" name="file" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel,.xls"> </label> </td> @@ -31,8 +31,8 @@ <!-- end --> </div> <div class="modal-footer"> <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> <button type="button" class="btn btn-primary" (click)="confirm()" [disabled]="disablestate">{{singleButton.confirmButton | translate}}</button> <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> --> <button type="button" class="mol_but but_hover" (click)="confirm()" [disabled]="disablestate">{{singleButton.confirmButton | translate}}</button> </div> </div> </div> src/app/routes/data-setting/data-source/add-source/upload-mysql/upload-mysql.component.html
@@ -61,9 +61,9 @@ <!-- end --> </div> <div class="modal-footer"> <button type="button" class="btn btn-default pull-left" (click)="istest()">{{singleButton.testButton | translate}}</button> <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> <button type="button" class="mol_but but_hover pull-left" (click)="istest()">{{singleButton.testButton | translate}}</button> <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> --> <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> </div> </div> </div> src/app/routes/data-setting/data-source/add-source/upload-oracle/upload-oracle.component.html
@@ -35,9 +35,9 @@ <!-- end --> </div> <div class="modal-footer"> <button type="button" class="btn btn-default pull-left" (click)="istest()">{{singleButton.testButton | translate}}</button> <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> <button type="button" class="mol_but but_hover pull-left" (click)="istest()">{{singleButton.testButton | translate}}</button> <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> --> <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> </div> </div> </div> src/app/routes/data-setting/data-source/add-source/upload-sqlserver/upload-sqlserver.component.html
@@ -35,9 +35,9 @@ <!-- end --> </div> <div class="modal-footer"> <button type="button" class="btn btn-default pull-left" (click)="istest()">{{singleButton.testButton | translate}}</button> <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> <button type="button" class="mol_but but_hover pull-left" (click)="istest()">{{singleButton.testButton | translate}}</button> <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> --> <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button> </div> </div> </div> src/app/routes/data-setting/data-source/data-source.component.scss
@@ -65,8 +65,8 @@ .load{ position: fixed; top: 50%; left: 50%; top: 0%; left: 0%; span{ font-size: 66px; color: #2faed4; src/app/shared/styles/app/variables.scss
@@ -7,6 +7,12 @@ // //## Gray and brand colors for use across Bootstrap. $free-button-color: #2faed4; $pagination-color: #178a8b; $sweet-color: #13686a; $but-block-color: #157677; // Redefined Gray colors for theme $gray-darker: #232735; $gray-dark: #3a3f51; src/assets/i18n/zh.json
@@ -101,9 +101,9 @@ "ACTION": "操作" }, "button": { "CREATE_SET": "创建数据集", "DETAIL": "字段详情", "PREVIEW_DATA": "预览数据", "CREATE_SET": "数据集", "DETAIL": "详情", "PREVIEW_DATA": "数据", "DELETE": "删除" } }, src/styles.scss
@@ -21,7 +21,7 @@ .modal-header{ position: relative; width: 100.1%; background-color: #178a8b !important; background-color: $free-button-color !important; padding: 3px; button{ font-size: 40px; @@ -59,7 +59,7 @@ } .input_bg{ height: 35px; color: #178a8b !important; color: $free-button-color !important; background-color: #e9eaeb !important; border: none !important; button{ @@ -295,7 +295,7 @@ color: #333 !important; } .icon-white{ color: #178a8b !important; color: $free-button-color !important; &:hover{ color: white !important; } @@ -372,19 +372,19 @@ } .but_free{ background: white; border: 1px solid #178a8b; border: 1px solid $free-button-color; border-radius: 3px; height: 38px; padding-left: 12px; padding-right: 12px; // padding-left: 12px; // padding-right: 12px; line-height: 38px; color:#178a8b; color:$free-button-color; transition: 0.2s; white-space: nowrap; } .but_block{ background: #178a8b; border: 1px solid #178a8b; background: $free-button-color; border: 1px solid $free-button-color; border-radius: 3px; height: 35px; padding-left: 18px; @@ -396,37 +396,37 @@ } .but_strip_hover:hover{ background: #ffffff; color: #178a8b; color: $free-button-color; } .but_block_hover:hover{ background: #157677; border: 1px solid #157677; background: $but-block-color; border: 1px solid $but-block-color; } .mol_but{ background: white; border: 1px solid #178a8b; border: 1px solid $free-button-color; border-radius: 3px; height: 35px; padding-left: 15px; padding-right: 15px; line-height: 35px; color:#178a8b; color:$free-button-color; transition: 0.2s; white-space: nowrap; } .mol_but_sm{ background: white; border: 1px solid #178a8b !important; border: 1px solid $free-button-color !important; border-radius: 3px; height: 32px; padding-left: 8px; padding-right: 8px; line-height: 30px; color:#178a8b !important; color:$free-button-color !important; transition: 0.2s; } .but_hover:hover{ background: #178a8b; background: $free-button-color; color:white !important; } .but_red_hover:hover{ @@ -435,10 +435,10 @@ } .fa-size{ padding-top: 10px; color: #178a8b; color: $free-button-color; } .pagin-style{ color: #178a8b !important; color: $free-button-color !important; } .pagination a{ transition: 0.3s; @@ -450,54 +450,58 @@ margin-right: 10px !important; padding: 0 !important; line-height: 27px !important; border: 1px solid #178a8b !important; border: 1px solid $free-button-color !important; } .pagination > .active > a{ font-size: 14px !important; color: white !important; background: #178a8b !important; border: 1px solid #178a8b !important; background: $free-button-color !important; border: 1px solid $free-button-color !important; } .pagination > .active > a:hover{ color: white !important; background: #178a8b !important; border: 1px solid #178a8b !important; background: $free-button-color !important; border: 1px solid $free-button-color !important; } .pagination > .pagination-page > a{ font-size: 14px !important; } .pagination > .pagination-page > a:hover{ color: white !important; background: #178a8b !important; border: 1px solid #178a8b !important; background: $free-button-color !important; border: 1px solid $free-button-color !important; } .sweet-alert button{ background: #178a8b !important; border: 1px solid #178a8b !important; background: $free-button-color !important; border: 1px solid $free-button-color !important; border-radius: 3px !important; color:#ffffff !important; transition: 0.2s !important; } .sweet-alert button:hover{ background: #13686a !important; background: $sweet-color !important; color:#ffffff !important; border: 1px solid #13686a !important; border: 1px solid $sweet-color !important; } .green_color{ color: #178a8b !important; color: $free-button-color !important; font-weight: 500; } .green_color:hover{ color: #178a8b !important; color: $free-button-color !important; font-weight: 500; } .load{ width: 100%; height: 100%; position: fixed; top: 50%; left: 50%; z-index: 999; background: rgba(51, 51, 51, 0.166); span{ position: fixed; left: 50%; top: 50%; font-size: 66px; color: #2faed4; color: $free-button-color; } }
