From d992d7aa54cab8025eb515cf167e8893c091a764 Mon Sep 17 00:00:00 2001 From: Lazar Date: Sat, 16 Nov 2019 17:50:14 +0100 Subject: [PATCH 1/5] refactor: change style of searchbar component --- client/src/assets/css/transition.css | 4 +- client/src/components/SearchForm.vue | 99 +++++++++++++++------------- 2 files changed, 54 insertions(+), 49 deletions(-) diff --git a/client/src/assets/css/transition.css b/client/src/assets/css/transition.css index 08ada3c..4f2f175 100644 --- a/client/src/assets/css/transition.css +++ b/client/src/assets/css/transition.css @@ -27,8 +27,8 @@ transition-timing-function: cubic-bezier(.55, .085, .68, .53); } -.scale-70 { - transform: scale(.7); +.scale-90 { + transform: scale(.9); } .scale-100 { diff --git a/client/src/components/SearchForm.vue b/client/src/components/SearchForm.vue index e48137a..f4aaceb 100644 --- a/client/src/components/SearchForm.vue +++ b/client/src/components/SearchForm.vue @@ -5,18 +5,18 @@ -
+
{{ selectedRegion }} @@ -29,21 +29,22 @@
-
- - + + + + +
@@ -110,32 +110,31 @@ export default { computed: { btnClasses() { return { - 'w-12': this.size === 'small', - 'w-20': this.size === 'xl' - } - }, - elementClasses() { - return { - 'border-2': this.size === 'small', - 'border-4': this.size === 'xl' + 'w-8 mr-3': this.size === 'small', + 'w-12': this.size === 'xl' } }, formClasses() { return { - 'max-w-lg': this.size === 'small', + 'max-w-md': this.size === 'small', } }, inputClasses() { return { - 'py-2': this.size === 'small', - 'py-4': this.size === 'xl' + 'py-2 px-1': this.size === 'small', + 'py-4 px-2': this.size === 'xl' + } + }, + dropdownClasses() { + return { + 'offsetDropDown': this.size === 'small', + 'offsetDropDownXl': this.size === 'xl' } } }, methods: { classRegions(index) { return { - 'rounded-t': index === 0, 'rounded-b': index === this.regions.length - 1 } }, @@ -151,22 +150,28 @@ export default { From 548d2d1a5adb29a4c2c613036c031922b2f54f22 Mon Sep 17 00:00:00 2001 From: Lazar Date: Sat, 16 Nov 2019 18:26:37 +0100 Subject: [PATCH 2/5] refactor: change style of recent activity component --- client/src/components/SVGContainer.vue | 1 + .../components/Summoner/RecentActivity.vue | 80 +++++++++++-------- 2 files changed, 46 insertions(+), 35 deletions(-) diff --git a/client/src/components/SVGContainer.vue b/client/src/components/SVGContainer.vue index ff8332f..73406fc 100644 --- a/client/src/components/SVGContainer.vue +++ b/client/src/components/SVGContainer.vue @@ -6,5 +6,6 @@ gold rank-silver + diff --git a/client/src/components/Summoner/RecentActivity.vue b/client/src/components/Summoner/RecentActivity.vue index 07a4c22..bdabed0 100644 --- a/client/src/components/Summoner/RecentActivity.vue +++ b/client/src/components/Summoner/RecentActivity.vue @@ -1,43 +1,53 @@