Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 23:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the jquery requires in the stylesheets and the missing Yarn warning.

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-08-25 21:46:27 +03:00
parent 998bfa4248
commit e25c50503c
4 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -11,6 +11,10 @@ COPY Gemfile* /app/
RUN gem install bundler RUN gem install bundler
RUN bundle install --jobs 4 RUN bundle install --jobs 4
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
RUN apt-get update && apt-get install -y yarn
RUN mkdir /app/log RUN mkdir /app/log
COPY . /app/ COPY . /app/

12
app/assets/stylesheets/black.scss
View file

@ -1,3 +1,15 @@
/*
* Apparently the requires need to be in the "root" stylesheet file, not
* the imported manifest.
*
*= require jquery-ui/menu
*= require jquery-ui/autocomplete
*= require jquery-ui/datepicker
*= require jquery-ui/dialog
*= require jquery-ui/sortable
*= require_self
*/
$gray-lighter: #EEE; $gray-lighter: #EEE;
$brand-primary: rgba(0, 0, 0, 0.75); $brand-primary: rgba(0, 0, 0, 0.75);
$navbar-inverse-bg: $brand_primary; $navbar-inverse-bg: $brand_primary;

7
app/assets/stylesheets/include/manifest.scss
View file

@ -9,13 +9,6 @@
* compiled file so the styles you add here take precedence over styles defined in any styles * compiled file so the styles you add here take precedence over styles defined in any styles
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
* file per style scope. * file per style scope.
*
*= require jquery-ui/menu
*= require jquery-ui/autocomplete
*= require jquery-ui/datepicker
*= require jquery-ui/dialog
*= require jquery-ui/sortable
*= require_self
*/ */
@import "icons"; @import "icons";

12
app/assets/stylesheets/light_blue.scss
View file

@ -1,3 +1,15 @@
/*
* Apparently the requires need to be in the "root" stylesheet file, not
* the imported manifest.
*
*= require jquery-ui/menu
*= require jquery-ui/autocomplete
*= require jquery-ui/datepicker
*= require jquery-ui/dialog
*= require jquery-ui/sortable
*= require_self
*/
$gray-lighter: lighten(#000, 93.5%); $gray-lighter: lighten(#000, 93.5%);
$brand-primary: #3C6997; $brand-primary: #3C6997;
$navbar-inverse-bg: $brand_primary; $navbar-inverse-bg: $brand_primary;