Merge pull request #162 from trwnh/patch-1

CSS fixes and cleanup related to the block model
This commit is contained in:
daniel 2018-06-03 00:33:44 -06:00 committed by GitHub
commit ceb0c0ae2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 71 additions and 54 deletions

View file

@ -1,6 +1,7 @@
storage storage
data data
Dockerfile Dockerfile
docker-compose*.yml
.dockerignore .dockerignore
.git .git
.gitignore .gitignore

View file

@ -1,17 +1,31 @@
FROM php:7.2-fpm-alpine FROM php:7.2.6-fpm-alpine
RUN apk add --no-cache git imagemagick \ ARG COMPOSER_VERSION="1.6.5"
&& apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libtool \ ARG COMPOSER_CHECKSUM="67bebe9df9866a795078bb2cf21798d8b0214f2e0b2fd81f2e907a8ef0be3434"
&& docker-php-ext-install pdo_mysql pcntl \
&& pecl install imagick \
&& docker-php-ext-enable imagick \
&& apk del --purge .build
RUN curl -sS https://getcomposer.org/installer | php \ RUN apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libtool && \
&& mv composer.phar /usr/local/bin/ \ apk --no-cache add imagemagick git && \
&& ln -s /usr/local/bin/composer.phar /usr/local/bin/composer docker-php-ext-install pdo_mysql pcntl && \
pecl install imagick && \
docker-php-ext-enable imagick pcntl imagick && \
curl -LsS https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar -o /tmp/composer.phar && \
echo "${COMPOSER_CHECKSUM} /tmp/composer.phar" | sha256sum -c - && \
install -m0755 -o root -g root /tmp/composer.phar /usr/bin/composer.phar && \
ln -sf /usr/bin/composer.phar /usr/bin/composer && \
rm /tmp/composer.phar && \
apk --no-cache del --purge .build
COPY . /var/www/html/
WORKDIR /var/www/html WORKDIR /var/www/html
COPY . . RUN install -d -m0755 -o www-data -g www-data \
RUN composer install --prefer-source --no-interaction /var/www/html/storage \
/var/www/html/storage/framework \
/var/www/html/storage/logs \
/var/www/html/storage/framework/sessions \
/var/www/html/storage/framework/views \
/var/www/html/storage/framework/cache && \
composer install --prefer-source --no-interaction
VOLUME ["/var/www/html"]
ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}" ENV PATH="~/.composer/vendor/bin:./vendor/bin:${PATH}"

View file

@ -3,37 +3,62 @@ version: '3'
services: services:
nginx: nginx:
image: nginx:alpine image: nginx:alpine
networks:
- internal
- external
ports: ports:
- 3000:80 - 3000:80
volumes: volumes:
- .:/var/www/html - "php-storage:/var/www/html"
- ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf
depends_on: depends_on:
- php - php
php: php:
build: . build: .
image: pixelfed
volumes: volumes:
- ./storage:/var/www/html/storage - "php-storage:/var/www/html"
depends_on: networks:
- mysql - internal
- redis
environment: environment:
- DB_HOST=mysql - DB_HOST=mysql
- DB_DATABASE=pixelfed - DB_DATABASE=pixelfed
- DB_USERNAME=${DB_USERNAME} - DB_USERNAME=${DB_USERNAME:-pixelfed}
- DB_PASSWORD=${DB_PASSWORD} - DB_PASSWORD=${DB_PASSWORD:-pixelfed}
- REDIS_HOST=redis - REDIS_HOST=redis
- APP_KEY=${APP_KEY} - APP_KEY=${APP_KEY}
env_file:
- ./.env
mysql: mysql:
image: mysql:5.7 image: mysql:5.7
networks:
- internal
environment: environment:
- MYSQL_DATABASE=pixelfed - MYSQL_DATABASE=pixelfed
- MYSQL_USER=${DB_USERNAME} - MYSQL_USER=${DB_USERNAME:-pixelfed}
- MYSQL_PASSWORD=${DB_PASSWORD} - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed}
- MYSQL_RANDOM_ROOT_PASSWORD="true"
env_file:
- ./.env
volumes: volumes:
- ./docker-volumes/mysql:/var/lib/mysql - "mysql-data:/var/lib/mysql"
redis: redis:
image: redis:alpine image: redis:alpine
volumes: volumes:
- ./docker-volumes/redis:/data - "redis-data:/data"
... networks:
- internal
volumes:
redis-data:
mysql-data:
php-storage:
networks:
internal:
internal: true
external:
driver: bridge

View file

@ -56,37 +56,14 @@ body, button, input, textarea {
} }
.card.status-container .status-photo { .card.status-container .status-photo {
display: block !important;
margin: auto !important; margin: auto !important;
} }
.card.status-container .status-comments { .card.status-container .status-comments {
height: 220px;
overflow-y: scroll; overflow-y: scroll;
border-bottom:1px solid rgba(0, 0, 0, 0.1); border-bottom:1px solid rgba(0, 0, 0, 0.1);
} }
.card.status-container.orientation-square .status-comments {
height: 360px !important;
}
.card.status-container.orientation-portrait .status-comments {
height: 528px !important;
}
.card.status-container.orientation-landscape .status-photo img {
max-height: 451px !important;
}
.card.status-container.orientation-square .status-photo img {
max-height: 601px !important;
}
.card.status-container.orientation-portrait .status-photo img {
max-height: 772px !important;
}
.no-caret.dropdown-toggle { .no-caret.dropdown-toggle {
text-decoration: none !important; text-decoration: none !important;
} }

View file

@ -1,6 +1,6 @@
<footer class="pt-5 mt-5"> <footer>
<div class="container mt-5 pt-5"> <div class="container mt-5">
<p class="mt-5 text-uppercase font-weight-bold small"> <p class="text-uppercase font-weight-bold small">
<a href="{{route('site.about')}}" class="text-primary pr-2">About Us</a> <a href="{{route('site.about')}}" class="text-primary pr-2">About Us</a>
<a href="{{route('site.help')}}" class="text-primary pr-2">Support</a> <a href="{{route('site.help')}}" class="text-primary pr-2">Support</a>
<a href="" class="text-primary pr-2">API</a> <a href="" class="text-primary pr-2">API</a>
@ -14,4 +14,4 @@
<a href="#" class="text-dark float-right">© {{date('Y')}} PixelFed.org</a> <a href="#" class="text-dark float-right">© {{date('Y')}} PixelFed.org</a>
</p> </p>
</div> </div>
</footer> </footer>