diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aee85e5..52b27c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,10 @@ services: - mariadb:latest variables: - MYSQL_DATABASE: portal - MYSQL_USER: root - MYSQL_ROOT_PASSWORD: secret + MYSQL_DATABASE: "portal" + MYSQL_USER: "root" + MYSQL_PASSWORD: "app" + MYSQL_ROOT_PASSWORD: "secret" # This folder is cached between builds # http://docs.gitlab.com/ce/ci/yaml/README.html#cache @@ -33,9 +34,9 @@ before_script: # Install dependencies - apt-get install git nodejs libcurl4-gnutls-dev libicu-dev libmcrypt-dev libvpx-dev libjpeg-dev libpng-dev libxpm-dev zlib1g-dev libfreetype6-dev libxml2-dev libexpat1-dev libbz2-dev libgmp3-dev libldap2-dev unixodbc-dev libpq-dev libsqlite3-dev libaspell-dev libsnmp-dev libpcre3-dev libtidy-dev -yqq #- apt-get install php-mbstring php-curl php-json php-intl php-gd php-xml php-zip php-bz2 -yqq - - apt-get install mariadb-server + - apt-get install mariadb-server -yqq # Install php extensions - - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json php-mysql + - docker-php-ext-install pdo pdo_mysql tokenizer xml pcntl curl json # - docker-php-ext-install mbstring intl gd xml bz2 opcache pdo_mysql curl json zip # Install & enable Xdebug for code coverage reports - pecl install xdebug diff --git a/resources/js/views/Memo/MemoIndex.vue b/resources/js/views/Memo/MemoIndex.vue index 596af91..0c50821 100755 --- a/resources/js/views/Memo/MemoIndex.vue +++ b/resources/js/views/Memo/MemoIndex.vue @@ -4,11 +4,11 @@ Back
- date + - alpha +
diff --git a/resources/sass/components/_btn.scss b/resources/sass/components/_btn.scss index ef13ba1..c1b2fc1 100644 --- a/resources/sass/components/_btn.scss +++ b/resources/sass/components/_btn.scss @@ -58,7 +58,7 @@ .btn-small { @extend .btn; - @apply text-sm; + @apply text-sm p-2; & svg { @apply ml-2 mr-0; diff --git a/resources/svg/order-alpha.svg b/resources/svg/order-alpha.svg new file mode 100644 index 0000000..d256e37 --- /dev/null +++ b/resources/svg/order-alpha.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/resources/svg/order-time.svg b/resources/svg/order-time.svg new file mode 100644 index 0000000..741c8af --- /dev/null +++ b/resources/svg/order-time.svg @@ -0,0 +1,26 @@ + + + + +