diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 3bc6e3f23..f4b547003 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -4,6 +4,8 @@ //= link_tree ../images //= link application.css //= link application-rtl.css +//= link vendored.css +//= link vendored-rtl.css //= link application.js // //= link ckeditor/config.js diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index e949d2e61..a6fdf6d98 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,20 +1,8 @@ -@import "amsify.suggestags"; -@import "annotator.min"; -@import "c3"; -@import "social-share-button"; @import "font-awesome-sprockets"; @import "font-awesome/variables"; @import "font-awesome/path"; @import "font-awesome/mixins"; @import "font-awesome/core"; -@import "jquery-ui/themes/base/theme"; -@import "jquery-ui/themes/base/autocomplete"; -@import "jquery-ui/themes/base/datepicker"; -@import "jquery-ui/themes/base/sortable"; -@import "leaflet/dist/leaflet"; -@import "leaflet.markercluster/dist/MarkerCluster"; -@import "leaflet.markercluster/dist/MarkerCluster.Default"; - @import "foundation_and_overrides"; @import "fonts"; @import "icons"; diff --git a/app/assets/stylesheets/foundation_and_overrides.scss b/app/assets/stylesheets/foundation_and_overrides.scss index 121b037ef..b60258b98 100644 --- a/app/assets/stylesheets/foundation_and_overrides.scss +++ b/app/assets/stylesheets/foundation_and_overrides.scss @@ -8,43 +8,3 @@ @import "foundation-sites/scss/foundation"; @import "motion-ui/motion-ui"; - -@include foundation-global-styles; -// @include foundation-xy-grid-classes; -@include foundation-grid; -// @include foundation-flex-grid; -// @include foundation-flex-classes; -@include foundation-typography; -@include foundation-forms; -@include foundation-button; -@include foundation-accordion; -@include foundation-accordion-menu; -@include foundation-badge; -@include foundation-breadcrumbs; -@include foundation-button-group; -@include foundation-callout; -@include foundation-card; -@include foundation-close-button; -@include foundation-menu; -@include foundation-menu-icon; -@include foundation-drilldown-menu; -@include foundation-dropdown; -@include foundation-dropdown-menu; -@include foundation-responsive-embed; -@include foundation-label; -@include foundation-media-object; -@include foundation-orbit; -@include foundation-pagination; -@include foundation-progress-bar; -@include foundation-slider; -@include foundation-sticky; -@include foundation-reveal; -@include foundation-switch; -@include foundation-table; -@include foundation-tabs; -@include foundation-thumbnail; -@include foundation-tooltip; -@include foundation-visibility-classes; -@include foundation-float-classes; -@include motion-ui-transitions; -@include motion-ui-animations; diff --git a/app/assets/stylesheets/vendored-rtl.scss b/app/assets/stylesheets/vendored-rtl.scss new file mode 100644 index 000000000..7d9ecf666 --- /dev/null +++ b/app/assets/stylesheets/vendored-rtl.scss @@ -0,0 +1,3 @@ +$global-text-direction: rtl; + +@import "vendored"; diff --git a/app/assets/stylesheets/vendored.scss b/app/assets/stylesheets/vendored.scss new file mode 100644 index 000000000..a581201e8 --- /dev/null +++ b/app/assets/stylesheets/vendored.scss @@ -0,0 +1,53 @@ +@import "amsify.suggestags"; +@import "annotator.min"; +@import "c3"; +@import "social-share-button"; +@import "jquery-ui/themes/base/theme"; +@import "jquery-ui/themes/base/autocomplete"; +@import "jquery-ui/themes/base/datepicker"; +@import "jquery-ui/themes/base/sortable"; +@import "leaflet/dist/leaflet"; +@import "leaflet.markercluster/dist/MarkerCluster"; +@import "leaflet.markercluster/dist/MarkerCluster.Default"; + +@import "foundation_and_overrides"; + +@include foundation-global-styles; +// @include foundation-xy-grid-classes; +@include foundation-grid; +// @include foundation-flex-grid; +// @include foundation-flex-classes; +@include foundation-typography; +@include foundation-forms; +@include foundation-button; +@include foundation-accordion; +@include foundation-accordion-menu; +@include foundation-badge; +@include foundation-breadcrumbs; +@include foundation-button-group; +@include foundation-callout; +@include foundation-card; +@include foundation-close-button; +@include foundation-menu; +@include foundation-menu-icon; +@include foundation-drilldown-menu; +@include foundation-dropdown; +@include foundation-dropdown-menu; +@include foundation-responsive-embed; +@include foundation-label; +@include foundation-media-object; +@include foundation-orbit; +@include foundation-pagination; +@include foundation-progress-bar; +@include foundation-slider; +@include foundation-sticky; +@include foundation-reveal; +@include foundation-switch; +@include foundation-table; +@include foundation-tabs; +@include foundation-thumbnail; +@include foundation-tooltip; +@include foundation-visibility-classes; +@include foundation-float-classes; +@include motion-ui-transitions; +@include motion-ui-animations; diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb index f78fe6d8d..137e2a84e 100644 --- a/app/views/layouts/_common_head.html.erb +++ b/app/views/layouts/_common_head.html.erb @@ -4,8 +4,10 @@ <%= content_for?(:title) ? yield(:title) : default_title %> <% if rtl? %> + <%= stylesheet_link_tag "vendored-rtl" %> <%= stylesheet_link_tag "application-rtl" %> <% else %> + <%= stylesheet_link_tag "vendored" %> <%= stylesheet_link_tag "application" %> <% end %> <%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %>