diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 32e8cb3b..d5d370c9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,24 @@
# https://hub.docker.com/r/library/node/tags/
image: node:6
+before_script:
+ # Install ssh-agent if not already installed, it is required by Docker.
+ # (change apt-get to yum if you use a CentOS-based image)
+ - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+
+ # Run ssh-agent (inside the build environment)
+ - eval $(ssh-agent -s)
+
+ # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+ - ssh-add <(echo "$SSH_PRIVATE_KEY")
+
+ # For Docker builds disable host key checking. Be aware that by adding that
+ # you are suspectible to man-in-the-middle attacks.
+ # WARNING: Use this only with the Docker executor, if you use it with shell
+ # you will overwrite your user's SSH config.
+ - mkdir -p ~/.ssh
+ - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
# This folder is cached between builds
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
cache:
@@ -21,3 +39,12 @@ build:
artifacts:
paths:
- dist/
+
+deploy:
+ environment: dev
+ only:
+ - develop
+ script:
+ - npm install
+ - npm run build
+ - scp -r dist/* pleromaci@heldscal.la:~/pleroma
diff --git a/index.html b/index.html
index 30156774..52216b15 100644
--- a/index.html
+++ b/index.html
@@ -2,10 +2,10 @@
+
Pleroma
-
diff --git a/src/App.js b/src/App.js
index 93f8f361..14a41af0 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,16 +1,26 @@
import UserPanel from './components/user_panel/user_panel.vue'
import NavPanel from './components/nav_panel/nav_panel.vue'
import Notifications from './components/notifications/notifications.vue'
+import StyleSwitcher from './components/style_switcher/style_switcher.vue'
export default {
name: 'app',
components: {
UserPanel,
NavPanel,
- Notifications
+ Notifications,
+ StyleSwitcher
},
+ data: () => ({
+ mobileActivePanel: 'timeline'
+ }),
computed: {
currentUser () { return this.$store.state.users.currentUser },
style () { return { 'background-image': `url(${this.currentUser.background_image})` } }
+ },
+ methods: {
+ activatePanel (panelName) {
+ this.mobileActivePanel = panelName
+ }
}
}
diff --git a/src/App.scss b/src/App.scss
index 377c6297..c820779a 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -58,11 +58,12 @@ nav {
position: fixed;
height: 50px;
-}
-
-.sidebar {
- flex: 1;
- flex-basis: 300px;
+ .inner-nav {
+ display: flex;
+ align-items: center;
+ flex-basis: 920px;
+ margin: auto;
+ }
}
main-router {
@@ -111,10 +112,9 @@ main-router {
#content {
margin: auto;
max-width: 920px;
-}
-
-.media-left {
- width: 10% !important;
+ border-radius: 1em;
+ padding-bottom: 1em;
+ background-color: rgba(0,0,0,0.1);
}
.media-body {
@@ -225,3 +225,34 @@ nav {
flex: 2;
flex-basis: 500px;
}
+
+.sidebar {
+ flex: 1;
+ flex-basis: 300px;
+}
+
+.mobile-shown {
+ display: none;
+}
+
+.panel-switcher {
+ display: none;
+ width: 100%;
+
+ button {
+ display: block;
+ flex: 1;
+ margin: 0.5em;
+ padding: 0.5em;
+ }
+}
+
+@media all and (max-width: 959px) {
+ .mobile-hidden {
+ display: none;
+ }
+
+ .panel-switcher {
+ display: flex;
+ }
+}
diff --git a/src/App.vue b/src/App.vue
index 18a8ad15..5d5463fb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,17 +1,24 @@