xevion/the-office
1
0
Fork 0
mirror of https://github.com/Xevion/the-office.git synced 2025-12-15 12:13:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed laptop vs desktop layouts, fixed main.scss not being used (contained Bootstrap breakpoint adjustments), fix API URL being wrong for public network deployments (possible automatic detection?)

Browse Source
This commit is contained in:
Xevion
2020-09-09 10:23:01 -05:00
parent 6240b72649
commit 6b37ba5114
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/.env.development
View File

@@ -1,2 +1,2 @@
VUE_APP_API_URL=http://192.168.2.35:5000 VUE_APP_API_URL=http://localhost:5000
VUE_APP_BASE_URL=http://192.168.2.35:8080 VUE_APP_BASE_URL=http://192.168.2.35:8080

12
client/src/App.vue
View File

@@ -27,8 +27,8 @@
:insights-client="insightsClient" :insights-client="insightsClient"
> >
<b-container :fluid="true" class="py-2 px-lg-5 px-md-4"> <b-container :fluid="true" class="py-2 px-lg-5 px-md-4">
<b-row class="my-3 pl-1"> <b-row class="my-3 pl-1" cols="12">
<b-col lg="3" xl="2" md="12"> <b-col lg="3" xl="3" md="12">
<ais-search-box <ais-search-box
@keydown.native="showResults" @keydown.native="showResults"
ref="searchbox" ref="searchbox"
@@ -36,11 +36,11 @@
/> />
</b-col> </b-col>
</b-row> </b-row>
<b-row> <b-row align-h="start" cols="12">
<b-col lg="3" xl="2" md="12"> <b-col lg="3" xl="3" md="12">
<SeasonList></SeasonList> <SeasonList></SeasonList>
</b-col> </b-col>
<b-col class="pt-md-2 pt-lg-0"> <b-col lg="8" xl="7" md="12" class="pt-md-2 pt-lg-0">
<router-view/> <router-view/>
</b-col> </b-col>
<b-col md="0" lg="0" xl="2"></b-col> <b-col md="0" lg="0" xl="2"></b-col>
@@ -52,7 +52,6 @@
</template> </template>
<style lang="scss"> <style lang="scss">
@import "assets/scss/_variables";
@import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@400;600;700&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@400;600;700&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Poppins:wght@500&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Poppins:wght@500&display=swap");
@@ -103,6 +102,7 @@ body {
import algoliasearch from "algoliasearch/lite"; import algoliasearch from "algoliasearch/lite";
import SeasonList from "./components/SeasonList.vue"; import SeasonList from "./components/SeasonList.vue";
import "instantsearch.css/themes/algolia-min.css"; import "instantsearch.css/themes/algolia-min.css";
import './scss/main.scss';
export default { export default {
name: "App", name: "App",