Skip to content

Commit 647e3a4

Browse files
alexandrdrvnalexandrdrvn
committed
fix: fix bug
1 parent 658afaa commit 647e3a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+577
-294
lines changed

‎plugin.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ function VFA_vuefront_admin_action_vf_information() {
7575
echo json_encode(
7676
array(
7777
'apache' => strpos( $_SERVER["SERVER_SOFTWARE"], "Apache" ) !== false,
78-
'status' => $status,
78+
'status' => $status,
79+
'server' => $_SERVER['SERVER_SOFTWARE'],
7980
'phpversion' => phpversion(),
8081
'plugin_version' => $plugin_version,
8182
'extensions' => $extensions,

‎view/javascript/assets/scss/customMediaVariables.css‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@
55
@custom-media --desktop (min-width: 1280px);
66
@custom-media --widescreen (min-width: 1920px);
77
@custom-media --desktop-and-laptop (min-width: 960px);
8-
9-
/*# sourceMappingURL=customMediaVariables.css.map */

‎view/javascript/assets/scss/customMediaVariables.css.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎view/javascript/assets/scss/customMediaVariables.scss‎

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

‎view/javascript/assets/scss/main.scss‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
@import "node_modules/bootstrap/scss/close";
3333
// @import "node_modules/bootstrap/scss/toasts";
3434
// @import "node_modules/bootstrap/scss/modal";
35-
// @import "node_modules/bootstrap/scss/tooltip";
36-
// @import "node_modules/bootstrap/scss/popover";
35+
@import "node_modules/bootstrap/scss/tooltip";
36+
@import "node_modules/bootstrap/scss/popover";
3737
// @import "node_modules/bootstrap/scss/carousel";
3838
@import "node_modules/bootstrap/scss/spinners";
3939
@import "node_modules/bootstrap/scss/utilities";
@@ -45,7 +45,7 @@
4545
--border-color: #{$gray-300};
4646
--table-color: #{$body-color};
4747
--table-head-bg: #{$gray-200};
48-
margin-top: 50px;
48+
margin-top: 20px;
4949
color: #1a1a1a;
5050
font-family: 'Open-Sans', sans-serif;
5151
box-sizing: border-box;
@@ -90,6 +90,9 @@
9090
outline: 0;
9191
box-shadow: none;
9292
background-color: transparent;
93+
@media (--phone-and-tablet) {
94+
margin-left: 15px;
95+
}
9396
&:focus, &:active {
9497
border: 0;
9598
outline: 0;

‎view/javascript/components/activity.vue‎

Lines changed: 56 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
id="my-table"
88
class="vf-activity__table"
99
outlined
10+
responsive
1011
:fields="fields"
1112
:items="cms.builds"
1213
:per-page="perPage"
@@ -79,63 +80,65 @@ export default {
7980
.vf-activity {
8081
margin-bottom: 60px;
8182
text-align: left;
82-
&__table.table {
83-
thead {
84-
th {
85-
font-family: 'Open Sans', sans-serif;
86-
font-size: 16px;
87-
font-weight: 600;
88-
font-stretch: normal;
89-
font-style: normal;
90-
line-height: 1.5;
91-
letter-spacing: 0.16px;
92-
text-align: left;
93-
color: $black;
94-
padding: 20px 50px;
95-
background-color: #fbfbfc;
83+
&__table {
84+
.table {
85+
thead {
86+
th {
87+
font-family: 'Open Sans', sans-serif;
88+
font-size: 16px;
89+
font-weight: 600;
90+
font-stretch: normal;
91+
font-style: normal;
92+
line-height: 1.5;
93+
letter-spacing: 0.16px;
94+
text-align: left;
95+
color: $black;
96+
padding: 20px 50px;
97+
background-color: #fbfbfc;
98+
}
9699
}
97-
}
98-
tbody {
99-
td {
100-
position: relative;
101-
> .vf-activity__success_build {
102-
&:after {
103-
position: absolute;
104-
content: '';
105-
display: block;
106-
width: 10px;
107-
height: 10px;
108-
border-radius: 50%;
109-
background-color: $dark-mint;
110-
top: 50%;
111-
transform: translateY(-50%);
112-
left: 25px;
100+
tbody {
101+
td {
102+
position: relative;
103+
> .vf-activity__success_build {
104+
&:after {
105+
position: absolute;
106+
content: '';
107+
display: block;
108+
width: 10px;
109+
height: 10px;
110+
border-radius: 50%;
111+
background-color: $dark-mint;
112+
top: 50%;
113+
transform: translateY(-50%);
114+
left: 25px;
115+
}
113116
}
114-
}
115-
> .vf-activity__failed_build {
116-
&:after {
117-
position: absolute;
118-
content: '';
119-
display: block;
120-
width: 10px;
121-
height: 10px;
122-
border-radius: 50%;
123-
background-color: #e64141;
124-
top: 50%;
125-
transform: translateY(-50%);
126-
left: 25px;
117+
> .vf-activity__failed_build {
118+
&:after {
119+
position: absolute;
120+
content: '';
121+
display: block;
122+
width: 10px;
123+
height: 10px;
124+
border-radius: 50%;
125+
background-color: #e64141;
126+
top: 50%;
127+
transform: translateY(-50%);
128+
left: 25px;
129+
}
127130
}
131+
font-family: 'Open Sans', sans-serif;
132+
font-size: 16px;
133+
font-weight: normal;
134+
font-stretch: normal;
135+
font-style: normal;
136+
line-height: 1.5;
137+
letter-spacing: 0.16px;
138+
text-align: left;
139+
color: $warm-grey-two;
140+
padding: 20px 50px;
128141
}
129-
font-family: 'Open Sans', sans-serif;
130-
font-size: 16px;
131-
font-weight: normal;
132-
font-stretch: normal;
133-
font-style: normal;
134-
line-height: 1.5;
135-
letter-spacing: 0.16px;
136-
text-align: left;
137-
color: $warm-grey-two;
138-
padding: 20px 50px;
139142
}
140143
}
141144
}

‎view/javascript/components/banner.vue‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
border-radius: 3px;
2222
box-shadow: 0 0 30px 0 rgba(0, 0, 0, 0.1);
2323
background-color: white;
24+
@media (--phone-and-tablet) {
25+
margin-bottom: 30px;
26+
}
2427
&__top_image {
2528
max-width: 100%;
2629
height: auto;
@@ -45,6 +48,9 @@
4548
text-align: left;
4649
color: #1a1a1a!important;
4750
margin-bottom: 20px;
51+
@media (--phone-and-tablet) {
52+
padding: 0 40px;
53+
}
4854
}
4955
&__description {
5056
padding: 0 80px;
@@ -57,6 +63,9 @@
5763
letter-spacing: 0.18px;
5864
text-align: left;
5965
color: #7d7d7d;
66+
@media (--phone-and-tablet) {
67+
padding: 0 40px;
68+
}
6069
}
6170
}
6271
</style>

‎view/javascript/components/development.vue‎

Lines changed: 48 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,25 @@
77
<div class="development__wrapper_title">
88
{{ $t('textCmsConnect') }}
99
</div>
10-
<input
11-
type="text"
12-
class="development__cms_connect"
13-
:value="information.cmsConnect"
10+
<b-input-group
11+
class="development__cms_connect_wrapper"
1412
>
13+
<input
14+
type="text"
15+
class="development__cms_connect"
16+
:value="information.cmsConnect"
17+
>
18+
<b-input-group-append>
19+
<b-button
20+
v-clipboard="information.cmsConnect"
21+
v-clipboard:success="clipboardSuccessHandler"
22+
variant="success"
23+
>
24+
{{ copied ? $t('buttonCopied'): $t('buttonCopy') }}
25+
</b-button>
26+
</b-input-group-append>
27+
</b-input-group>
28+
1529
<div class="development__wrapper_text">
1630
{{ $t('descriptionCmsConnect') }}
1731
</div>
@@ -58,10 +72,23 @@ RewriteRule ^([^?]*) vuefront/200.html [L,QSA]</pre>
5872
<script>
5973
import {mapGetters} from 'vuex'
6074
export default {
75+
data() {
76+
return {
77+
copied:false
78+
}
79+
},
6180
computed: {
6281
...mapGetters({
6382
information: 'information/get'
6483
})
84+
},
85+
methods: {
86+
clipboardSuccessHandler() {
87+
this.copied = true
88+
setTimeout(() => {
89+
this.copied = false
90+
}, 2000)
91+
}
6592
}
6693
}
6794
</script>
@@ -71,7 +98,9 @@ export default {
7198
"textCmsConnect": "CMS Connect URL",
7299
"descriptionCmsConnect": "This is your CMS Connect URL link that shares your site data via GraphQL. When installing VueFront via the command line, you will be prompted to enter this URL. Simply copy and paste it into the command line.",
73100
"textConfigureApache": "Configure .htaccess",
74-
"descriptionConfigureApache": "For VueFront Web App to replace your current frontend, you will need to configure your .htaccess. <br>Although we do this automaticly for you, you can still customize it you yourself.<br> <ul> <li>Turn off the VueFront app. Switch the toggle on top of the page to OFF</li> <li>Use your text editor to edit the .htaccess file with the following rules:</li> </ul>"
101+
"descriptionConfigureApache": "For VueFront Web App to replace your current frontend, you will need to configure your .htaccess. <br>Although we do this automaticly for you, you can still customize it you yourself.<br> <ul> <li>Turn off the VueFront app. Switch the toggle on top of the page to OFF</li> <li>Use your text editor to edit the .htaccess file with the following rules:</li> </ul>",
102+
"buttonCopied": "copied",
103+
"buttonCopy": "copy"
75104
}
76105
</i18n>
77106
<style lang="scss">
@@ -89,9 +118,15 @@ export default {
89118
letter-spacing: 0.24px;
90119
text-align: left;
91120
color: $black;
92-
margin-bottom: 20px;
93121
border: none!important;
94-
width: 100%;
122+
flex: 1;
123+
@media (--phone-and-tablet) {
124+
overflow: hidden;
125+
}
126+
&_wrapper {
127+
margin-bottom: 20px;
128+
width: 100%;
129+
}
95130
}
96131
&__wrapper_text {
97132
font-family: 'Open Sans', sans-serif;
@@ -126,6 +161,9 @@ export default {
126161
background-color: $white;
127162
padding: 50px 55px;
128163
margin-bottom: 60px;
164+
@media (--phone-and-tablet) {
165+
padding: 20px 25px;
166+
}
129167
pre {
130168
border-radius: 3px;
131169
background-color: #efeff1;
@@ -152,6 +190,9 @@ export default {
152190
text-align: left;
153191
color: $black;
154192
margin-bottom: 20px;
193+
@media(--phone-and-tablet) {
194+
font-size: 24px;
195+
}
155196
}
156197
}
157198
}

0 commit comments

Comments
 (0)