diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index f4b547003..7c90a34ed 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 administration.css +//= link administration-rtl.css //= link vendored.css //= link vendored-rtl.css //= link application.js diff --git a/app/assets/stylesheets/administration-rtl.scss b/app/assets/stylesheets/administration-rtl.scss new file mode 100644 index 000000000..e839730bb --- /dev/null +++ b/app/assets/stylesheets/administration-rtl.scss @@ -0,0 +1,3 @@ +$global-text-direction: rtl; + +@import "administration"; diff --git a/app/assets/stylesheets/administration.scss b/app/assets/stylesheets/administration.scss new file mode 100644 index 000000000..f87ed692d --- /dev/null +++ b/app/assets/stylesheets/administration.scss @@ -0,0 +1,3 @@ +@import "mixins_and_variables"; +@import "admin"; +@import "admin/**/*"; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index a6fdf6d98..202e903de 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,15 +1,7 @@ -@import "font-awesome-sprockets"; -@import "font-awesome/variables"; -@import "font-awesome/path"; -@import "font-awesome/mixins"; -@import "font-awesome/core"; -@import "foundation_and_overrides"; +@import "mixins_and_variables"; @import "fonts"; @import "icons"; -@import "functions/*"; -@import "mixins/*"; -@import "admin"; @import "annotator_overrides"; @import "autocomplete_overrides"; @import "datepicker_overrides"; @@ -27,7 +19,6 @@ @import "sticky_overrides"; @import "tags"; @import "account/**/*"; -@import "admin/**/*"; @import "budgets/**/*"; @import "comments/**/*"; @import "debates/**/*"; diff --git a/app/assets/stylesheets/dashboard_poster.scss b/app/assets/stylesheets/dashboard_poster.scss index 620458dbd..1c450d991 100644 --- a/app/assets/stylesheets/dashboard_poster.scss +++ b/app/assets/stylesheets/dashboard_poster.scss @@ -1,6 +1,2 @@ -@import "font-awesome/variables"; -@import "font-awesome/mixins"; -@import "font-awesome/core"; -@import "foundation_and_overrides"; -@import "mixins/*"; +@import "mixins_and_variables"; @import "dashboard"; diff --git a/app/assets/stylesheets/mixins_and_variables.scss b/app/assets/stylesheets/mixins_and_variables.scss new file mode 100644 index 000000000..2915aabef --- /dev/null +++ b/app/assets/stylesheets/mixins_and_variables.scss @@ -0,0 +1,8 @@ +@import "font-awesome-sprockets"; +@import "font-awesome/variables"; +@import "font-awesome/path"; +@import "font-awesome/mixins"; +@import "font-awesome/core"; +@import "foundation_and_overrides"; +@import "functions/*"; +@import "mixins/*"; diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb index 137e2a84e..8e7dbf587 100644 --- a/app/views/layouts/_common_head.html.erb +++ b/app/views/layouts/_common_head.html.erb @@ -6,9 +6,11 @@ <% if rtl? %> <%= stylesheet_link_tag "vendored-rtl" %> <%= stylesheet_link_tag "application-rtl" %> + <%= stylesheet_link_tag "administration-rtl" %> <% else %> <%= stylesheet_link_tag "vendored" %> <%= stylesheet_link_tag "application" %> + <%= stylesheet_link_tag "administration" %> <% end %> <%= javascript_include_tag "application", "data-turbolinks-track" => "reload" %> <%= csrf_meta_tags %>