You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by GitBox <gi...@apache.org> on 2018/11/07 12:06:19 UTC
[GitHub] majinkai closed pull request #178: Unify the window button style
majinkai closed pull request #178: Unify the window button style
URL: https://github.com/apache/incubator-dubbo-ops/pull/178
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/dubbo-admin-frontend/src/components/governance/AccessControl.vue b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
index c9c8c59..8284639 100644
--- a/dubbo-admin-frontend/src/components/governance/AccessControl.vue
+++ b/dubbo-admin-frontend/src/components/governance/AccessControl.vue
@@ -99,8 +99,8 @@
<v-btn color="darken-1"
flat
@click="closeModal()">Close</v-btn>
- <v-btn color="green darken-1"
- flat
+ <v-btn color="primary"
+ depressed
@click="modal.click">{{ modal.saveBtn }}</v-btn>
</v-card-actions>
</v-card>
@@ -114,11 +114,11 @@
<v-card-text>{{this.confirm.text}}</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="red darken-1"
+ <v-btn color="darken-1"
flat
@click="confirm.enable = false">Disagree</v-btn>
- <v-btn color="green darken-1"
- flat
+ <v-btn color="primary"
+ depressed
@click="deleteItem(confirm.id)">Agree</v-btn>
</v-card-actions>
</v-card>
diff --git a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
index 143d6f6..a9fc1ea 100644
--- a/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
+++ b/dubbo-admin-frontend/src/components/governance/LoadBalance.vue
@@ -74,8 +74,8 @@
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="blue darken-1" flat @click.native="closeDialog">Close</v-btn>
- <v-btn color="blue darken-1" flat @click.native="saveItem">Save</v-btn>
+ <v-btn color="darken-1" flat @click.native="closeDialog">Close</v-btn>
+ <v-btn color="primary darken-1" depressed @click.native="saveItem">Save</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
@@ -86,8 +86,8 @@
<v-card-text >{{this.warnText}}</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="green darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
- <v-btn color="green darken-1" flat @click.native="deleteItem(warnStatus.id)">CONFIRM</v-btn>
+ <v-btn color="darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
+ <v-btn color="primary darken-1" depressed @click.native="deleteItem(warnStatus.id)">CONFIRM</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
diff --git a/dubbo-admin-frontend/src/components/governance/Overrides.vue b/dubbo-admin-frontend/src/components/governance/Overrides.vue
index b6071ef..94cb8ac 100644
--- a/dubbo-admin-frontend/src/components/governance/Overrides.vue
+++ b/dubbo-admin-frontend/src/components/governance/Overrides.vue
@@ -72,8 +72,8 @@
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="blue darken-1" flat @click.native="closeDialog">Close</v-btn>
- <v-btn color="blue darken-1" flat @click.native="saveItem">Save</v-btn>
+ <v-btn color="darken-1" flat @click.native="closeDialog">Close</v-btn>
+ <v-btn color="primary darken-1" depressed @click.native="saveItem">Save</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
@@ -84,8 +84,8 @@
<v-card-text >{{this.warnText}}</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="green darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
- <v-btn color="green darken-1" flat @click.native="deleteItem(warnStatus)">CONFIRM</v-btn>
+ <v-btn color="darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
+ <v-btn color="primary darken-1" depressed @click.native="deleteItem(warnStatus)">CONFIRM</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
diff --git a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
index 7907d39..51e322d 100644
--- a/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
+++ b/dubbo-admin-frontend/src/components/governance/RoutingRule.vue
@@ -81,8 +81,8 @@
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="blue darken-1" flat @click.native="closeDialog">Close</v-btn>
- <v-btn color="blue darken-1" flat @click.native="saveItem">Save</v-btn>
+ <v-btn flat @click.native="closeDialog">Close</v-btn>
+ <v-btn depressed color="primary" @click.native="saveItem">Save</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
@@ -93,8 +93,8 @@
<v-card-text >{{this.warnText}}</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="green darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
- <v-btn color="green darken-1" flat @click.native="deleteItem(warnStatus)">CONFIRM</v-btn>
+ <v-btn flat @click.native="closeWarn">CANCLE</v-btn>
+ <v-btn depressed color="primary" @click.native="deleteItem(warnStatus)">CONFIRM</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
diff --git a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
index d914991..33e3ce5 100644
--- a/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
+++ b/dubbo-admin-frontend/src/components/governance/WeightAdjust.vue
@@ -75,8 +75,8 @@
</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="blue darken-1" flat @click.native="closeDialog">Close</v-btn>
- <v-btn color="blue darken-1" flat @click.native="saveItem">Save</v-btn>
+ <v-btn color="darken-1" flat @click.native="closeDialog">Close</v-btn>
+ <v-btn color="primary darken-1" depressed @click.native="saveItem">Save</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
@@ -87,8 +87,8 @@
<v-card-text >{{this.warnText}}</v-card-text>
<v-card-actions>
<v-spacer></v-spacer>
- <v-btn color="green darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
- <v-btn color="green darken-1" flat @click.native="deleteItem(warnStatus)">CONFIRM</v-btn>
+ <v-btn color="darken-1" flat @click.native="closeWarn">CANCLE</v-btn>
+ <v-btn color="primary darken-1" depressed @click.native="deleteItem(warnStatus)">CONFIRM</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org