diff --git a/Dockerfile b/Dockerfile index b1bcce07..bf82d720 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,10 @@ COPY Gemfile* /app/ RUN gem install bundler 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 COPY . /app/ diff --git a/app/assets/stylesheets/black.scss b/app/assets/stylesheets/black.scss index 86647a0b..25d59126 100644 --- a/app/assets/stylesheets/black.scss +++ b/app/assets/stylesheets/black.scss @@ -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; $brand-primary: rgba(0, 0, 0, 0.75); $navbar-inverse-bg: $brand_primary; diff --git a/app/assets/stylesheets/include/manifest.scss b/app/assets/stylesheets/include/manifest.scss index ce2e368d..12066267 100644 --- a/app/assets/stylesheets/include/manifest.scss +++ b/app/assets/stylesheets/include/manifest.scss @@ -9,13 +9,6 @@ * 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 * 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"; diff --git a/app/assets/stylesheets/light_blue.scss b/app/assets/stylesheets/light_blue.scss index 9d6ea71e..8a9405e8 100644 --- a/app/assets/stylesheets/light_blue.scss +++ b/app/assets/stylesheets/light_blue.scss @@ -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%); $brand-primary: #3C6997; $navbar-inverse-bg: $brand_primary;