Skip to content

Instantly share code, notes, and snippets.

@roblevintennis

roblevintennis/stylesheets_icons_new-idea.diff

Created February 18, 2019 19:57
Show Gist options
  • Save roblevintennis/0aa28620d5f1106f1ed23c42e0f7438e to your computer and use it in GitHub Desktop.
Save roblevintennis/0aa28620d5f1106f1ed23c42e0f7438e to your computer and use it in GitHub Desktop.
Download ZIP
Raw
stylesheets_icons_new-idea.diff
diff --git a/app/assets/stylesheets/basic.scss b/app/assets/stylesheets/basic.scss
index 153ae768ab4..9009d6d2d21 100644
--- a/app/assets/stylesheets/basic.scss
+++ b/app/assets/stylesheets/basic.scss
@@ -1,6 +1,5 @@
@import "app/assets/stylesheets/common/css_reset";
@import "app/assets/stylesheets/common/utilities";
@import "app/assets/stylesheets/basic/common";
-@import "mavenlink-js/src/stylesheets/styleguide/components/icons/icons-new";
@import "app/assets/stylesheets/basic/landing";
@import "app/assets/stylesheets/basic/payment-portal";
diff --git a/app/assets/stylesheets/internal-base.scss b/app/assets/stylesheets/internal-base.scss
index 2638c01ffde..97e3f02c163 100644
--- a/app/assets/stylesheets/internal-base.scss
+++ b/app/assets/stylesheets/internal-base.scss
@@ -4,7 +4,6 @@
@import "app/assets/stylesheets/styleguide/components/badges/badges";
@import "app/assets/stylesheets/styleguide/components/currencies/currencies";
@import "app/assets/stylesheets/styleguide/components/fading-region";
-@import "mavenlink-js/src/stylesheets/styleguide/components/icons/icons-new";
@import "app/assets/stylesheets/styleguide/components/loaders/loaders";
@import "app/assets/stylesheets/styleguide/components/notifications/notice";
@import "app/assets/stylesheets/styleguide/components/panels/panels";
diff --git a/app/assets/stylesheets/styleguide/clean-room.scss b/app/assets/stylesheets/styleguide/clean-room.scss
index 6b84fdfce86..54be7b285bf 100644
--- a/app/assets/stylesheets/styleguide/clean-room.scss
+++ b/app/assets/stylesheets/styleguide/clean-room.scss
@@ -20,7 +20,6 @@
@import "components/badges/badges";
@import "components/buttons/nav-buttons";
@import "components/currencies/currencies";
-@import "mavenlink-js/src/stylesheets/styleguide/components/icons/icons-new";
@import "components/loaders/loaders";
@import "app/assets/stylesheets/styleguide/components/loaders/spinners";
@import "components/notifications/notice";
diff --git a/app/assets/stylesheets/styleguide/main.scss b/app/assets/stylesheets/styleguide/main.scss
index 9b4ff3e78bb..0686542b5fd 100644
--- a/app/assets/stylesheets/styleguide/main.scss
+++ b/app/assets/stylesheets/styleguide/main.scss
@@ -18,7 +18,6 @@
@import "base/typography/mixins";
@import "app/assets/stylesheets/styleguide/base/typography/typography";
@import "components/badges/badges";
-@import "mavenlink-js/src/stylesheets/styleguide/components/icons/icons-new";
@import "app/assets/stylesheets/styleguide/components/loaders/spinners";
@import "components/currencies/currencies";
@import "components/editable-input";
diff --git a/app/views/layouts/_internal_css.html.erb b/app/views/layouts/_internal_css.html.erb
index 0f96857ccbf..cc9a2fa3353 100644
--- a/app/views/layouts/_internal_css.html.erb
+++ b/app/views/layouts/_internal_css.html.erb
@@ -1,6 +1,7 @@
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_print', extension: 'css'), :media => "print" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_common', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_postcss_buttons', extension: 'css'), :media => "all" %>
+<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_icons_new', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_internal_dependencies', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_internal_base', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_internal_pages', extension: 'css'), :media => "all" %>
diff --git a/app/views/layouts/basic.html.erb b/app/views/layouts/basic.html.erb
index 62f0f317b37..732dd541f7f 100644
--- a/app/views/layouts/basic.html.erb
+++ b/app/views/layouts/basic.html.erb
@@ -3,6 +3,7 @@
<head>
<%= render :partial => 'layouts/meta_tags' %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_basic', extension: 'css'), :media => "all" %>
+ <%= stylesheet_link_tag *webpack_asset_paths('stylesheets_icons_new', extension: 'css'), :media => "all" %>
<%= render :partial => 'layouts/fonts' unless ENV['OFFLINE'] %>
<script type="text/javascript">
diff --git a/app/views/layouts/fluid_grid.html.erb b/app/views/layouts/fluid_grid.html.erb
index eeda3e2ecbc..49bba859685 100644
--- a/app/views/layouts/fluid_grid.html.erb
+++ b/app/views/layouts/fluid_grid.html.erb
@@ -4,6 +4,7 @@
<%= render :partial => 'layouts/meta_tags' %>
<%= render :partial => 'layouts/fonts' unless ENV['OFFLINE'] %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_postcss_buttons', extension: 'css'), :media => "all" %>
+ <%= stylesheet_link_tag *webpack_asset_paths('stylesheets_icons_new', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_clean_room', extension: 'css'), :media => "all" %>
<%= render :partial => 'layouts/event_tracking' unless ENV['OFFLINE'] %>
<%= render :partial => 'layouts/google_analytics' %>
diff --git a/app/views/layouts/signup.html.erb b/app/views/layouts/signup.html.erb
index d01efa443f7..fd2185a924c 100644
--- a/app/views/layouts/signup.html.erb
+++ b/app/views/layouts/signup.html.erb
@@ -7,6 +7,7 @@
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_common', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_postcss_buttons', extension: 'css'), :media => "all" %>
+ <%= stylesheet_link_tag *webpack_asset_paths('stylesheets_icons_new', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_external', extension: 'css'), :media => "all" %>
<%= render :partial => 'layouts/event_tracking' %>
diff --git a/app/views/layouts/signup_mobile.html.erb b/app/views/layouts/signup_mobile.html.erb
index bdaf978a768..715bcd75924 100644
--- a/app/views/layouts/signup_mobile.html.erb
+++ b/app/views/layouts/signup_mobile.html.erb
@@ -11,6 +11,7 @@
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_common', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_postcss_buttons', extension: 'css'), :media => "all" %>
+ <%= stylesheet_link_tag *webpack_asset_paths('stylesheets_icons_new', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_external', extension: 'css'), :media => "all" %>
<%= render :partial => 'layouts/core_js_bootstrap' %>
diff --git a/app/views/layouts/styleguide.html.erb b/app/views/layouts/styleguide.html.erb
index f2c3a05a097..add0726f0a2 100644
--- a/app/views/layouts/styleguide.html.erb
+++ b/app/views/layouts/styleguide.html.erb
@@ -2,6 +2,7 @@
<html lang="en">
<head>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_postcss_buttons', extension: 'css'), :media => "all" %>
+ <%= stylesheet_link_tag *webpack_asset_paths('stylesheets_icons_new', extension: 'css'), :media => "all" %>
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_styleguide', extension: 'css'), :media => "all" %>
<%= render :partial => 'layouts/fonts' %>
diff --git a/app/views/pricing_and_signup/pro_signup.html.erb b/app/views/pricing_and_signup/pro_signup.html.erb
index 6ce9d7484ba..218fcf89fe0 100644
--- a/app/views/pricing_and_signup/pro_signup.html.erb
+++ b/app/views/pricing_and_signup/pro_signup.html.erb
@@ -1,4 +1,5 @@
<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_internal_base', extension: 'css'), :media => "all" %>
+<%= stylesheet_link_tag *webpack_asset_paths('stylesheets_icons_new', extension: 'css'), :media => "all" %>
<div class="pro pro-sqkd-5ec24f signup-box signup-box-sqkd-937120 <%= 'large clearfix clearfix-sqkd-9568b9 clearfix-sqkd-8a697d clearfix-sqkd-dee6a1 clearfix-sqkd-7ee3e1 clearfix-sqkd-dc93a2' if @project_template_title %>">
<div class="box-header box-header-sqkd-937120 <%= 'logo-left' if @project_template_title %>">
diff --git a/config/templates/error-page.ejs b/config/templates/error-page.ejs
index d8c94718bbf..fe8e3e04fca 100644
--- a/config/templates/error-page.ejs
+++ b/config/templates/error-page.ejs
@@ -14,6 +14,7 @@
<link href="<%= htmlWebpackPlugin.files.chunks.stylesheets_print.css %>" media="print" rel="stylesheet" type="text/css"/>
<link href="<%= htmlWebpackPlugin.files.chunks.stylesheets_common.css %>" media="all" rel="stylesheet" type="text/css"/>
<link href="<%= htmlWebpackPlugin.files.chunks.stylesheets_internal_base.css %>" media="all" rel="stylesheet" type="text/css"/>
+ <link href="<%= htmlWebpackPlugin.files.chunks.stylesheets_icons_new.css %>" media="all" rel="stylesheet" type="text/css"/>
<style type="text/css">
.mavenlink-header {
diff --git a/config/webpack.entry.config.js b/config/webpack.entry.config.js
index e6a198759cb..983b2489afe 100644
--- a/config/webpack.entry.config.js
+++ b/config/webpack.entry.config.js
@@ -108,6 +108,7 @@ module.exports = {
stylesheets_internal_base: './app/assets/stylesheets/internal-base.scss',
stylesheets_internal_dependencies: './app/assets/stylesheets/internal-dependencies.scss',
stylesheets_internal_pages: './app/assets/stylesheets/internal-pages.scss',
+ stylesheets_icons_new: 'mavenlink-js/src/stylesheets/styleguide/components/icons/icons-new.css',
stylesheets_postcss_buttons: './app/assets/stylesheets/styleguide/vendor/buttons-new/css/buttons.css',
stylesheets_internal_redirect_show: './app/assets/stylesheets/internal/pages/redirect-show.scss',
stylesheets_internal_workspaces: './app/assets/stylesheets/internal-workspaces.scss',
diff --git a/postcss.config.js b/postcss.config.js
index f839774188b..275f90bbfdf 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -3,11 +3,7 @@ const path = require('path');
module.exports = {
plugins: {
- 'postcss-import': {
- addModulesDirectories: [
- path.resolve(path.join(__dirname, 'node_modules', 'mavenlink-js', 'src', 'stylesheets')),
- ],
- },
+ 'postcss-import': {},
'postcss-url': {},
'postcss-preset-env': {
stage: false,
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment