Skip to content

Fix 203 scss-lint warnings#987

Closed
nickjs wants to merge 4 commits into
uswds:18f-pages-stagingfrom
nickjs:fix-scss-lint-warnings
Closed

Fix 203 scss-lint warnings#987
nickjs wants to merge 4 commits into
uswds:18f-pages-stagingfrom
nickjs:fix-scss-lint-warnings

Conversation

@nickjs

@nickjs nickjs commented Feb 4, 2016

Copy link
Copy Markdown
Contributor

@rogeruiz @maya

Before:
screen shot 2016-02-03 at 4 53 36 pm

After:
screen shot 2016-02-04 at 3 56 39 pm

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a few of these, we should probably figure out a way forward

@nickjs nickjs mentioned this pull request Feb 4, 2016
4 tasks

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nickjs why is the SVG removed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Omg I must have stared at these for like 2 minutes trying to figure out why every image was duplicated. Must have just had a moment of code blindness where the two lines looked exactly the same. Totally did not notice the file extension was different. Will revert now.

However, it does cause a linter warning, because it's a duplicate property. I guess there's no way around that...

@maya

maya commented Feb 5, 2016

Copy link
Copy Markdown
Contributor

@nickjs Commented on one but noticed it was in many places... why are the SVGs removed? We implement SVG with PNG fallback for all of our icons.

@nickjs

nickjs commented Feb 5, 2016

Copy link
Copy Markdown
Contributor Author

@maya Well that was embarrassing. Fixed now, my bad!

@maya maya added this to the 1.0 Release milestone Feb 6, 2016
@msecret

msecret commented Feb 8, 2016

Copy link
Copy Markdown
Contributor

LGTM

@rogeruiz rogeruiz self-assigned this Feb 11, 2016
@rogeruiz

Copy link
Copy Markdown
Contributor

Hey @nickjs. We'll need to rebase the branch onto 18f-pages-staging and resolve any conflicts. Once that's done, I can review this and merge it in. Thanks!

@nickjs nickjs force-pushed the fix-scss-lint-warnings branch from bf69721 to b38799d Compare February 16, 2016 20:17
@nickjs

nickjs commented Feb 16, 2016

Copy link
Copy Markdown
Contributor Author

@rogeruiz Rebased

@maya maya removed this from the v0.9.0 milestone Mar 9, 2016
@maya

maya commented Mar 17, 2016

Copy link
Copy Markdown
Contributor

@nickjs hey there, it looks like this branch has merge conflicts that must be resolved. Let us know if you can resolve these. Thanks!

@rogeruiz

Copy link
Copy Markdown
Contributor

Hey @nickjs, I did a rebase of your branch on what's on 18f-pages-staging and
I found these two merge conflicts. The first one needs to be there, so I think
that your channges on the bottom should be removed, but feel free to modify it
with a commit if it introduces any new linter warnings. The second one, I think
we can just take your updates, as it seems to just be a whitespace merge conflict.

Thanks!

diff --cc src/stylesheets/elements/_list.scss
index a6e212c,7a7b3a6..0000000
--- a/src/stylesheets/elements/_list.scss
+++ b/src/stylesheets/elements/_list.scss
@@@ -27,14 -25,8 +25,19 @@@ ol
    }
  }

++<<<<<<< 69a216d9378154df0c759fca72da08506e8cf491
 +ul li {
 +  display: table-row;
 +
 +  &:before {
 +    content: "\2022";
 +    display: table-cell;
 +    padding-right: 0.4em;
 +  }
++=======
+ ul li::before {
+   content: '•';
++>>>>>>> Fix some scss-lint warnings in _list.scss
  }

  ol li {
diff --cc src/stylesheets/core/_utilities.scss
index 8462591,454ae1a..0000000
--- a/src/stylesheets/core/_utilities.scss
+++ b/src/stylesheets/core/_utilities.scss
@@@ -5,6 -5,17 +5,20 @@@
    }
  }

++<<<<<<< b7fbc05658138dd433c3bcd2c4fff544c3ee5ecd
++=======
+ // Clearfix helper
+ @mixin clearfix() {
+   &::after {
+     content: '.';
+     display: block;
+     height: 0;
+     clear: both;
+     visibility: hidden;
+   }
+ }
+
++>>>>>>> Fix lots of scss-lint warnings
  // Screen reader only helper
  .usa-sr-only {
    position: absolute;

@jpyuda jpyuda added this to the Clean, Semantic Code milestone Mar 18, 2016
@maya

maya commented Mar 23, 2016

Copy link
Copy Markdown
Contributor

Hey @nickjs, will you be able to integrate the merge conflict fixes @rogeruiz posted above? We'd love to get this in. Thanks!

@rogeruiz

Copy link
Copy Markdown
Contributor

Closing this PR in favor of #1180 which will cherry-pick these commits.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants